Skip to content

Commit 2e26c7b

Browse files
Merge branch 'master' into block_type_based_RLplace_agent
2 parents ab256ed + 2dc0d03 commit 2e26c7b

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

vpr/src/place/move_utils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ e_block_move_result find_affected_blocks(t_pl_blocks_to_be_moved& blocks_affecte
7272
VTR_ASSERT_SAFE(b_from);
7373

7474
int imacro_from;
75-
ClusterBlockId curr_b_from;
7675
e_block_move_result outcome = e_block_move_result::VALID;
7776

7877
auto& place_ctx = g_vpr_ctx.placement();

vpr/src/place/static_move_generator.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#include "vtr_assert.h"
77

88
StaticMoveGenerator::StaticMoveGenerator(const std::vector<float>& prob) {
9-
avail_moves.push_back(std::move(std::make_unique<UniformMoveGenerator>()));
10-
avail_moves.push_back(std::move(std::make_unique<MedianMoveGenerator>()));
11-
avail_moves.push_back(std::move(std::make_unique<CentroidMoveGenerator>()));
12-
avail_moves.push_back(std::move(std::make_unique<WeightedCentroidMoveGenerator>()));
13-
avail_moves.push_back(std::move(std::make_unique<WeightedMedianMoveGenerator>()));
14-
avail_moves.push_back(std::move(std::make_unique<CriticalUniformMoveGenerator>()));
15-
avail_moves.push_back(std::move(std::make_unique<FeasibleRegionMoveGenerator>()));
9+
avail_moves.emplace_back(std::make_unique<UniformMoveGenerator>());
10+
avail_moves.emplace_back(std::make_unique<MedianMoveGenerator>());
11+
avail_moves.emplace_back(std::make_unique<CentroidMoveGenerator>());
12+
avail_moves.emplace_back(std::make_unique<WeightedCentroidMoveGenerator>());
13+
avail_moves.emplace_back(std::make_unique<WeightedMedianMoveGenerator>());
14+
avail_moves.emplace_back(std::make_unique<CriticalUniformMoveGenerator>());
15+
avail_moves.emplace_back(std::make_unique<FeasibleRegionMoveGenerator>());
1616

1717
initialize_move_prob(prob);
1818
}

vpr/src/place/timing_place.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ void PlacerCriticalities::update_criticalities(const SetupTimingInfo* timing_inf
5555
last_crit_exponent_ = crit_params.crit_exponent;
5656
}
5757

58-
ClusterBlockId crit_block;
5958
auto& place_move_ctx = g_placer_ctx.mutable_move();
6059

6160
/* Performs a 1-to-1 mapping from criticality to timing_place_crit_.

0 commit comments

Comments
 (0)