Skip to content

add flat idx to pb_graph_node , populate in alloc_and_load_pb_graph #2590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2024
Merged

add flat idx to pb_graph_node , populate in alloc_and_load_pb_graph #2590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b3cd7
add flat idx to pb_graph_node and modifed alloc_and_load... to popula…
KA7E Jun 5, 2024
2918b9d
updated comments, added subrouting for flat index computation
KA7E Jun 8, 2024
bf3bdf0
added comments
KA7E Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions libs/libarchfpga/src/physical_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,7 @@ struct t_pin_to_pin_annotation {
* parent_pb_graph_node : parent pb graph node
* total_primitive_count : Total number of this primitive type in the cluster. If there are 10 ALMs per cluster
* and 2 FFs per ALM (given the mode of the parent of this primitive) then the total is 20.
* flat_site_index : index of this primitive within its primitive type in this cluster; in [0,...,total_primitive_count]
* illegal_modes : vector containing illegal modes that result in conflicts during routing
*/
class t_pb_graph_node {
Expand Down Expand Up @@ -1281,6 +1282,8 @@ class t_pb_graph_node {
int num_output_pin_class; /* number of output pin classes that this pb_graph_node has */

int total_primitive_count; /* total number of this primitive type in the cluster */
int flat_site_index; /* index of this primitive within sites of its type in this cluster */


/* Interconnect instances for this pb
* Only used for power
Expand Down
7 changes: 7 additions & 0 deletions vpr/src/pack/pb_type_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
t_pb_graph_node* parent_pb_graph_node,
t_pb_type* pb_type,
const int index,
const int flat_index,
bool load_power_structures,
int& pin_count_in_cluster);

Expand Down Expand Up @@ -151,6 +152,7 @@ void alloc_and_load_all_pb_graphs(bool load_power_structures, bool is_flat) {
nullptr,
type.pb_type,
0,
0,
load_power_structures,
pin_count_in_cluster);
type.pb_graph_head->total_pb_pins = pin_count_in_cluster;
Expand Down Expand Up @@ -224,6 +226,7 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
t_pb_graph_node* parent_pb_graph_node,
t_pb_type* pb_type,
const int index,
const int flat_index,
bool load_power_structures,
int& pin_count_in_cluster) {
int i, j, k, i_input, i_output, i_clockport;
Expand All @@ -237,6 +240,7 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
pb_graph_node->num_clock_ports = 0;

pb_graph_node->total_primitive_count = 0;
pb_graph_node->flat_site_index = flat_index;

/* Generate ports for pb graph node */
for (i = 0; i < pb_type->num_ports; i++) {
Expand Down Expand Up @@ -349,11 +353,14 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
sizeof(t_pb_graph_node*));
for (j = 0; j < pb_type->modes[i].num_pb_type_children; j++) {
pb_graph_node->child_pb_graph_nodes[i][j] = (t_pb_graph_node*)vtr::calloc(pb_type->modes[i].pb_type_children[j].num_pb, sizeof(t_pb_graph_node));
int base = flat_index*(pb_type->modes[i].pb_type_children[j].num_pb);

for (k = 0; k < pb_type->modes[i].pb_type_children[j].num_pb; k++) {
alloc_and_load_pb_graph(&pb_graph_node->child_pb_graph_nodes[i][j][k],
pb_graph_node,
&pb_type->modes[i].pb_type_children[j],
k,
base + k,
load_power_structures,
pin_count_in_cluster);
}
Expand Down
Loading