Merge remote-tracking branch 'origin' into rr_drawing_update

SamuelHo10 · SamuelHo10 · commit d8874525080e · 2025-08-06T09:51:16.000-04:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -122,27 +122,42 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { name: 'C/C++',       script: 'check-format.sh'    }
-        - { name: 'Python',      script: 'check-format-py.sh' }
-        - { name: 'Python Lint', script: 'pylint_check.py'    }
+        - { name: 'C/C++',       script: 'check-format.sh'   , with_python: 'no', pkgs: 'clang-format-18' }
+        - { name: 'Python',      script: 'check-format-py.sh', with_python: 'yes', pkgs: '' }
+        - { name: 'Python Lint', script: 'pylint_check.py'   , with_python: 'yes', pkgs: '' }
     name: 'F: ${{ matrix.name }}'
     steps:
 
+    - uses: actions/checkout@v4
+      # NOTE: We do not need sub-modules. We do not check sub-modules for formatting.
+
     # TODO: This should be on the same version of Python as would be found on
     #       Ubuntu 24.04 (3.12.3); however that version has some linting errors.
+    #         - The version of Pylint in requirements.txt is not compatible with
+    #           python version 3.12.3. Pylint needs to be updated to move to this version.
     - uses: actions/setup-python@v5
+      if: ${{ matrix.with_python == 'yes' }}
       with:
         python-version: 3.10.10
 
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
+    - name: Build Python Virtual Env
+      run: |
+        python -m venv .venv
+
+    - name: Install Python Requirements
+      if: ${{ matrix.with_python == 'yes' }}
+      run: |
+        source .venv/bin/activate
+        pip install -r requirements.txt
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      if: ${{ matrix.pkgs }}
+      run: sudo apt install -y ${{ matrix.pkgs }}
 
     - name: Test
-      run: ./dev/${{ matrix.script }}
+      run: |
+        source .venv/bin/activate
+        ./dev/${{ matrix.script }}
 
 
   VerifyTestSuites:
diff --git a/libs/EXTERNAL/libcatch2 b/libs/EXTERNAL/libcatch2
@@ -1 +1 @@
-Subproject commit ceed26842b3b3f93523998f7adb672672c7c2d8f
+Subproject commit ccabd4de891e749f472121497941bb9437b83c2e
diff --git a/libs/EXTERNAL/libezgl b/libs/EXTERNAL/libezgl
@@ -1 +1 @@
-Subproject commit 5b1fd681c7bfb7ecfe7669557ab44af6f2d04667
+Subproject commit fb0e6f073967b34135112b7bccdea864925d7823
diff --git a/libs/libarchfpga/src/physical_types.h b/libs/libarchfpga/src/physical_types.h
@@ -171,8 +171,11 @@ enum e_pin_type {
 enum e_interconnect {
     COMPLETE_INTERC = 1,
     DIRECT_INTERC = 2,
-    MUX_INTERC = 3
+    MUX_INTERC = 3,
+    NUM_INTERC_TYPES = 4
 };
+/* String version of interconnect types. Use for debugging messages */
+constexpr std::array<const char*, NUM_INTERC_TYPES> INTERCONNECT_TYPE_STRING = {{"unknown", "complete", "direct", "mux"}};
 
 /* pin location distributions */
 enum class e_pin_location_distr {
diff --git a/libs/librrgraph/src/base/rr_graph_builder.cpp b/libs/librrgraph/src/base/rr_graph_builder.cpp
@@ -188,6 +188,12 @@ void RRGraphBuilder::create_edge_in_cache(RRNodeId src, RRNodeId dest, RRSwitchI
     is_incoming_edge_dirty_ = true;
 }
 
+void RRGraphBuilder::create_edge(RRNodeId src, RRNodeId dest, RRSwitchId edge_switch, bool remapped) {
+    edges_to_build_.emplace_back(src, dest, size_t(edge_switch), remapped);
+    is_edge_dirty_ = true; /* Adding a new edge revokes the flag */
+    is_incoming_edge_dirty_ = true;
+}
+
 void RRGraphBuilder::build_edges(const bool& uniquify) {
     if (uniquify) {
         std::sort(edges_to_build_.begin(), edges_to_build_.end());
diff --git a/libs/librrgraph/src/base/rr_graph_builder.h b/libs/librrgraph/src/base/rr_graph_builder.h
@@ -298,6 +298,10 @@ class RRGraphBuilder {
      *  @note This will not add an edge to storage. You need to call build_edges() after all the edges are cached. */
     void create_edge_in_cache(RRNodeId src, RRNodeId dest, RRSwitchId edge_switch, bool remapped);
 
+    /** @brief Add a new edge to the cache of edges to be built 
+     *  @note This will not add an edge to storage! You need to call build_edges() after all the edges are cached! */
+    void create_edge(RRNodeId src, RRNodeId dest, RRSwitchId edge_switch, bool remapped);
+
     /** @brief Allocate and build actual edges in storage. 
      * Once called, the cached edges will be uniquified and added to routing resource nodes, 
      * while the cache will be empty once build-up is accomplished 
@@ -392,6 +396,13 @@ class RRGraphBuilder {
         return node_storage_.count_rr_switches(arch_switch_inf, arch_switch_fanins);
     }
 
+    /** @brief Unlock storage; required to modify an routing resource graph after edge is read */
+    inline void unlock_storage() {
+        node_storage_.edges_read_ = false;
+        node_storage_.partitioned_ = false;
+        node_storage_.clear_node_first_edge();
+    }
+
     /** @brief Reserve the lists of nodes, edges, switches etc. to be memory efficient.
      * This function is mainly used to reserve memory space inside RRGraph,
      * when adding a large number of nodes/edge/switches/segments,
diff --git a/libs/libvtrcapnproto/CMakeLists.txt b/libs/libvtrcapnproto/CMakeLists.txt
@@ -32,7 +32,7 @@ capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS
 )
 
 if (VPR_ENABLE_INTERCHANGE)
-    set(IC_DIR ${CMAKE_SOURCE_DIR}/libs/EXTERNAL/libinterchange/interchange)
+    set(IC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../EXTERNAL/libinterchange/interchange)
     set(CAPNPC_SRC_PREFIX ${IC_DIR})
 
     find_program(WGET wget REQUIRED)
diff --git a/libs/libvtrutil/src/vtr_geometry.tpp b/libs/libvtrutil/src/vtr_geometry.tpp
@@ -1,3 +1,5 @@
+#include <limits>
+
 #include "vtr_assert.h"
 
 namespace vtr {
diff --git a/vpr/src/analytical_place/analytical_solver.h b/vpr/src/analytical_place/analytical_solver.h
@@ -436,14 +436,14 @@ class B2BSolver : public AnalyticalSolver {
     ///        solved solution HPWL).
     /// Decreasing this number toward zero would cause the B2B solver to run
     /// more iterations to try and reduce the HPWL further.
-    static constexpr double b2b_convergence_gap_fac_ = 0.001;
+    static constexpr double b2b_convergence_gap_fac_ = 0.0001;
 
     /// @brief The number of times the B2B loop should "converge" before stopping
     ///        the loop. Due to numerical inaccuracies, it is possible for the
     ///        HPWL to bounce up and down as it converges. Increasing this number
     ///        will allow more bounces which may get better quality; however
     ///        more iterations will need to be run.
-    static constexpr unsigned target_num_b2b_convergences_ = 2;
+    static constexpr unsigned target_num_b2b_convergences_ = 1;
 
     /// @brief Max number of bound update / solve iterations. Increasing this
     ///        number will yield better quality at the expense of runtime.
@@ -460,7 +460,7 @@ class B2BSolver : public AnalyticalSolver {
     ///        to prevent this behaviour and get good runtime.
     // TODO: Need to investigate this more to find a good number for this.
     // TODO: Should this be a proportion of the design size?
-    static constexpr unsigned max_cg_iterations_ = 150;
+    static constexpr unsigned max_cg_iterations_ = 100;
 
     // The following constants are used to configure the anchor weighting.
     // The weights of anchors grow exponentially each iteration by the following
diff --git a/vpr/src/analytical_place/global_placer.h b/vpr/src/analytical_place/global_placer.h
@@ -127,7 +127,7 @@ class SimPLGlobalPlacer : public GlobalPlacer {
     ///        between the two bounds, normalized to the upper-bound, is smaller
     ///        than this number.
     ///        This number was empircally found to work well.
-    static constexpr double target_hpwl_relative_gap_ = 0.05;
+    static constexpr double target_hpwl_relative_gap_ = 0.01;
 
     /// @brief The solver which generates the lower-bound placement.
     std::unique_ptr<AnalyticalSolver> solver_;
diff --git a/vpr/src/base/read_blif.cpp b/vpr/src/base/read_blif.cpp
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <cctype> //std::isdigit
 #include <regex>  //std::regex
+#include <optional>
 
 #include "blifparse.hpp"
 #include "atom_netlist.h"
@@ -407,13 +408,14 @@ struct BlifAllocCallback : public blifparse::Callback {
         //Look through all the models loaded, to find the one which is non-blackbox (i.e. has real blocks
         //and is not a blackbox).  To check for errors we look at all models, even if we've already
         //found a non-blackbox model.
-        int top_model_idx = -1; //Not valid
 
-        for (int i = 0; i < static_cast<int>(blif_models_.size()); ++i) {
+        std::optional<size_t> top_model_idx; //Not valid yet
+
+        for (size_t i = 0; i < blif_models_.size(); ++i) {
             if (!blif_models_black_box_[i]) {
                 //A non-blackbox model
-                if (top_model_idx == -1) {
-                    //This is the top model
+                if (!top_model_idx.has_value()) {
+                    // Top model is first non-blackbox model found
                     top_model_idx = i;
                 } else {
                     //We already have a top model
@@ -427,14 +429,13 @@ struct BlifAllocCallback : public blifparse::Callback {
             }
         }
 
-        if (top_model_idx == -1) {
+        if (!top_model_idx.has_value()) {
             vpr_throw(VPR_ERROR_BLIF_F, filename_.c_str(), lineno_,
                       "No non-blackbox models found. The main model must not be a blackbox.");
         }
 
         //Return the main model
-        VTR_ASSERT(top_model_idx >= 0);
-        return static_cast<size_t>(top_model_idx);
+        return top_model_idx.value();
     }
 
   private:
@@ -536,11 +537,17 @@ struct BlifAllocCallback : public blifparse::Callback {
 
     bool verify_blackbox_model(AtomNetlist& blif_model) {
         LogicalModelId arch_model_id = models_.get_model_by_name(blif_model.netlist_name());
+
+        if(!arch_model_id.is_valid()) {
+            vpr_throw(VPR_ERROR_BLIF_F, filename_.c_str(), lineno_, "BLIF model '%s' has no equivalent architecture model.",
+                    blif_model.netlist_name().c_str());
+        }
+
         const t_model& arch_model = models_.get_model(arch_model_id);
 
         //Verify each port on the model
         //
-        // We parse each .model as it's own netlist so the IOs
+        // We parse each .model as its own netlist so the IOs
         // get converted to blocks
         for (auto blk_id : blif_model.blocks()) {
             //Check that the port directions match
diff --git a/vpr/src/pack/greedy_seed_selector.cpp b/vpr/src/pack/greedy_seed_selector.cpp
@@ -153,6 +153,9 @@ static inline void print_seed_gains(const char* fname,
     fprintf(fp, "\n");
     for (auto mol_id : seed_mols) {
         for (AtomBlockId blk_id : prepacker.get_molecule(mol_id).atom_block_ids) {
+            if (!blk_id.is_valid()) {
+                continue;
+            }
             std::string name = atom_netlist.block_name(blk_id);
             fprintf(fp, "%-*s ", max_name_len, name.c_str());
 
diff --git a/vpr/src/route/rr_graph_generation/tileable_rr_graph/tileable_rr_graph_node_builder.cpp b/vpr/src/route/rr_graph_generation/tileable_rr_graph/tileable_rr_graph_node_builder.cpp
@@ -847,7 +847,11 @@ static void load_one_chan_rr_nodes_basic_info(const RRGraphView& rr_graph,
             size_t seg_id = chan_details.get_track_segment_id(itrack);
             e_parallel_axis wanted_axis = chan_type == e_rr_type::CHANX ? e_parallel_axis::X_AXIS : e_parallel_axis::Y_AXIS;
             size_t parallel_seg_id = find_parallel_seg_index(seg_id, seg_index_map, wanted_axis);
-            rr_node_driver_switches[node] = RRSwitchId(segment_infs[parallel_seg_id].arch_opin_switch);
+            if (Direction::DEC == chan_details.get_track_direction(itrack) && segment_infs[parallel_seg_id].arch_opin_switch_dec != -1) {
+                rr_node_driver_switches[node] = RRSwitchId(segment_infs[parallel_seg_id].arch_opin_switch_dec);
+            } else {
+                rr_node_driver_switches[node] = RRSwitchId(segment_infs[parallel_seg_id].arch_opin_switch);
+            }
 
             // Update chan_details with node_id
             chan_details.set_track_node_id(itrack, size_t(node));
diff --git a/vpr/src/route/segment_stats.cpp b/vpr/src/route/segment_stats.cpp
@@ -111,8 +111,8 @@ void get_segment_usage_stats(std::vector<t_segment_inf>& segment_inf) {
     }
 
     VTR_LOG("\n");
-    VTR_LOG("Segment occupancy by length: Length utilization\n");
-    VTR_LOG("                             ------ -----------\n");
+    VTR_LOG("Segment occupancy by length: Length Occupancy Capacity Utilization\n");
+    VTR_LOG("                             ------ --------- -------- -----------\n");
     for (const int seg_length : segment_lengths) {
         if (directed_cap_by_length[e_parallel_axis::X_AXIS][seg_length] != 0 || directed_cap_by_length[e_parallel_axis::Y_AXIS][seg_length] != 0) {
             std::string seg_name = "L" + std::to_string(seg_length);
@@ -124,7 +124,7 @@ void get_segment_usage_stats(std::vector<t_segment_inf>& segment_inf) {
                 cap += directed_cap_by_length[ax][seg_length];
             }
             utilization = (float)occ / (float)cap;
-            VTR_LOG("                             %s     %11.3g\n", seg_name.c_str(), utilization);
+            VTR_LOG("                             %-6s %9d %8d %11.3g\n", seg_name.c_str(), occ, cap, utilization);
         }
     }
 
diff --git a/vpr/src/util/vpr_utils.cpp b/vpr/src/util/vpr_utils.cpp
@@ -40,8 +40,6 @@ static AtomPinId find_atom_pin_for_pb_route_id(ClusterBlockId clb, int pb_route_
 
 static bool block_type_contains_blif_model(t_logical_block_type_ptr type, const std::regex& blif_model_regex);
 static bool pb_type_contains_blif_model(const t_pb_type* pb_type, const std::regex& blif_model_regex);
-static t_pb_graph_pin** alloc_and_load_pb_graph_pin_lookup_from_index(t_logical_block_type_ptr type);
-static void free_pb_graph_pin_lookup_from_index(t_pb_graph_pin** pb_graph_pin_lookup_from_type);
 
 /******************** Subroutine definitions *********************************/
 
@@ -1020,7 +1018,7 @@ static void load_pb_graph_pin_lookup_from_index_rec(t_pb_graph_pin** pb_graph_pi
 }
 
 /* Create a lookup that returns a pb_graph_pin pointer given the pb_graph_pin index */
-static t_pb_graph_pin** alloc_and_load_pb_graph_pin_lookup_from_index(t_logical_block_type_ptr type) {
+t_pb_graph_pin** alloc_and_load_pb_graph_pin_lookup_from_index(t_logical_block_type_ptr type) {
     t_pb_graph_pin** pb_graph_pin_lookup_from_type = nullptr;
 
     t_pb_graph_node* pb_graph_head = type->pb_graph_head;
@@ -1048,7 +1046,7 @@ static t_pb_graph_pin** alloc_and_load_pb_graph_pin_lookup_from_index(t_logical_
 }
 
 /* Free pb_graph_pin lookup array */
-static void free_pb_graph_pin_lookup_from_index(t_pb_graph_pin** pb_graph_pin_lookup_from_type) {
+void free_pb_graph_pin_lookup_from_index(t_pb_graph_pin** pb_graph_pin_lookup_from_type) {
     if (pb_graph_pin_lookup_from_type == nullptr) {
         return;
     }
diff --git a/vpr/src/util/vpr_utils.h b/vpr/src/util/vpr_utils.h
@@ -190,7 +190,9 @@ t_pb_graph_pin* get_pb_graph_node_pin_from_model_port_pin(const t_model_ports* m
 ///        pb_graph_node.
 t_pb_graph_pin* get_pb_graph_node_pin_from_pb_graph_node(t_pb_graph_node* pb_graph_node, int ipin);
 t_pb_graph_pin* get_pb_graph_node_pin_from_block_pin(ClusterBlockId iblock, int ipin);
+t_pb_graph_pin** alloc_and_load_pb_graph_pin_lookup_from_index(t_logical_block_type_ptr type);
 vtr::vector<ClusterBlockId, t_pb**> alloc_and_load_pin_id_to_pb_mapping();
+void free_pb_graph_pin_lookup_from_index(t_pb_graph_pin** pb_graph_pin_lookup_from_type);
 void free_pin_id_to_pb_mapping(vtr::vector<ClusterBlockId, t_pb**>& pin_id_to_pb_mapping);
 
 std::tuple<t_physical_tile_type_ptr, const t_sub_tile*, int, t_logical_block_type_ptr> get_cluster_blk_physical_spec(ClusterBlockId cluster_blk_id);
diff --git a/vpr/test/test_vpr_constraints.cpp b/vpr/test/test_vpr_constraints.cpp
@@ -1,3 +1,7 @@
+#include <sstream>
+#include <iostream>
+#include <string>
+
 #include "../src/base/partition_region.h"
 
 #include "catch2/catch_test_macros.hpp"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`if (VPR_ENABLE_INTERCHANGE)`
`35`		`- set(IC_DIR ${CMAKE_SOURCE_DIR}/libs/EXTERNAL/libinterchange/interchange)`
	`35`	`+ set(IC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../EXTERNAL/libinterchange/interchange)`
`36`	`36`	`set(CAPNPC_SRC_PREFIX ${IC_DIR})`
`37`	`37`
`38`	`38`	`find_program(WGET wget REQUIRED)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#include <limits>`
	`2`	`+`
`1`	`3`	`#include "vtr_assert.h"`
`2`	`4`
`3`	`5`	`namespace vtr {`