is_chan --> is_chanxy && handle chanz in get_adjusted_rr_position()

Author: soheilshahrouz

libs/librrgraph/src/base/rr_node_types.h

@@ -33,6 +33,11 @@ enum class e_rr_type : unsigned char {
     NUM_RR_TYPES
 };
 
+constexpr bool is_pin(e_rr_type type) { return (type == e_rr_type::IPIN || type == e_rr_type::OPIN); }
+constexpr bool is_chanxy(e_rr_type type) { return (type == e_rr_type::CHANX || type == e_rr_type::CHANY); }
+constexpr bool is_chanz(e_rr_type type) { return (type == e_rr_type::CHANZ); }
+constexpr bool is_src_sink(e_rr_type type) { return (type == e_rr_type::SOURCE || type == e_rr_type::SINK); }
+
 /// Used to iterate for different e_rr_type values in range-based for loops.
 constexpr std::array<e_rr_type, (size_t)e_rr_type::NUM_RR_TYPES> RR_TYPES = {{e_rr_type::SOURCE, e_rr_type::SINK,
                                                                               e_rr_type::IPIN, e_rr_type::OPIN,

vpr/src/base/vpr_types.h

@@ -1447,10 +1447,6 @@ struct t_det_routing_arch {
     std::string read_rr_edge_override_filename;
 };
 
-constexpr bool is_pin(e_rr_type type) { return (type == e_rr_type::IPIN || type == e_rr_type::OPIN); }
-constexpr bool is_chan(e_rr_type type) { return (type == e_rr_type::CHANX || type == e_rr_type::CHANY); }
-constexpr bool is_src_sink(e_rr_type type) { return (type == e_rr_type::SOURCE || type == e_rr_type::SINK); }
-
 /**
  * @brief Information about the current status of a particular
  *        net as pertains to routing

vpr/src/route/route_common.cpp

@@ -450,7 +450,7 @@ static float comp_initial_acc_cost(RRNodeId node_id,
     const double weight = route_opts.initial_acc_cost_chan_congestion_weight;
 
     // TODO: We don't have an explicit CHANZ type. These wires are marked as CHANX. This should be fixed.
-    if (is_chan(rr_type)) {
+    if (is_chanxy(rr_type)) {
         double max_util = 0.;
 
         if (rr_type == e_rr_type::CHANX) {

vpr/src/route/router_lookahead/router_lookahead_map_utils.cpp

@@ -594,7 +594,7 @@ std::pair<int, int> get_xy_deltas(RRNodeId from_node, RRNodeId to_node) {
 
     int delta_x, delta_y;
 
-    if (!is_chan(from_type) && !is_chan(to_type)) {
+    if (!is_chanxy(from_type) && !is_chanxy(to_type)) {
         //Alternate formulation for non-channel types
         auto [from_x, from_y] = get_adjusted_rr_position(from_node);
         auto [to_x, to_y] = get_adjusted_rr_position(to_node);
@@ -659,7 +659,7 @@ std::pair<int, int> get_xy_deltas(RRNodeId from_node, RRNodeId to_node) {
         /* account for wire direction. lookahead map was computed by looking up and to the right starting at INC wires. for targets
          * that are opposite of the wire direction, let's add 1 to delta_seg */
         Direction from_dir = rr_graph.node_direction(from_node);
-        if (is_chan(from_type)
+        if (is_chanxy(from_type)
             && ((to_seg < from_seg_low && from_dir == Direction::INC) || (to_seg > from_seg_high && from_dir == Direction::DEC))) {
             delta_seg++;
         }
@@ -1412,13 +1412,15 @@ static std::pair<int, int> get_adjusted_rr_position(const RRNodeId rr) {
 
     e_rr_type rr_type = rr_graph.node_type(rr);
 
-    if (is_chan(rr_type)) {
+    if (is_chanxy(rr_type)) {
         return get_adjusted_rr_wire_position(rr);
     } else if (is_pin(rr_type)) {
         return get_adjusted_rr_pin_position(rr);
-    } else {
-        VTR_ASSERT_SAFE(is_src_sink(rr_type));
+    } else if (is_src_sink(rr_type)) {
         return get_adjusted_rr_src_sink_position(rr);
+    } else {
+        VTR_ASSERT_SAFE(is_chanz(rr_type));
+        return {rr_graph.node_xlow(rr), rr_graph.node_ylow(rr)};
     }
 }
 
@@ -1492,7 +1494,7 @@ static std::pair<int, int> get_adjusted_rr_wire_position(const RRNodeId rr) {
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;
 
-    VTR_ASSERT_SAFE(is_chan(rr_graph.node_type(rr)));
+    VTR_ASSERT_SAFE(is_chanxy(rr_graph.node_type(rr)));
 
     Direction rr_dir = rr_graph.node_direction(rr);