Merge branch 'master' into fredt_check_blif_model_is_in_arch

Author: gigeresk

.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:

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));

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);
         }
     }