Skip to content

Commit 002451f

Browse files
committed
[vpr][route] renaming remaining has_choke_points
1 parent 7464e58 commit 002451f

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

libs/libarchfpga/src/physical_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ class t_pb_graph_pin {
13821382
float tco_max = std::numeric_limits<float>::quiet_NaN(); /* For sequential logic elements the maximum clock to output time */
13831383
t_pb_graph_pin* associated_clock_pin = nullptr; /* For sequentail elements, the associated clock */
13841384

1385-
/* This member is used when flat-routing and has_choking_spot are enabled.
1385+
/* This member is used when flat-routing and router_opt_choke_points are enabled.
13861386
* It is used to identify choke points.
13871387
* This is only valid for IPINs, and it only contain the pins that are reachable to the pin by a forwarding path.
13881388
* It doesn't take into account feed-back connection.

vpr/src/base/ShowSetup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
255255
VTR_LOG("false\n");
256256
}
257257

258-
VTR_LOG("RouterOpts.has_choking_spot: ");
258+
VTR_LOG("RouterOpts.router_opt_choke_points: ");
259259
if (RouterOpts.has_choke_point) {
260260
VTR_LOG("true\n");
261261
} else {

vpr/src/route/connection_router.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ void ConnectionRouter<Heap>::evaluate_timing_driven_node_costs(t_heap* to,
775775
//cost.
776776
cong_cost = 0.;
777777
}
778-
if (conn_params_->has_choking_spot_ && is_flat_ && rr_graph_->node_type(to_node) == IPIN) {
778+
if (conn_params_->router_opt_choke_points_ && is_flat_ && rr_graph_->node_type(to_node) == IPIN) {
779779
auto find_res = conn_params_->connection_choking_spots_.find(to_node);
780780
if (find_res != conn_params_->connection_choking_spots_.end()) {
781781
cong_cost = cong_cost / pow(2, (float)find_res->second);

vpr/src/route/route_net.tpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ inline NetResultFlags route_sink(ConnectionRouter& router,
436436
bool sink_critical = (cost_params.criticality > HIGH_FANOUT_CRITICALITY_THRESHOLD);
437437
bool net_is_clock = route_ctx.is_clock_net[net_id] != 0;
438438

439-
bool has_choking_spot = ((int)choking_spots[target_pin].size() != 0) && router_opts.has_choke_point;
440-
ConnectionParameters conn_params(net_id, target_pin, has_choking_spot, choking_spots[target_pin]);
439+
bool router_opt_choke_points = ((int)choking_spots[target_pin].size() != 0) && router_opts.has_choke_point;
440+
ConnectionParameters conn_params(net_id, target_pin, router_opt_choke_points, choking_spots[target_pin]);
441441

442442
//We normally route high fanout nets by only adding spatially close-by routing to the heap (reduces run-time).
443443
//However, if the current sink is 'critical' from a timing perspective, we put the entire route tree back onto

vpr/src/route/route_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,15 @@ vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> set_net
391391
std::vector<std::vector<int>>>& net_terminal_groups,
392392
const vtr::vector<ParentNetId,
393393
std::vector<int>>& net_terminal_group_num,
394-
bool has_choking_spot,
394+
bool router_opt_choke_points,
395395
bool is_flat) {
396396
vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> choking_spots(net_list.nets().size());
397397
for (const auto& net_id : net_list.nets()) {
398398
choking_spots[net_id].resize(net_list.net_pins(net_id).size());
399399
}
400400

401401
// Return if the architecture doesn't have any potential choke points
402-
if (!has_choking_spot) {
402+
if (!router_opt_choke_points) {
403403
return choking_spots;
404404
}
405405

vpr/src/route/route_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,22 @@ void print_router_criticality_histogram(const Netlist<>& net_list,
121121
void prune_unused_non_configurable_nets(CBRR& connections_inf,
122122
const Netlist<>& net_list);
123123

124-
/** If flat_routing and has_choking_spot are true, there are some choke points inside the cluster which would increase the convergence time of routing.
124+
/** If flat_routing and router_opt_choke_points are true, there are some choke points inside the cluster which would increase the convergence time of routing.
125125
* To address this issue, the congestion cost of those choke points needs to decrease. This function identify those choke points for each net,
126126
* and since the amount of congestion reduction is dependant on the number sinks reachable from that choke point, it also store the number of reachable sinks
127127
* for each choke point.
128128
* @param net_list
129129
* @param net_terminal_groups [Net_id][group_id] -> rr_node_id of the pins in the group
130130
* @param net_terminal_group_num [Net_id][pin_id] -> group_id
131-
* @param has_choking_spot is true if the given architecture has choking spots inside the cluster
131+
* @param router_opt_choke_points is true if the given architecture has choking spots inside the cluster
132132
* @param is_flat is true if flat_routing is enabled
133133
* @return [Net_id][pin_id] -> [choke_point_rr_node_id, number of sinks reachable by this choke point] */
134134
vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> set_nets_choking_spots(const Netlist<>& net_list,
135135
const vtr::vector<ParentNetId,
136136
std::vector<std::vector<int>>>& net_terminal_groups,
137137
const vtr::vector<ParentNetId,
138138
std::vector<int>>& net_terminal_group_num,
139-
bool has_choking_spot,
139+
bool router_opt_choke_points,
140140
bool is_flat);
141141

142142
/** Wrapper for create_rr_graph() with extra checks */

vpr/src/route/router_stats.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
struct ConnectionParameters {
1010
ConnectionParameters(ParentNetId net_id,
1111
int target_pin_num,
12-
bool has_choking_spot,
12+
bool router_opt_choke_points,
1313
const std::unordered_map<RRNodeId, int>& connection_choking_spots)
1414
: net_id_(net_id)
1515
, target_pin_num_(target_pin_num)
16-
, has_choking_spot_(has_choking_spot)
16+
, router_opt_choke_points_(router_opt_choke_points)
1717
, connection_choking_spots_(connection_choking_spots) {}
1818

1919
// Net id of the connection
@@ -24,7 +24,7 @@ struct ConnectionParameters {
2424
// Show whether for the given connection, router should expect a choking point
2525
// If this is true, it would increase the routing time since the router has to
2626
// take some measures to solve the congestion
27-
bool has_choking_spot_;
27+
bool router_opt_choke_points_;
2828

2929
const std::unordered_map<RRNodeId, int>& connection_choking_spots_;
3030
};

0 commit comments

Comments
 (0)