Merge pull request #1591 from antmicro/carry_assert_fix

vaughnbetz · web-flow · commit 4fc4b4c6fd6c · 2020-11-12T13:20:46.000-05:00
Chain pack pattern assertion fix
diff --git a/vpr/src/pack/prepack.cpp b/vpr/src/pack/prepack.cpp
@@ -1548,6 +1548,7 @@ static void update_chain_root_pins(t_pack_patterns* chain_pattern,
     for (const auto pin_ptr : chain_input_pins) {
         std::vector<t_pb_graph_pin*> connected_primitive_pins;
         get_all_connected_primitive_pins(pin_ptr, connected_primitive_pins);
+        VTR_ASSERT(connected_primitive_pins.size());
         primitive_input_pins.push_back(connected_primitive_pins);
     }
 
@@ -1602,8 +1603,6 @@ static void get_all_connected_primitive_pins(const t_pb_graph_pin* cluster_input
             }
         }
     }
-
-    VTR_ASSERT(connected_primitive_pins.size());
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1548,6 +1548,7 @@ static void update_chain_root_pins(t_pack_patterns* chain_pattern,`
`1548`	`1548`	`for (const auto pin_ptr : chain_input_pins) {`
`1549`	`1549`	`std::vector<t_pb_graph_pin*> connected_primitive_pins;`
`1550`	`1550`	`get_all_connected_primitive_pins(pin_ptr, connected_primitive_pins);`
	`1551`	`+ VTR_ASSERT(connected_primitive_pins.size());`
`1551`	`1552`	`primitive_input_pins.push_back(connected_primitive_pins);`
`1552`	`1553`	`}`
`1553`	`1554`
`@@ -1602,8 +1603,6 @@ static void get_all_connected_primitive_pins(const t_pb_graph_pin* cluster_input`
`1602`	`1603`	`}`
`1603`	`1604`	`}`
`1604`	`1605`	`}`
`1605`		`-`
`1606`		`- VTR_ASSERT(connected_primitive_pins.size());`
`1607`	`1606`	`}`
`1608`	`1607`
`1609`	`1608`	`/**`