Skip to content

Commit 2778e2e

Browse files
remove unused const variable NUM_PL_1ST_STATE_MOVE_TYPES
1 parent 91b74c5 commit 2778e2e

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

vpr/src/base/vpr_types.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,9 @@ enum class ScreenUpdatePriority {
8989
/* Values large enough to be way out of range for any data, but small enough
9090
* to allow a small number to be added to them without going out of range. */
9191
#define HUGE_POSITIVE_FLOAT 1.e30
92-
#define HUGE_NEGATIVE_FLOAT -1.e30
9392

9493
/* Used to avoid floating-point errors when comparing values close to 0 */
9594
#define EPSILON 1.e-15
96-
#define NEGATIVE_EPSILON -1.e-15
9795

9896
#define FIRST_ITER_WIRELENTH_LIMIT 0.85 /* If used wirelength exceeds this value in first iteration of routing, do not route */
9997

@@ -110,12 +108,10 @@ constexpr auto INVALID_BLOCK_ID = ClusterBlockId(-2);
110108
* and maps it to the complex logic blocks found in the architecture
111109
******************************************************************************/
112110

113-
#define NO_CLUSTER -1
114-
#define NEVER_CLUSTER -2
115-
#define NOT_VALID -10000 /* Marks gains that aren't valid */
111+
#define NOT_VALID (-10000) /* Marks gains that aren't valid */
116112
/* Ensure no gain can ever be this negative! */
117113
#ifndef UNDEFINED
118-
# define UNDEFINED -1
114+
# define UNDEFINED (-1)
119115
#endif
120116

121117
enum class e_router_lookahead {
@@ -552,7 +548,6 @@ enum class e_timing_update_type {
552548
/* Values of number of placement available move types */
553549
constexpr int NUM_PL_MOVE_TYPES = 7;
554550
constexpr int NUM_PL_NONTIMING_MOVE_TYPES = 3;
555-
constexpr int NUM_PL_1ST_STATE_MOVE_TYPES = 4;
556551

557552
/* Timing data structures end */
558553
enum sched_type {

vpr/src/place/move_generator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MoveGenerator {
5050
* This function proposes a new move and updates blocks affected and move_type accorrdingly. The function interface is general
5151
* to match the parameters needed by all move generators
5252
*
53-
* @param blocks_affectedt: the output of the move
53+
* @param blocks_affected: the output of the move
5454
* @param proposed_action: Contains the move type and block type. If the block type is specified,
5555
* the proposed move swaps instances of the given block type. Otherwise, the selected block type
5656
* by the move generator is written to proposed_action.logical_blk_type_index.

vpr/src/place/move_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void report_aborted_moves() {
2828
if (f_move_abort_reasons.empty()) {
2929
VTR_LOG(" No moves aborted\n");
3030
}
31-
for (auto kv : f_move_abort_reasons) {
31+
for (const auto& kv : f_move_abort_reasons) {
3232
VTR_LOG(" %s: %zu\n", kv.first.c_str(), kv.second);
3333
}
3434
}
@@ -1028,7 +1028,7 @@ void compressed_grid_to_loc(t_logical_block_type_ptr blk_type,
10281028
auto& grid = g_vpr_ctx.device().grid;
10291029
auto to_type = grid.get_physical_type({grid_loc.x, grid_loc.y, grid_loc.layer_num});
10301030

1031-
//Each x/y location contains only a single type, so we can pick a random z (capcity) location
1031+
//Each x/y location contains only a single type, so we can pick a random z (capacity) location
10321032
auto& compatible_sub_tiles = compressed_block_grid.compatible_sub_tile_num(to_type->index);
10331033
int sub_tile = compatible_sub_tiles[vtr::irand((int)compatible_sub_tiles.size() - 1)];
10341034

0 commit comments

Comments
 (0)