Skip to content

Commit ae9dc10

Browse files
soheilshahrouzsoheilshahrouz
committed
rename getter methods for BlkLocRegistry objects
1 parent a7c203c commit ae9dc10

17 files changed

+52
-52
lines changed

‎vpr/src/base/place_and_route.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ int binary_search_place_and_route(const Netlist<>& placement_net_list,
390390
&warnings,
391391
is_flat);
392392

393-
init_draw_coords(final, g_vpr_ctx.placement().place_loc_vars());
393+
init_draw_coords(final, g_vpr_ctx.placement().blk_loc_registry());
394394

395395
/* Allocate and load additional rr_graph information needed only by the router. */
396396
alloc_and_load_rr_node_route_structs();
@@ -575,7 +575,7 @@ static float comp_width(t_chan* chan, float x, float separation) {
575575
void post_place_sync() {
576576
/* Go through each block */
577577
const auto& cluster_ctx = g_vpr_ctx.clustering();
578-
auto& place_loc_vars = g_vpr_ctx.mutable_placement().mutable_place_loc_vars();
578+
auto& place_loc_vars = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
579579

580580
// Cluster-based netlist is used for placement
581581
for (const ClusterBlockId block_id : cluster_ctx.clb_nlist.blocks()) {

‎vpr/src/base/vpr_api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ void vpr_load_placement(t_vpr_setup& vpr_setup, const t_arch& arch) {
838838

839839
//Load an existing placement from a file
840840
place_ctx.placement_id = read_place(filename_opts.NetFile.c_str(), filename_opts.PlaceFile.c_str(),
841-
place_ctx.mutable_place_loc_vars(),
841+
place_ctx.mutable_blk_loc_registry(),
842842
filename_opts.verify_file_digests, device_ctx.grid);
843843

844844
//Ensure placement macros are loaded so that they can be drawn after placement (e.g. during routing)
@@ -1077,7 +1077,7 @@ RouteStatus vpr_load_routing(t_vpr_setup& vpr_setup,
10771077
net_delay);
10781078
timing_info->update();
10791079
}
1080-
init_draw_coords(fixed_channel_width, g_vpr_ctx.placement().place_loc_vars());
1080+
init_draw_coords(fixed_channel_width, g_vpr_ctx.placement().blk_loc_registry());
10811081

10821082
return RouteStatus(is_legal, fixed_channel_width);
10831083
}
@@ -1116,7 +1116,7 @@ void vpr_create_rr_graph(t_vpr_setup& vpr_setup, const t_arch& arch, int chan_wi
11161116
&warnings,
11171117
is_flat);
11181118
//Initialize drawing, now that we have an RR graph
1119-
init_draw_coords(chan_width_fac, g_vpr_ctx.placement().place_loc_vars());
1119+
init_draw_coords(chan_width_fac, g_vpr_ctx.placement().blk_loc_registry());
11201120
}
11211121

11221122
void vpr_init_graphics(const t_vpr_setup& vpr_setup, const t_arch& arch, bool is_flat) {

‎vpr/src/base/vpr_context.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -396,18 +396,18 @@ struct PlacementContext : public Context {
396396
* @brief Stores block location information, which is subject to change during the
397397
* placement stage.
398398
*/
399-
BlkLocRegistry place_loc_vars_;
399+
BlkLocRegistry blk_loc_registry_;
400400

401401
public:
402402

403-
const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.block_locs(); }
404-
vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_block_locs(); }
405-
const GridBlock& get_grid_blocks() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.grid_blocks(); }
406-
GridBlock& get_mutable_grid_blocks() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_grid_blocks(); }
407-
vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_physical_pins(); }
408-
const vtr::vector_map<ClusterPinId, int>& physical_pins() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.physical_pins(); }
409-
BlkLocRegistry& mutable_place_loc_vars() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_; }
410-
const BlkLocRegistry& place_loc_vars() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_; }
403+
const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.block_locs(); }
404+
vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.mutable_block_locs(); }
405+
const GridBlock& get_grid_blocks() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.grid_blocks(); }
406+
GridBlock& get_mutable_grid_blocks() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.mutable_grid_blocks(); }
407+
vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.mutable_physical_pins(); }
408+
const vtr::vector_map<ClusterPinId, int>& physical_pins() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_.physical_pins(); }
409+
BlkLocRegistry& mutable_blk_loc_registry() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_; }
410+
const BlkLocRegistry& blk_loc_registry() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return blk_loc_registry_; }
411411

412412
/**
413413
* @brief Makes place_loc_vars_ inaccessible through the getter methods.

‎vpr/src/pack/re_cluster_util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void commit_mol_move(ClusterBlockId old_clb,
8585
g_vpr_ctx.mutable_placement().mutable_block_locs().resize(g_vpr_ctx.placement().block_locs().size() + 1);
8686
get_imacro_from_iblk(&imacro, old_clb, g_vpr_ctx.placement().pl_macros);
8787
set_imacro_for_iblk(&imacro, new_clb);
88-
place_one_block(new_clb, device_ctx.pad_loc_type, nullptr, nullptr, g_vpr_ctx.mutable_placement().mutable_place_loc_vars());
88+
place_one_block(new_clb, device_ctx.pad_loc_type, nullptr, nullptr, g_vpr_ctx.mutable_placement().mutable_blk_loc_registry());
8989
}
9090
}
9191

‎vpr/src/place/centroid_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ e_create_move CentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& block
4949
const auto& device_ctx = g_vpr_ctx.device();
5050
const auto& cluster_ctx = g_vpr_ctx.clustering();
5151
const auto& place_move_ctx = placer_ctx.move();
52-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
52+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
5353

5454
// Find a movable block based on blk_type
5555
ClusterBlockId b_from = propose_block_to_move(placer_opts,

‎vpr/src/place/critical_uniform_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ e_create_move CriticalUniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved
1515
auto& cluster_ctx = g_vpr_ctx.clustering();
1616
const auto& placer_ctx = placer_ctx_.get();
1717
const auto& block_locs = placer_ctx.block_locs();
18-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
18+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
1919

2020
ClusterNetId net_from;
2121
int pin_from;

‎vpr/src/place/feasible_region_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ e_create_move FeasibleRegionMoveGenerator::propose_move(t_pl_blocks_to_be_moved&
2020
auto& placer_ctx = placer_ctx_.get();
2121
auto& place_move_ctx = placer_ctx.mutable_move();
2222
const auto& block_locs = placer_ctx.block_locs();
23-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
23+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
2424

2525
ClusterNetId net_from;
2626
int pin_from;

‎vpr/src/place/manual_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ e_create_move ManualMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_
6565
return e_create_move::ABORT;
6666
}
6767

68-
e_create_move create_move = ::create_move(blocks_affected, b_from, to, place_ctx.place_loc_vars());
68+
e_create_move create_move = ::create_move(blocks_affected, b_from, to, place_ctx.blk_loc_registry());
6969
return create_move;
7070
}
7171

‎vpr/src/place/median_move_generator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ e_create_move MedianMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_
2020
auto& placer_ctx = placer_ctx_.get();
2121
auto& place_move_ctx = placer_ctx.mutable_move();
2222
const auto& block_locs = placer_ctx.block_locs();
23-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
23+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
2424

2525
//Find a movable block based on blk_type
2626
ClusterBlockId b_from = propose_block_to_move(placer_opts,
@@ -224,7 +224,7 @@ void MedianMoveGenerator::get_bb_from_scratch_excluding_block(ClusterNetId net_i
224224

225225
if (bnum != block_id) {
226226
skip_net = false;
227-
pnum = placer_ctx.place_loc_vars().net_pin_to_tile_pin_index(net_id, 0);
227+
pnum = placer_ctx.blk_loc_registry().net_pin_to_tile_pin_index(net_id, 0);
228228
const t_pl_loc& block_loc = block_locs[bnum].loc;
229229
int src_x = block_loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
230230
int src_y = block_loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
@@ -241,7 +241,7 @@ void MedianMoveGenerator::get_bb_from_scratch_excluding_block(ClusterNetId net_i
241241

242242
for (ClusterPinId pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
243243
bnum = cluster_ctx.clb_nlist.pin_block(pin_id);
244-
pnum = placer_ctx.place_loc_vars().tile_pin_index(pin_id);
244+
pnum = placer_ctx.blk_loc_registry().tile_pin_index(pin_id);
245245
if (bnum == block_id)
246246
continue;
247247
skip_net = false;

‎vpr/src/place/net_cost_handler.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ static void update_net_bb(const ClusterNetId net,
600600
}
601601
} else {
602602
//For large nets, update bounding box incrementally
603-
int iblk_pin = placer_ctx.place_loc_vars().tile_pin_index(blk_pin);
603+
int iblk_pin = placer_ctx.blk_loc_registry().tile_pin_index(blk_pin);
604604

605605
t_pl_loc block_loc = block_locs[blk].loc;
606606
t_physical_tile_type_ptr blk_type = physical_tile_type(block_loc);
@@ -771,7 +771,7 @@ static void get_non_updatable_bb(ClusterNetId net_id,
771771
auto& block_locs = placer_ctx.block_locs();
772772

773773
ClusterBlockId bnum = cluster_ctx.clb_nlist.net_driver_block(net_id);
774-
int pnum = placer_ctx.place_loc_vars().net_pin_to_tile_pin_index(net_id, 0);
774+
int pnum = placer_ctx.blk_loc_registry().net_pin_to_tile_pin_index(net_id, 0);
775775

776776
t_pl_loc block_loc = block_locs[bnum].loc;
777777
int x = block_loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
@@ -792,7 +792,7 @@ static void get_non_updatable_bb(ClusterNetId net_id,
792792
for (ClusterPinId pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
793793
bnum = cluster_ctx.clb_nlist.pin_block(pin_id);
794794
block_loc = block_locs[bnum].loc;
795-
pnum = placer_ctx.place_loc_vars().tile_pin_index(pin_id);
795+
pnum = placer_ctx.blk_loc_registry().tile_pin_index(pin_id);
796796
x = block_loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
797797
y = block_loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
798798
layer = block_loc.layer;
@@ -850,7 +850,7 @@ static void get_non_updatable_layer_bb(ClusterNetId net_id,
850850

851851
ClusterBlockId bnum = cluster_ctx.clb_nlist.net_driver_block(net_id);
852852
t_pl_loc block_loc = block_locs[bnum].loc;
853-
int pnum = placer_ctx.place_loc_vars().net_pin_to_tile_pin_index(net_id, 0);
853+
int pnum = placer_ctx.blk_loc_registry().net_pin_to_tile_pin_index(net_id, 0);
854854

855855
int src_x = block_locs[bnum].loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
856856
int src_y = block_locs[bnum].loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
@@ -863,7 +863,7 @@ static void get_non_updatable_layer_bb(ClusterNetId net_id,
863863
for (ClusterPinId pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
864864
bnum = cluster_ctx.clb_nlist.pin_block(pin_id);
865865
block_loc = block_locs[bnum].loc;
866-
pnum = placer_ctx.place_loc_vars().tile_pin_index(pin_id);
866+
pnum = placer_ctx.blk_loc_registry().tile_pin_index(pin_id);
867867
int x = block_locs[bnum].loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
868868
int y = block_locs[bnum].loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
869869

@@ -1530,7 +1530,7 @@ static void get_bb_from_scratch(ClusterNetId net_id,
15301530

15311531
ClusterBlockId bnum = cluster_ctx.clb_nlist.net_driver_block(net_id);
15321532
t_pl_loc block_loc = block_locs[bnum].loc;
1533-
int pnum = placer_ctx.place_loc_vars().net_pin_to_tile_pin_index(net_id, 0);
1533+
int pnum = placer_ctx.blk_loc_registry().net_pin_to_tile_pin_index(net_id, 0);
15341534
VTR_ASSERT_SAFE(pnum >= 0);
15351535
int x = block_loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
15361536
int y = block_loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
@@ -1561,7 +1561,7 @@ static void get_bb_from_scratch(ClusterNetId net_id,
15611561
for (ClusterPinId pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
15621562
bnum = cluster_ctx.clb_nlist.pin_block(pin_id);
15631563
block_loc = block_locs[bnum].loc;
1564-
pnum = placer_ctx.place_loc_vars().tile_pin_index(pin_id);
1564+
pnum = placer_ctx.blk_loc_registry().tile_pin_index(pin_id);
15651565
x = block_locs[bnum].loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum];
15661566
y = block_locs[bnum].loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum];
15671567
pin_layer = block_locs[bnum].loc.layer;
@@ -1663,7 +1663,7 @@ static void get_layer_bb_from_scratch(ClusterNetId net_id,
16631663

16641664
ClusterBlockId bnum = cluster_ctx.clb_nlist.net_driver_block(net_id);
16651665
t_pl_loc block_loc = block_locs[bnum].loc;
1666-
int pnum_src = placer_ctx.place_loc_vars().net_pin_to_tile_pin_index(net_id, 0);
1666+
int pnum_src = placer_ctx.blk_loc_registry().net_pin_to_tile_pin_index(net_id, 0);
16671667
VTR_ASSERT_SAFE(pnum_src >= 0);
16681668
int x_src = block_loc.x + physical_tile_type(block_loc)->pin_width_offset[pnum_src];
16691669
int y_src = block_loc.y + physical_tile_type(block_loc)->pin_height_offset[pnum_src];
@@ -1688,7 +1688,7 @@ static void get_layer_bb_from_scratch(ClusterNetId net_id,
16881688
for (ClusterPinId pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
16891689
bnum = cluster_ctx.clb_nlist.pin_block(pin_id);
16901690
block_loc = block_locs[bnum].loc;
1691-
int pnum = placer_ctx.place_loc_vars().tile_pin_index(pin_id);
1691+
int pnum = placer_ctx.blk_loc_registry().tile_pin_index(pin_id);
16921692
int layer = block_locs[bnum].loc.layer;
16931693
VTR_ASSERT_SAFE(layer >= 0 && layer < num_layers);
16941694
num_sink_pin_layer[layer]++;

‎vpr/src/place/place.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ void try_place(const Netlist<>& net_list,
437437

438438
PlacerContext placer_ctx;
439439
auto& place_move_ctx = placer_ctx.mutable_move();
440-
auto& place_loc_vars = placer_ctx.mutable_place_loc_vars();
440+
auto& place_loc_vars = placer_ctx.mutable_blk_loc_registry();
441441
const auto& p_timing_ctx = placer_ctx.timing();
442442
const auto& p_runtime_ctx = placer_ctx.runtime();
443443

@@ -1332,7 +1332,7 @@ static e_move_result try_swap(const t_annealing_state* state,
13321332
#endif //NO_GRAPHICS
13331333
} else if (router_block_move) {
13341334
// generate a move where two random router blocks are swapped
1335-
create_move_outcome = propose_router_swap(blocks_affected, rlim, placer_ctx.place_loc_vars());
1335+
create_move_outcome = propose_router_swap(blocks_affected, rlim, placer_ctx.blk_loc_registry());
13361336
proposed_action.move_type = e_move_type::UNIFORM;
13371337
} else {
13381338
//Generate a new move (perturbation) used to explore the space of possible placements
@@ -1374,7 +1374,7 @@ static e_move_result try_swap(const t_annealing_state* state,
13741374
*/
13751375

13761376
/* Update the block positions */
1377-
apply_move_blocks(blocks_affected, placer_ctx.mutable_place_loc_vars());
1377+
apply_move_blocks(blocks_affected, placer_ctx.mutable_blk_loc_registry());
13781378

13791379
//Find all the nets affected by this swap and update the wiring costs.
13801380
//This cost value doesn't depend on the timing info.
@@ -1509,7 +1509,7 @@ static e_move_result try_swap(const t_annealing_state* state,
15091509
reset_move_nets();
15101510

15111511
/* Restore the place_ctx.block_locs data structures to their state before the move. */
1512-
revert_move_blocks(blocks_affected, placer_ctx.mutable_place_loc_vars());
1512+
revert_move_blocks(blocks_affected, placer_ctx.mutable_blk_loc_registry());
15131513

15141514
if (place_algorithm == SLACK_TIMING_PLACE) {
15151515
/* Revert the timing delays and costs to pre-update values. */
@@ -1991,7 +1991,7 @@ static void check_place(const t_placer_costs& costs,
19911991

19921992
int error = 0;
19931993

1994-
error += check_placement_consistency(placer_ctx.place_loc_vars());
1994+
error += check_placement_consistency(placer_ctx.blk_loc_registry());
19951995
error += check_placement_costs(costs, delay_model, criticalities, place_algorithm, placer_ctx);
19961996
error += check_placement_floorplanning(placer_ctx.block_locs());
19971997

@@ -2437,7 +2437,7 @@ static void copy_locs_to_global_state(const BlkLocRegistry& place_loc_vars) {
24372437
place_ctx.unlock_loc_vars();
24382438

24392439
// copy the local location variables into the global state
2440-
auto& global_place_loc_vars = place_ctx.mutable_place_loc_vars();
2440+
auto& global_place_loc_vars = place_ctx.mutable_blk_loc_registry();
24412441
global_place_loc_vars = place_loc_vars;
24422442

24432443
#ifndef NO_GRAPHICS

‎vpr/src/place/placer_context.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,21 @@ class PlacerContext : public Context {
141141
inline const PlacerMoveContext& move() const { return move_; }
142142
inline PlacerMoveContext& mutable_move() { return move_; }
143143

144-
inline const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { return loc_vars_.block_locs(); }
145-
inline vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { return loc_vars_.mutable_block_locs(); }
144+
inline const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { return blk_loc_registry_.block_locs(); }
145+
inline vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { return blk_loc_registry_.mutable_block_locs(); }
146146

147-
inline const GridBlock& grid_blocks() const { return loc_vars_.grid_blocks(); }
148-
inline GridBlock& mutable_grid_blocks() { return loc_vars_.mutable_grid_blocks(); }
147+
inline const GridBlock& grid_blocks() const { return blk_loc_registry_.grid_blocks(); }
148+
inline GridBlock& mutable_grid_blocks() { return blk_loc_registry_.mutable_grid_blocks(); }
149149

150-
inline const vtr::vector_map<ClusterPinId, int>& physical_pins() const { return loc_vars_.physical_pins(); }
151-
inline vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { return loc_vars_.mutable_physical_pins(); }
150+
inline const vtr::vector_map<ClusterPinId, int>& physical_pins() const { return blk_loc_registry_.physical_pins(); }
151+
inline vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { return blk_loc_registry_.mutable_physical_pins(); }
152152

153-
inline const BlkLocRegistry& place_loc_vars() const { return loc_vars_; }
154-
inline BlkLocRegistry& mutable_place_loc_vars() { return loc_vars_; }
153+
inline const BlkLocRegistry& blk_loc_registry() const { return blk_loc_registry_; }
154+
inline BlkLocRegistry& mutable_blk_loc_registry() { return blk_loc_registry_; }
155155

156156
private:
157157
PlacerTimingContext timing_;
158158
PlacerRuntimeContext runtime_;
159159
PlacerMoveContext move_;
160-
BlkLocRegistry loc_vars_;
160+
BlkLocRegistry blk_loc_registry_;
161161
};

‎vpr/src/place/uniform_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ e_create_move UniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks
1616
const auto& cluster_ctx = g_vpr_ctx.clustering();
1717
const auto& placer_ctx = placer_ctx_.get();
1818
const auto& block_locs = placer_ctx.block_locs();
19-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
19+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
2020

2121
//Find a movable block based on blk_type
2222
ClusterBlockId b_from = propose_block_to_move(placer_opts,

‎vpr/src/place/weighted_centroid_move_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ e_create_move WeightedCentroidMoveGenerator::propose_move(t_pl_blocks_to_be_move
1919
auto& placer_ctx = placer_ctx_.get();
2020
const auto& block_locs = placer_ctx.block_locs();
2121
auto& place_move_ctx = placer_ctx.mutable_move();
22-
const auto& place_loc_vars = placer_ctx.place_loc_vars();
22+
const auto& place_loc_vars = placer_ctx.blk_loc_registry();
2323

2424
//Find a movable block based on blk_type
2525
ClusterBlockId b_from = propose_block_to_move(placer_opts,

0 commit comments

Comments
 (0)