equivalent: use logical-physical pin mappings

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

vpr/src/base/ShowSetup.cpp

@@ -74,16 +74,20 @@ void printClusteredNetlistStats() {
     L_num_p_outputs = 0;
 
     for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
-        num_blocks_type[cluster_ctx.clb_nlist.block_type(blk_id)->index]++;
-        // XXX mapping here
-        auto type = cluster_ctx.clb_nlist.block_type(blk_id)->equivalent_tiles[0];
-        if (is_io_type(type)) {
-            for (j = 0; j < type->num_pins; j++) {
+        auto logical_block = cluster_ctx.clb_nlist.block_type(blk_id);
+        auto physical_tile = pick_random_physical_type(logical_block);
+        num_blocks_type[logical_block->index]++;
+        if (is_io_type(physical_tile)) {
+            for (j = 0; j < logical_block->pb_type->num_pins; j++) {
+                int phy_pin = get_physical_pin(physical_tile, logical_block, j);
+                auto pin_class = physical_tile->pin_class[phy_pin];
+                auto class_inf = physical_tile->class_inf[pin_class];
+
                 if (cluster_ctx.clb_nlist.block_net(blk_id, j) != ClusterNetId::INVALID()) {
-                    if (type->class_inf[type->pin_class[j]].type == DRIVER) {
+                    if (class_inf.type == DRIVER) {
                         L_num_p_inputs++;
                     } else {
-                        VTR_ASSERT(type->class_inf[type->pin_class[j]].type == RECEIVER);
+                        VTR_ASSERT(class_inf.type == RECEIVER);
                         L_num_p_outputs++;
                     }
                 }

vpr/src/draw/draw.cpp

@@ -2660,10 +2660,12 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type, ClusterBlockId b
         if (net_id == ClusterNetId::INVALID())
             continue;
 
-        // XXX Logical Physical Mapping to be used here
-        iclass = physical_tile_type(blk_id)->pin_class[k];
+        auto physical_tile = physical_tile_type(blk_id);
+        int phy_pin = get_physical_pin(physical_tile, type, k);
 
-        if (physical_tile_type(blk_id)->class_inf[iclass].type == DRIVER) { /* Fanout */
+        iclass = physical_tile->pin_class[phy_pin];
+
+        if (physical_tile->class_inf[iclass].type == DRIVER) { /* Fanout */
             if (draw_state->block_color[blk_id] == SELECTED_COLOR) {
                 /* If block already highlighted, de-highlight the fanout. (the deselect case)*/
                 draw_state->net_color[net_id] = ezgl::BLACK;