Skip to content

Commit 81c3425

Browse files
committed
revert prepacker changes
1 parent 63d1442 commit 81c3425

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

vpr/src/pack/prepack.cpp

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ static AtomBlockId get_driving_block(const AtomBlockId block_id,
117117
const t_pack_pattern_connections& connections,
118118
const AtomNetlist& atom_nlist);
119119

120-
static t_pb_graph_pin* get_compatible_chain_root_pin(const t_pack_patterns* chain_pattern, const AtomBlockId blk_id);
121-
122120
static void print_chain_starting_points(t_pack_patterns* chain_pattern);
123121

124122
/*****************************************/
@@ -1174,17 +1172,6 @@ static AtomBlockId get_driving_block(const AtomBlockId block_id,
11741172
return AtomBlockId::INVALID();
11751173
}
11761174

1177-
static t_pb_graph_pin* get_compatible_chain_root_pin(const t_pack_patterns* chain_pattern, const AtomBlockId blk_id) {
1178-
for (const auto& chain : chain_pattern->chain_root_pins) {
1179-
for (const auto& tie_off : chain) {
1180-
if (primitive_type_feasible(blk_id, tie_off->parent_node->pb_type)) {
1181-
return tie_off;
1182-
}
1183-
}
1184-
}
1185-
return nullptr;
1186-
}
1187-
11881175
static void print_pack_molecules(const char* fname,
11891176
const std::vector<t_pack_patterns>& list_of_pack_patterns,
11901177
const int num_pack_patterns,
@@ -1341,13 +1328,15 @@ static AtomBlockId find_new_root_atom_for_chain(const AtomBlockId blk_id,
13411328
const AtomNetlist& atom_nlist) {
13421329
AtomBlockId new_root_blk_id;
13431330
t_pb_graph_pin* root_ipin;
1331+
t_pb_graph_node* root_pb_graph_node;
13441332
t_model_ports* model_port;
13451333

13461334
VTR_ASSERT(list_of_pack_patterns->is_chain == true);
13471335
VTR_ASSERT(list_of_pack_patterns->chain_root_pins.size());
1348-
root_ipin = get_compatible_chain_root_pin(list_of_pack_patterns, blk_id);
1336+
root_ipin = list_of_pack_patterns->chain_root_pins[0][0];
1337+
root_pb_graph_node = root_ipin->parent_node;
13491338

1350-
if (root_ipin == nullptr) {
1339+
if (primitive_type_feasible(blk_id, root_pb_graph_node->pb_type) == false) {
13511340
return AtomBlockId::INVALID();
13521341
}
13531342

@@ -1642,7 +1631,7 @@ static void init_molecule_chain_info(const AtomBlockId blk_id,
16421631
// pattern assigned to it and the input block should be valid
16431632
VTR_ASSERT(molecule.pack_pattern && blk_id);
16441633

1645-
auto root_ipin = get_compatible_chain_root_pin(molecule.pack_pattern, blk_id);
1634+
auto root_ipin = molecule.pack_pattern->chain_root_pins[0][0];
16461635
auto model_pin = root_ipin->port->model_port;
16471636
auto pin_bit = root_ipin->pin_number;
16481637

0 commit comments

Comments
 (0)