Skip to content

Commit 3bb2e9d

Browse files
removed unused argument of intersect_range_limit_with_floorplan_constraints()
1 parent 8a32b61 commit 3bb2e9d

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

vpr/src/place/move_utils.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,7 @@ bool find_to_loc_uniform(t_logical_block_type_ptr type,
779779

780780
//TODO: constraints should be adapted to 3D architecture
781781
if (is_cluster_constrained(b_from)) {
782-
bool intersect = intersect_range_limit_with_floorplan_constraints(type,
783-
b_from,
782+
bool intersect = intersect_range_limit_with_floorplan_constraints(b_from,
784783
search_range,
785784
delta_cx,
786785
to_layer_num);
@@ -877,8 +876,7 @@ bool find_to_loc_median(t_logical_block_type_ptr blk_type,
877876
bool legal = false;
878877

879878
if (is_cluster_constrained(b_from)) {
880-
bool intersect = intersect_range_limit_with_floorplan_constraints(blk_type,
881-
b_from,
879+
bool intersect = intersect_range_limit_with_floorplan_constraints(b_from,
882880
search_range,
883881
delta_cx,
884882
to_layer_num);
@@ -963,8 +961,7 @@ bool find_to_loc_centroid(t_logical_block_type_ptr blk_type,
963961
bool legal = false;
964962

965963
if (is_cluster_constrained(b_from)) {
966-
bool intersect = intersect_range_limit_with_floorplan_constraints(blk_type,
967-
b_from,
964+
bool intersect = intersect_range_limit_with_floorplan_constraints(b_from,
968965
search_range,
969966
delta_cx,
970967
to_layer_num);
@@ -1084,9 +1081,9 @@ bool find_compatible_compressed_loc_in_range(t_logical_block_type_ptr type,
10841081
else
10851082
possibilities = delta_cx;
10861083

1087-
while (!legal && (int)tried_cx_to.size() < possibilities) { //Until legal or all possibilities exhaused
1084+
while (!legal && (int)tried_cx_to.size() < possibilities) { //Until legal or all possibilities exhausted
10881085
//Pick a random x-location within [min_cx, max_cx],
1089-
//until we find a legal swap, or have exhuasted all possiblites
1086+
//until we find a legal swap, or have exhausted all possibilities
10901087
to_loc.x = search_range.xmin + vtr::irand(delta_cx);
10911088

10921089
VTR_ASSERT(to_loc.x >= search_range.xmin);
@@ -1260,8 +1257,7 @@ t_bb get_compressed_grid_bounded_search_range(const t_compressed_block_grid& com
12601257
return search_range;
12611258
}
12621259

1263-
bool intersect_range_limit_with_floorplan_constraints(t_logical_block_type_ptr type,
1264-
ClusterBlockId b_from,
1260+
bool intersect_range_limit_with_floorplan_constraints(ClusterBlockId b_from,
12651261
t_bb& search_range,
12661262
int& delta_cx,
12671263
int layer_num) {

vpr/src/place/move_utils.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,16 +336,15 @@ t_bb get_compressed_grid_bounded_search_range(const t_compressed_block_grid& com
336336
* The intersection takes place in the layer (die) specified by layer_num.
337337
*
338338
*/
339-
bool intersect_range_limit_with_floorplan_constraints(t_logical_block_type_ptr type,
340-
ClusterBlockId b_from,
339+
bool intersect_range_limit_with_floorplan_constraints(ClusterBlockId b_from,
341340
t_bb& search_range,
342341
int& delta_cx,
343342
int layer_num);
344343

345344
std::string e_move_result_to_string(e_move_result move_outcome);
346345

347346
/**
348-
* @brif Iterate over all layers that have a physical tile at the x-y location specified by "loc" that can accomodate "logical_block".
347+
* @brif Iterate over all layers that have a physical tile at the x-y location specified by "loc" that can accommodate "logical_block".
349348
* If the location in the layer specified by "layer_num" is empty, return that layer. Otherwise,
350349
* return a layer that is not occupied at that location. If there isn't any, again, return the layer of loc.
351350
*

0 commit comments

Comments
 (0)