From c6dd33a965a3a0d3856ccf22285fbbd434ca05c7 Mon Sep 17 00:00:00 2001 From: tangxifan Date: Wed, 10 Jul 2024 11:59:25 -0700 Subject: [PATCH] [core] fixed a bug when annotating global nets on OPIN --- .../src/annotation/openfpga_annotate_routing.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/openfpga/src/annotation/openfpga_annotate_routing.cpp b/openfpga/src/annotation/openfpga_annotate_routing.cpp index 64854e8df..75da0fe8f 100644 --- a/openfpga/src/annotation/openfpga_annotate_routing.cpp +++ b/openfpga/src/annotation/openfpga_annotate_routing.cpp @@ -72,11 +72,22 @@ vtr::vector annotate_rr_node_global_net( break; } VTR_ASSERT(node_pin_num < phy_tile->num_pins); + t_rr_type rr_pin_type = IPIN; + if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == RECEIVER) { + rr_pin_type = IPIN; + } else if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == DRIVER) { + rr_pin_type = OPIN; + } else { + VTR_LOG_ERROR("When annotating global net '%s', invalid rr node pin type for '%s' pin '%d'\n", + cluster_nlist.net_name(net_id).c_str(), phy_tile->name, + node_pin_num); + exit(1); + } std::vector curr_rr_nodes = rr_graph.node_lookup().find_nodes_at_all_sides( - layer, blk_loc.loc.x, blk_loc.loc.y, IPIN, node_pin_num); + layer, blk_loc.loc.x, blk_loc.loc.y, rr_pin_type, node_pin_num); for (RRNodeId curr_rr_node : curr_rr_nodes) { - VTR_LOGV(verbose, "Annotate global net '%s' on '%s' pin '%d'\n", + VTR_LOGV(verbose, "on '%s' pin '%d'\n", cluster_nlist.net_name(net_id).c_str(), phy_tile->name, node_pin_num); rr_node_nets[curr_rr_node] = net_id;