vpr: pack: use second primitive_type_feasible() check

Signed-off-by: Pawel Czarnecki <pczarnecki@antmicro.com>

Author: lpawelcz

vpr/src/pack/cluster_placement.cpp

@@ -138,7 +138,7 @@ bool get_next_primitive_list(t_cluster_placement_stats* cluster_placement_stats,
             continue; /* no more primitives of this type available */
         }
         if (primitive_type_feasible(molecule->atom_block_ids[molecule->root],
-                                    cluster_placement_stats->valid_primitives[i]->next_primitive->pb_graph_node->pb_type)) {
+                                    cluster_placement_stats->valid_primitives[i]->next_primitive->pb_graph_node)) {
             prev = cluster_placement_stats->valid_primitives[i];
             cur = cluster_placement_stats->valid_primitives[i]->next_primitive;
             while (cur) {
@@ -397,7 +397,7 @@ static float try_place_molecule(const t_pack_molecule* molecule,
     list_size = get_array_size_of_molecule(molecule);
 
     if (primitive_type_feasible(molecule->atom_block_ids[molecule->root],
-                                root->pb_type)) {
+                                root)) {
         if (root->cluster_placement_primitive->valid == true) {
             for (i = 0; i < list_size; i++) {
                 primitives_list[i] = nullptr;

vpr/src/pack/cluster_util.cpp

@@ -631,7 +631,7 @@ bool primitive_feasible(const AtomBlockId blk_id, t_pb* cur_pb) {
     }
 
     //Generic feasibility check
-    return primitive_type_feasible(blk_id, cur_pb_type);
+    return primitive_type_feasible(blk_id, cur_pb->pb_graph_node);
 }
 
 bool primitive_memory_sibling_feasible(const AtomBlockId blk_id, const t_pb_type* cur_pb_type, const AtomBlockId sibling_blk_id) {

vpr/src/pack/prepack.cpp

@@ -1237,7 +1237,7 @@ static t_pb_graph_node* get_expected_lowest_cost_primitive_for_atom_block_in_pb_
     }
 
     if (curr_pb_graph_node->pb_type->blif_model != nullptr) {
-        if (primitive_type_feasible(blk_id, curr_pb_graph_node->pb_type)) {
+        if (primitive_type_feasible(blk_id, curr_pb_graph_node)) {
             cur_cost = compute_primitive_base_cost(curr_pb_graph_node);
             if (best_cost == UNDEFINED || best_cost > cur_cost) {
                 best_cost = cur_cost;

vpr/src/util/vpr_utils.cpp

@@ -914,24 +914,23 @@ bool primitive_type_feasible(const AtomBlockId blk_id, t_pb_graph_node* curr_pb_
 
     auto& atom_ctx = g_vpr_ctx.atom();
     if (cur_pb_type->model != atom_ctx.nlist.block_model(blk_id)) {
-        if ((strcmp(atom_ctx.nlist.block_model(blk_id)->name, MODEL_LATCH) == 0) &&
-            (strcmp(atom_ctx.nlist.block_model(blk_id)->name, cur_pb_type->model->name) == 0)) {
-           /**
-            * Special case for .latch: this model exists in 2 variations which are
-            * defined one after another in linked list, check if the second variant match
-            */
+        if ((strcmp(atom_ctx.nlist.block_model(blk_id)->name, MODEL_LATCH) == 0) && (strcmp(atom_ctx.nlist.block_model(blk_id)->name, cur_pb_type->model->name) == 0)) {
+            /**
+             * Special case for .latch: this model exists in 2 variations which are
+             * defined one after another in linked list, check if the second variant match
+             */
 
             if (cur_pb_type->model->next == atom_ctx.nlist.block_model(blk_id) && atom_ctx.nlist.block_model(blk_id)->inputs[1].trigg_edge == TriggeringEdge::FALLING_EDGE) {
                 //Next primitive match atom - add secondary references
                 if (!curr_pb_graph_node->has_secondary)
-                        curr_pb_graph_node->update_pins();
+                    curr_pb_graph_node->update_pins();
             } else {
                 //Next primitive and atom do not match
                 return false;
             }
         } else {
-          //Primitive and atom do not match
-          return false;
+            //Primitive and atom do not match
+            return false;
         }
     }
 
@@ -948,10 +947,10 @@ bool primitive_type_feasible(const AtomBlockId blk_id, t_pb_graph_node* curr_pb_
     //as the atom requires
     for (int iport = 0; iport < cur_pb_type->num_ports; ++iport) {
         t_port* pb_port;
-        if(curr_pb_graph_node->has_secondary)
-                pb_port = &cur_pb_type->ports_sec[iport];
+        if (curr_pb_graph_node->has_secondary)
+            pb_port = &cur_pb_type->ports_sec[iport];
         else
-                pb_port = &cur_pb_type->ports[iport];
+            pb_port = &cur_pb_type->ports[iport];
 
         const t_model_ports* pb_model_port = pb_port->model_port;