equivalent tiles: changed pin mapping retrieval

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

Author: acomodi

vpr/src/util/vpr_utils.cpp

@@ -584,27 +584,23 @@ int find_clb_pb_pin(ClusterBlockId clb, int clb_pin) {
 
     auto& clb_nlist = cluster_ctx.clb_nlist;
 
-    t_type_ptr equivalent_type = clb_nlist.block_type(clb);
-    t_type_ptr original_type = clb_nlist.block_type(clb, false);
-
-    bool eq_type_selected = original_type == equivalent_type ? false : true;
-
-    VTR_ASSERT_MSG(clb_pin < equivalent_type->num_pins, "Must be a valid top-level pin");
+    int eq_type_index = clb_nlist.block_eq_type_index(clb);
+    auto type = clb_nlist.block_type(clb);
 
     int pin = clb_pin;
 
-    if(eq_type_selected) {
-        int equivalent_type_index = clb_nlist.block_eq_type_index(clb);
-        VTR_ASSERT(equivalent_type_index != OPEN);
-        pin = original_type->equivalent_tile_inverse_pin_mapping[equivalent_type_index][clb_pin];
+    // In case an equivalent tile is selected, the CLB block type will be different (e.g. CLB logic type is LAB, CLB physical type is MLAB).
+    // Therefore, I need to retrieve the pin mapping from the LAB type by setting the `false` flag when calling block_type.
+    if(eq_type_index != OPEN) {
+        pin = clb_nlist.block_type(clb, false)->equivalent_tile_inverse_pin_mapping[eq_type_index][clb_pin];
     }
 
-    int pb_pin = -1;
+    int pb_pin = OPEN;
     if(place_ctx.block_locs[clb].nets_and_pins_synced_to_z_coordinate) {
         //Pins have been offset by z-coordinate, need to remove offset
 
-        VTR_ASSERT(equivalent_type->num_pins % equivalent_type->capacity == 0);
-        int num_basic_block_pins = equivalent_type->num_pins / equivalent_type->capacity;
+        VTR_ASSERT(type->num_pins % type->capacity == 0);
+        int num_basic_block_pins = type->num_pins / type->capacity;
         /* Logical location and physical location is offset by z * max_num_block_pins */
 
         pb_pin = pin + place_ctx.block_locs[clb].z * num_basic_block_pins;
@@ -624,24 +620,22 @@ int find_pb_pin_clb_pin(ClusterBlockId clb, int pb_pin) {
 
     auto& clb_nlist = cluster_ctx.clb_nlist;
 
-    t_type_ptr equivalent_type = clb_nlist.block_type(clb);
-    t_type_ptr original_type = clb_nlist.block_type(clb, false);
-
-    bool eq_type_selected = original_type == equivalent_type ? false : true;
+    int eq_type_index = clb_nlist.block_eq_type_index(clb);
+    auto type = clb_nlist.block_type(clb);
 
     int pin = pb_pin;
 
-    if(eq_type_selected) {
-        int equivalent_type_index = clb_nlist.block_eq_type_index(clb);
-        VTR_ASSERT(equivalent_type_index != OPEN);
-        pin = original_type->equivalent_tile_pin_mapping[equivalent_type_index][pb_pin];
+    // In case an equivalent tile is selected, the CLB block type will be different (e.g. CLB logic type is LAB, CLB physical type is MLAB).
+    // Therefore, I need to retrieve the pin mapping from the LAB type by setting the `false` flag when calling block_type.
+    if(eq_type_index != OPEN) {
+        pin = clb_nlist.block_type(clb, false)->equivalent_tile_pin_mapping[eq_type_index][pb_pin];
     }
 
-    int clb_pin = -1;
+    int clb_pin = OPEN;
     if(place_ctx.block_locs[clb].nets_and_pins_synced_to_z_coordinate) {
         //Pins have been offset by z-coordinate, need to remove offset
-        VTR_ASSERT(equivalent_type->num_pins % equivalent_type->capacity == 0);
-        int num_basic_block_pins = equivalent_type->num_pins / equivalent_type->capacity;
+        VTR_ASSERT(type->num_pins % type->capacity == 0);
+        int num_basic_block_pins = type->num_pins / type->capacity;
         /* Logical location and physical location is offset by z * max_num_block_pins */
 
         clb_pin = pin + place_ctx.block_locs[clb].z * num_basic_block_pins;