update inter_layer_connections_limited_to_opin() to check OPIN-CHANZ

Author: soheilshahrouz

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -240,19 +240,17 @@ void rr_set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_buil
 }
 
 bool inter_layer_connections_limited_to_opin(const RRGraphView& rr_graph) {
-    // TODO: once OPINs are connected to CHANZ nodes, this function should be reworked.
     bool limited_to_opin = true;
+
     for (const RRNodeId from_node : rr_graph.nodes()) {
+        e_rr_type from_type = rr_graph.node_type(from_node);
         for (t_edge_size edge : rr_graph.edges(from_node)) {
             RRNodeId to_node = rr_graph.edge_sink_node(from_node, edge);
-            int from_layer = rr_graph.node_layer_low(from_node);
-            int to_layer = rr_graph.node_layer_low(to_node);
-
-            if (from_layer != to_layer) {
-                if (rr_graph.node_type(from_node) != e_rr_type::OPIN) {
-                    limited_to_opin = false;
-                    break;
-                }
+            e_rr_type to_type = rr_graph.node_type(to_node);
+
+            if (to_type == e_rr_type::CHANZ && from_type != e_rr_type::OPIN) {
+                limited_to_opin = false;
+                break;
             }
         }
         if (!limited_to_opin) {

libs/librrgraph/src/base/rr_graph_utils.h

@@ -93,8 +93,7 @@ int seg_index_of_sblock(const RRGraphView& rr_graph, int from_node, int to_node)
  * box to be used to estimate the wire-length of a net.
  *
  * @param rr_graph The routing resource graph
- *
- * @return limited_to_opin
+ * @return True if inter-die 3D connections are driven only by OPIN nodes; otherwise, false.
  */
 bool inter_layer_connections_limited_to_opin(const RRGraphView& rr_graph);
 

vpr/src/base/vpr_context.cpp

@@ -88,7 +88,7 @@ static bool is_cube_bb(const e_place_bounding_box_mode place_bb_mode,
         cube_bb = true;
     } else {
         // The user has specifically asked for PER_LAYER_BB
-        VTR_ASSERT_SAFE(place_bb_mode == e_place_bounding_box_mode::PER_LAYER_BB);
+        VTR_ASSERT(place_bb_mode == e_place_bounding_box_mode::PER_LAYER_BB);
         cube_bb = false;
     }
 

vpr/src/base/vpr_context.h

@@ -44,7 +44,7 @@
 class SetupHoldTimingInfo;
 class PostClusterDelayCalculator;
 
-#endif /* NO_SERVER */
+#endif // NO_SERVER
 
 struct t_rr_node_route_inf;
 

vpr/src/route/rr_graph_generation/rr_graph_sg.cpp

@@ -132,12 +132,12 @@ void add_edges_opin_chanz_per_side(const RRGraphView& rr_graph,
 
         case RIGHT:
             sb_loc0 = {x, y, layer};
-            sb_loc1 = {x , y - 1, layer};
+            sb_loc1 = {x, y - 1, layer};
             break;
 
         case LEFT:
             sb_loc0 = {x - 1, y, layer};
-            sb_loc1 = {x - 1 , y - 1, layer};
+            sb_loc1 = {x - 1, y - 1, layer};
             break;
 
         default:
@@ -204,7 +204,6 @@ void add_edges_opin_chanz_per_side(const RRGraphView& rr_graph,
             }
         }
     }
-
 }
 
 void add_edges_opin_chanz_per_block(const RRGraphView& rr_graph,