Skip to content

Commit 5c1b331

Browse files
litghostlitghost
committed
Rename t_rr_node_storage to t_rr_graph_storage.
Signed-off-by: Keith Rothman <[email protected]>
1 parent 359f142 commit 5c1b331

12 files changed

+85
-87
lines changed

‎vpr/src/base/vpr_context.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "vtr_vector.h"
1010
#include "atom_netlist.h"
1111
#include "clustered_netlist.h"
12-
#include "rr_node_storage.h"
12+
#include "rr_graph_storage.h"
1313
#include "rr_node.h"
1414
#include "tatum/TimingGraph.hpp"
1515
#include "tatum/TimingConstraints.hpp"
@@ -146,7 +146,7 @@ struct DeviceContext : public Context {
146146
t_chan_width chan_width;
147147

148148
/* Structures to define the routing architecture of the FPGA. */
149-
t_rr_node_storage rr_nodes; /* autogenerated in build_rr_graph */
149+
t_rr_graph_storage rr_nodes; /* autogenerated in build_rr_graph */
150150

151151
std::vector<t_rr_indexed_data> rr_indexed_data; /* [0 .. num_rr_indexed_data-1] */
152152

‎vpr/src/route/clock_network_builders.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void ClockNetwork::set_num_instance(int num_inst) {
6161
*/
6262

6363
void ClockNetwork::create_rr_nodes_for_clock_network_wires(ClockRRGraphBuilder& clock_graph,
64-
t_rr_node_storage* rr_nodes,
64+
t_rr_graph_storage* rr_nodes,
6565
t_rr_edge_info_set* rr_edges_to_create,
6666
int num_segments) {
6767
for (int inst_num = 0; inst_num < get_num_inst(); inst_num++) {
@@ -215,7 +215,7 @@ size_t ClockRib::estimate_additional_nodes(const DeviceGrid& grid) {
215215
}
216216

217217
void ClockRib::create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
218-
t_rr_node_storage* rr_nodes,
218+
t_rr_graph_storage* rr_nodes,
219219
t_rr_edge_info_set* rr_edges_to_create,
220220
int num_segments) {
221221
// Only chany wires need to know the number of segments inorder
@@ -307,7 +307,7 @@ int ClockRib::create_chanx_wire(int x_start,
307307
int y,
308308
int ptc_num,
309309
e_direction direction,
310-
t_rr_node_storage* rr_nodes) {
310+
t_rr_graph_storage* rr_nodes) {
311311
rr_nodes->emplace_back();
312312
auto node_index = rr_nodes->size() - 1;
313313
auto node = rr_nodes->back();
@@ -502,7 +502,7 @@ size_t ClockSpine::estimate_additional_nodes(const DeviceGrid& grid) {
502502
}
503503

504504
void ClockSpine::create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
505-
t_rr_node_storage* rr_nodes,
505+
t_rr_graph_storage* rr_nodes,
506506
t_rr_edge_info_set* rr_edges_to_create,
507507
int num_segments) {
508508
auto& grid = clock_graph.grid();
@@ -596,7 +596,7 @@ int ClockSpine::create_chany_wire(int y_start,
596596
int x,
597597
int ptc_num,
598598
e_direction direction,
599-
t_rr_node_storage* rr_nodes,
599+
t_rr_graph_storage* rr_nodes,
600600
int num_segments) {
601601
rr_nodes->emplace_back();
602602
auto node_index = rr_nodes->size() - 1;
@@ -662,7 +662,7 @@ size_t ClockHTree::estimate_additional_nodes(const DeviceGrid& /*grid*/) {
662662
}
663663

664664
void ClockHTree::create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
665-
t_rr_node_storage* rr_nodes,
665+
t_rr_graph_storage* rr_nodes,
666666
t_rr_edge_info_set* rr_edges_to_create,
667667
int num_segments) {
668668
//Remove unused parameter warning

‎vpr/src/route/clock_network_builders.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "rr_graph2.h"
1212
#include "rr_graph_clock.h"
1313

14-
class t_rr_node_storage;
14+
class t_rr_graph_storage;
1515
class ClockRRGraphBuilder;
1616

1717
enum class ClockType {
@@ -103,13 +103,13 @@ class ClockNetwork {
103103
/* Creates the RR nodes for the clock network wires and adds them to the reverse lookup
104104
* in ClockRRGraphBuilder. The reverse lookup maps the nodes to their switch point locations */
105105
void create_rr_nodes_for_clock_network_wires(ClockRRGraphBuilder& clock_graph,
106-
t_rr_node_storage* rr_nodes,
106+
t_rr_graph_storage* rr_nodes,
107107
t_rr_edge_info_set* rr_edges_to_create,
108108
int num_segments);
109109
virtual void create_segments(std::vector<t_segment_inf>& segment_inf) = 0;
110110
virtual void create_rr_nodes_and_internal_edges_for_one_instance(
111111
ClockRRGraphBuilder& clock_graph,
112-
t_rr_node_storage* rr_nodes,
112+
t_rr_graph_storage* rr_nodes,
113113
t_rr_edge_info_set* rr_edges_to_create,
114114
int num_segments)
115115
= 0;
@@ -164,7 +164,7 @@ class ClockRib : public ClockNetwork {
164164
*/
165165
void create_segments(std::vector<t_segment_inf>& segment_inf) override;
166166
void create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
167-
t_rr_node_storage* rr_nodes,
167+
t_rr_graph_storage* rr_nodes,
168168
t_rr_edge_info_set* rr_edges_to_create,
169169
int num_segments) override;
170170
size_t estimate_additional_nodes(const DeviceGrid& grid) override;
@@ -173,7 +173,7 @@ class ClockRib : public ClockNetwork {
173173
int y,
174174
int ptc_num,
175175
e_direction direction,
176-
t_rr_node_storage* rr_nodes);
176+
t_rr_graph_storage* rr_nodes);
177177
void record_tap_locations(unsigned x_start,
178178
unsigned x_end,
179179
unsigned y,
@@ -223,7 +223,7 @@ class ClockSpine : public ClockNetwork {
223223
*/
224224
void create_segments(std::vector<t_segment_inf>& segment_inf) override;
225225
void create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
226-
t_rr_node_storage* rr_nodes,
226+
t_rr_graph_storage* rr_nodes,
227227
t_rr_edge_info_set* rr_edges_to_create,
228228
int num_segments) override;
229229
size_t estimate_additional_nodes(const DeviceGrid& grid) override;
@@ -232,7 +232,7 @@ class ClockSpine : public ClockNetwork {
232232
int x,
233233
int ptc_num,
234234
e_direction direction,
235-
t_rr_node_storage* rr_nodes,
235+
t_rr_graph_storage* rr_nodes,
236236
int num_segments);
237237
void record_tap_locations(unsigned y_start,
238238
unsigned y_end,
@@ -258,7 +258,7 @@ class ClockHTree : private ClockNetwork {
258258
// TODO: Unimplemented member function
259259
void create_segments(std::vector<t_segment_inf>& segment_inf) override;
260260
void create_rr_nodes_and_internal_edges_for_one_instance(ClockRRGraphBuilder& clock_graph,
261-
t_rr_node_storage* rr_nodes,
261+
t_rr_graph_storage* rr_nodes,
262262
t_rr_edge_info_set* rr_edges_to_create,
263263
int num_segments) override;
264264
size_t estimate_additional_nodes(const DeviceGrid& grid) override;

‎vpr/src/route/rr_graph.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void build_bidir_rr_opins(const int i,
103103
const int j,
104104
const e_side side,
105105
const t_rr_node_indices& L_rr_node_indices,
106-
const t_rr_node_storage& rr_nodes,
106+
const t_rr_graph_storage& rr_nodes,
107107
const t_pin_to_track_lookup& opin_to_track_map,
108108
const std::vector<vtr::Matrix<int>>& Fc_out,
109109
t_rr_edge_info_set& created_rr_edges,
@@ -128,7 +128,7 @@ static void build_unidir_rr_opins(const int i,
128128
t_rr_edge_info_set& created_rr_edges,
129129
bool* Fc_clipped,
130130
const t_rr_node_indices& L_rr_node_indices,
131-
const t_rr_node_storage& rr_nodes,
131+
const t_rr_graph_storage& rr_nodes,
132132
const t_direct_inf* directs,
133133
const int num_directs,
134134
const t_clb_to_clb_directs* clb_to_clb_directs,
@@ -141,12 +141,12 @@ static int get_opin_direct_connecions(int x,
141141
int from_rr_node,
142142
t_rr_edge_info_set& rr_edges_to_create,
143143
const t_rr_node_indices& L_rr_node_indices,
144-
const t_rr_node_storage& rr_nodes,
144+
const t_rr_graph_storage& rr_nodes,
145145
const t_direct_inf* directs,
146146
const int num_directs,
147147
const t_clb_to_clb_directs* clb_to_clb_directs);
148148

149-
static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(t_rr_node_storage& L_rr_node,
149+
static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(t_rr_graph_storage& L_rr_node,
150150
const int num_seg_types,
151151
const t_chan_details& chan_details_x,
152152
const t_chan_details& chan_details_y,
@@ -207,7 +207,7 @@ static std::vector<std::vector<bool>> alloc_and_load_perturb_ipins(const int L_n
207207

208208
static void build_rr_sinks_sources(const int i,
209209
const int j,
210-
t_rr_node_storage& L_rr_node,
210+
t_rr_graph_storage& L_rr_node,
211211
t_rr_edge_info_set& rr_edges_to_create,
212212
const t_rr_node_indices& L_rr_node_indices,
213213
const int delayless_switch,
@@ -229,13 +229,13 @@ static void build_rr_chan(const int i,
229229
const t_chan_details& chan_details_y,
230230
const t_rr_node_indices& L_rr_node_indices,
231231
t_rr_edge_info_set& created_rr_edges,
232-
t_rr_node_storage& L_rr_node,
232+
t_rr_graph_storage& L_rr_node,
233233
const int wire_to_ipin_switch,
234234
const enum e_directionality directionality);
235235

236236
void uniquify_edges(t_rr_edge_info_set& rr_edges_to_create);
237237

238-
void alloc_and_load_edges(t_rr_node_storage& L_rr_node,
238+
void alloc_and_load_edges(t_rr_graph_storage& L_rr_node,
239239
const t_rr_edge_info_set& rr_edges_to_create);
240240

241241
static void alloc_and_load_rr_switch_inf(const int num_arch_switches,
@@ -273,7 +273,7 @@ static std::vector<vtr::Matrix<int>> alloc_and_load_actual_fc(const std::vector<
273273
const enum e_directionality directionality,
274274
bool* Fc_clipped);
275275

276-
static int pick_best_direct_connect_target_rr_node(const t_rr_node_storage& rr_nodes,
276+
static int pick_best_direct_connect_target_rr_node(const t_rr_graph_storage& rr_nodes,
277277
int from_rr,
278278
const std::vector<int>& candidate_rr_nodes);
279279

@@ -1132,7 +1132,7 @@ static void free_type_track_to_pin_map(t_track_to_pin_lookup& track_to_pin_map,
11321132

11331133
/* Does the actual work of allocating the rr_graph and filling all the *
11341134
* appropriate values. Everything up to this was just a prelude! */
1135-
static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(t_rr_node_storage& L_rr_node,
1135+
static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(t_rr_graph_storage& L_rr_node,
11361136
const int num_seg_types,
11371137
const t_chan_details& chan_details_x,
11381138
const t_chan_details& chan_details_y,
@@ -1280,7 +1280,7 @@ static void build_bidir_rr_opins(const int i,
12801280
const int j,
12811281
const e_side side,
12821282
const t_rr_node_indices& L_rr_node_indices,
1283-
const t_rr_node_storage& rr_nodes,
1283+
const t_rr_graph_storage& rr_nodes,
12841284
const t_pin_to_track_lookup& opin_to_track_map,
12851285
const std::vector<vtr::Matrix<int>>& Fc_out,
12861286
t_rr_edge_info_set& rr_edges_to_create,
@@ -1373,7 +1373,7 @@ void free_rr_graph() {
13731373

13741374
static void build_rr_sinks_sources(const int i,
13751375
const int j,
1376-
t_rr_node_storage& L_rr_node,
1376+
t_rr_graph_storage& L_rr_node,
13771377
t_rr_edge_info_set& rr_edges_to_create,
13781378
const t_rr_node_indices& L_rr_node_indices,
13791379
const int delayless_switch,
@@ -1517,7 +1517,7 @@ static void build_rr_chan(const int x_coord,
15171517
const t_chan_details& chan_details_y,
15181518
const t_rr_node_indices& L_rr_node_indices,
15191519
t_rr_edge_info_set& rr_edges_to_create,
1520-
t_rr_node_storage& L_rr_node,
1520+
t_rr_graph_storage& L_rr_node,
15211521
const int wire_to_ipin_switch,
15221522
const enum e_directionality directionality) {
15231523
/* this function builds both x and y-directed channel segments, so set up our
@@ -1680,7 +1680,7 @@ void uniquify_edges(t_rr_edge_info_set& rr_edges_to_create) {
16801680
rr_edges_to_create.erase(std::unique(rr_edges_to_create.begin(), rr_edges_to_create.end()), rr_edges_to_create.end());
16811681
}
16821682

1683-
void alloc_and_load_edges(t_rr_node_storage& L_rr_node,
1683+
void alloc_and_load_edges(t_rr_graph_storage& L_rr_node,
16841684
const t_rr_edge_info_set& rr_edges_to_create) {
16851685
L_rr_node.alloc_and_load_edges(&rr_edges_to_create);
16861686
}
@@ -2469,7 +2469,7 @@ std::string describe_rr_node(int inode) {
24692469

24702470
return msg;
24712471
}
2472-
static void build_unidir_rr_opins(const int i, const int j, const e_side side, const DeviceGrid& grid, const std::vector<vtr::Matrix<int>>& Fc_out, const int max_chan_width, const t_chan_details& chan_details_x, const t_chan_details& chan_details_y, vtr::NdMatrix<int, 3>& Fc_xofs, vtr::NdMatrix<int, 3>& Fc_yofs, t_rr_edge_info_set& rr_edges_to_create, bool* Fc_clipped, const t_rr_node_indices& L_rr_node_indices, const t_rr_node_storage& rr_nodes, const t_direct_inf* directs, const int num_directs, const t_clb_to_clb_directs* clb_to_clb_directs, const int num_seg_types) {
2472+
static void build_unidir_rr_opins(const int i, const int j, const e_side side, const DeviceGrid& grid, const std::vector<vtr::Matrix<int>>& Fc_out, const int max_chan_width, const t_chan_details& chan_details_x, const t_chan_details& chan_details_y, vtr::NdMatrix<int, 3>& Fc_xofs, vtr::NdMatrix<int, 3>& Fc_yofs, t_rr_edge_info_set& rr_edges_to_create, bool* Fc_clipped, const t_rr_node_indices& L_rr_node_indices, const t_rr_graph_storage& rr_nodes, const t_direct_inf* directs, const int num_directs, const t_clb_to_clb_directs* clb_to_clb_directs, const int num_seg_types) {
24732473
/*
24742474
* This routine adds the edges from opins to channels at the specified
24752475
* grid location (i,j) and grid tile side
@@ -2704,7 +2704,7 @@ static int get_opin_direct_connecions(int x,
27042704
int from_rr_node,
27052705
t_rr_edge_info_set& rr_edges_to_create,
27062706
const t_rr_node_indices& L_rr_node_indices,
2707-
const t_rr_node_storage& rr_nodes,
2707+
const t_rr_graph_storage& rr_nodes,
27082708
const t_direct_inf* directs,
27092709
const int num_directs,
27102710
const t_clb_to_clb_directs* clb_to_clb_directs) {
@@ -2916,7 +2916,7 @@ static std::vector<bool> alloc_and_load_perturb_opins(const t_physical_tile_type
29162916
return perturb_opins;
29172917
}
29182918

2919-
static int pick_best_direct_connect_target_rr_node(const t_rr_node_storage& rr_nodes,
2919+
static int pick_best_direct_connect_target_rr_node(const t_rr_graph_storage& rr_nodes,
29202920
int from_rr,
29212921
const std::vector<int>& candidate_rr_nodes) {
29222922
//With physically equivalent pins there may be multiple candidate rr nodes (which are equivalent)

‎vpr/src/route/rr_graph.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ void free_rr_graph();
4545
//Returns a brief one-line summary of an RR node
4646
std::string describe_rr_node(int inode);
4747

48-
class t_rr_node_storage;
49-
5048
// Sets the spec for the rr_switch based on the arch switch
5149
void load_rr_switch_from_arch_switch(int arch_switch_idx,
5250
int rr_switch_idx,

‎vpr/src/route/rr_graph_clock.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class ClockNetwork;
1717
class ClockConnection;
18-
class t_rr_node_storage;
18+
class t_rr_graph_storage;
1919

2020
class SwitchPoint {
2121
/* A switch point object: keeps information on the location and and rr_node indices
@@ -77,7 +77,7 @@ class ClockRRGraphBuilder {
7777
ClockRRGraphBuilder(
7878
const t_chan_width& chan_width,
7979
const DeviceGrid& grid,
80-
t_rr_node_storage* rr_nodes)
80+
t_rr_graph_storage* rr_nodes)
8181
: chan_width_(chan_width)
8282
, grid_(grid)
8383
, rr_nodes_(rr_nodes)
@@ -133,7 +133,7 @@ class ClockRRGraphBuilder {
133133

134134
const t_chan_width& chan_width_;
135135
const DeviceGrid& grid_;
136-
t_rr_node_storage* rr_nodes_;
136+
t_rr_graph_storage* rr_nodes_;
137137

138138
int chanx_ptc_idx_;
139139
int chany_ptc_idx_;

0 commit comments

Comments
 (0)