Skip to content

Commit c49f25f

Browse files
authored
Merge pull request #2029 from verilog-to-routing/pb_graph_bug_fixes
Pb graph bug fixes
2 parents ca42b32 + ea75051 commit c49f25f

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,10 @@ tags
133133
.vscode
134134
.history
135135
#eclipse project
136-
.project
136+
.project
137+
138+
#
139+
# CLION
140+
#
141+
.idea
142+
cmake-build-debug

libs/libarchfpga/src/arch_util.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
611611
copy->num_clock_pins = pb_type->num_clock_pins;
612612
copy->num_input_pins = pb_type->num_input_pins;
613613
copy->num_output_pins = pb_type->num_output_pins;
614+
copy->num_pins = pb_type->num_pins;
614615
copy->num_pb = 1;
615616

616617
/* Power */
@@ -630,6 +631,8 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
630631
copy->ports[i].name = vtr::strdup(pb_type->ports[i].name);
631632
copy->ports[i].port_class = vtr::strdup(pb_type->ports[i].port_class);
632633
copy->ports[i].port_index_by_type = pb_type->ports[i].port_index_by_type;
634+
copy->ports[i].index = pb_type->ports[i].index;
635+
copy->ports[i].absolute_first_pin_index = pb_type->ports[i].absolute_first_pin_index;
633636

634637
copy->ports[i].port_power = (t_port_power*)vtr::calloc(1,
635638
sizeof(t_port_power));

libs/libarchfpga/src/read_xml_arch_file.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,9 +3407,9 @@ static void ProcessSubTiles(pugi::xml_node Node,
34073407
SubTile.num_phy_pins = pin_counts.total() * capacity;
34083408

34093409
/* Assign pin counts to the Physical Tile Type */
3410-
PhysicalTileType->num_input_pins += pin_counts.input;
3411-
PhysicalTileType->num_output_pins += pin_counts.output;
3412-
PhysicalTileType->num_clock_pins += pin_counts.clock;
3410+
PhysicalTileType->num_input_pins += capacity * pin_counts.input;
3411+
PhysicalTileType->num_output_pins += capacity * pin_counts.output;
3412+
PhysicalTileType->num_clock_pins += capacity * pin_counts.clock;
34133413
PhysicalTileType->num_pins += capacity * pin_counts.total();
34143414
PhysicalTileType->num_inst_pins += pin_counts.total();
34153415

0 commit comments

Comments
 (0)