Skip to content

Commit 411fe8b

Browse files
malibertymaliberty
authored
Merge pull request #9119 from The-OpenROAD-Project-staging/rsz-move_sequence-name
rsz: fix member naming move_sequence to move_sequence_
2 parents 269b2e3 + 6363a38 commit 411fe8b

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎src/rsz/src/RepairSetup.cc‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -111,90 +111,90 @@ bool RepairSetup::repairSetup(const float setup_slack_margin,
111111
resizer_->buffer_moved_into_core_ = false;
112112

113113
if (!sequence.empty()) {
114-
move_sequence.clear();
114+
move_sequence_.clear();
115115
for (MoveType move : sequence) {
116116
switch (move) {
117117
case MoveType::BUFFER:
118118
if (!skip_buffering) {
119-
move_sequence.push_back(resizer_->buffer_move_.get());
119+
move_sequence_.push_back(resizer_->buffer_move_.get());
120120
}
121121
break;
122122
case MoveType::UNBUFFER:
123123
if (!skip_buffer_removal) {
124-
move_sequence.push_back(resizer_->unbuffer_move_.get());
124+
move_sequence_.push_back(resizer_->unbuffer_move_.get());
125125
}
126126
break;
127127
case MoveType::SWAP:
128128
if (!skip_pin_swap) {
129-
move_sequence.push_back(resizer_->swap_pins_move_.get());
129+
move_sequence_.push_back(resizer_->swap_pins_move_.get());
130130
}
131131
break;
132132
case MoveType::SIZE:
133-
move_sequence.push_back(resizer_->size_up_move_.get());
133+
move_sequence_.push_back(resizer_->size_up_move_.get());
134134
if (!skip_size_down) {
135-
move_sequence.push_back(resizer_->size_down_move_.get());
135+
move_sequence_.push_back(resizer_->size_down_move_.get());
136136
}
137137
break;
138138
case MoveType::SIZEUP:
139-
move_sequence.push_back(resizer_->size_up_move_.get());
139+
move_sequence_.push_back(resizer_->size_up_move_.get());
140140
break;
141141
case MoveType::SIZEDOWN:
142142
if (!skip_size_down) {
143-
move_sequence.push_back(resizer_->size_down_move_.get());
143+
move_sequence_.push_back(resizer_->size_down_move_.get());
144144
}
145145
break;
146146
case MoveType::CLONE:
147147
if (!skip_gate_cloning) {
148-
move_sequence.push_back(resizer_->clone_move_.get());
148+
move_sequence_.push_back(resizer_->clone_move_.get());
149149
}
150150
break;
151151
case MoveType::SPLIT:
152152
if (!skip_buffering) {
153-
move_sequence.push_back(resizer_->split_load_move_.get());
153+
move_sequence_.push_back(resizer_->split_load_move_.get());
154154
}
155155
break;
156156
case MoveType::VTSWAP_SPEED:
157157
if (!skip_vt_swap
158158
&& resizer_->lib_data_->sorted_vt_categories.size() > 1) {
159-
move_sequence.push_back(resizer_->vt_swap_speed_move_.get());
159+
move_sequence_.push_back(resizer_->vt_swap_speed_move_.get());
160160
}
161161
break;
162162
case MoveType::SIZEUP_MATCH:
163-
move_sequence.push_back(resizer_->size_up_match_move_.get());
163+
move_sequence_.push_back(resizer_->size_up_match_move_.get());
164164
break;
165165
}
166166
}
167167

168168
} else {
169-
move_sequence.clear();
169+
move_sequence_.clear();
170170
if (!skip_buffer_removal) {
171-
move_sequence.push_back(resizer_->unbuffer_move_.get());
171+
move_sequence_.push_back(resizer_->unbuffer_move_.get());
172172
}
173173
if (!skip_vt_swap && resizer_->lib_data_->sorted_vt_categories.size() > 1) {
174-
move_sequence.push_back(resizer_->vt_swap_speed_move_.get());
174+
move_sequence_.push_back(resizer_->vt_swap_speed_move_.get());
175175
}
176176
// Always have sizing
177-
move_sequence.push_back(resizer_->size_up_move_.get());
177+
move_sequence_.push_back(resizer_->size_up_move_.get());
178178
// Disabled by default for now
179179
if (!skip_size_down) {
180-
// move_sequence.push_back(resizer_->size_down_move_.get());
180+
// move_sequence_.push_back(resizer_->size_down_move_.get());
181181
}
182182
if (!skip_pin_swap) {
183-
move_sequence.push_back(resizer_->swap_pins_move_.get());
183+
move_sequence_.push_back(resizer_->swap_pins_move_.get());
184184
}
185185
if (!skip_buffering) {
186-
move_sequence.push_back(resizer_->buffer_move_.get());
186+
move_sequence_.push_back(resizer_->buffer_move_.get());
187187
}
188188
if (!skip_gate_cloning) {
189-
move_sequence.push_back(resizer_->clone_move_.get());
189+
move_sequence_.push_back(resizer_->clone_move_.get());
190190
}
191191
if (!skip_buffering) {
192-
move_sequence.push_back(resizer_->split_load_move_.get());
192+
move_sequence_.push_back(resizer_->split_load_move_.get());
193193
}
194194
}
195195

196196
string repair_moves = "Repair move sequence: ";
197-
for (auto move : move_sequence) {
197+
for (auto move : move_sequence_) {
198198
move->init();
199199
repair_moves += move->name() + string(" ");
200200
}
@@ -583,15 +583,15 @@ void RepairSetup::repairSetup(const Pin* end_pin)
583583
const Slack slack = sta_->vertexSlack(vertex, max_);
584584
Path* path = sta_->vertexWorstSlackPath(vertex, max_);
585585

586-
move_sequence.clear();
587-
move_sequence = {resizer_->unbuffer_move_.get(),
588-
resizer_->vt_swap_speed_move_.get(),
589-
resizer_->size_down_move_.get(),
590-
resizer_->size_up_move_.get(),
591-
resizer_->swap_pins_move_.get(),
592-
resizer_->buffer_move_.get(),
593-
resizer_->clone_move_.get(),
594-
resizer_->split_load_move_.get()};
586+
move_sequence_.clear();
587+
move_sequence_ = {resizer_->unbuffer_move_.get(),
588+
resizer_->vt_swap_speed_move_.get(),
589+
resizer_->size_down_move_.get(),
590+
resizer_->size_up_move_.get(),
591+
resizer_->swap_pins_move_.get(),
592+
resizer_->buffer_move_.get(),
593+
resizer_->clone_move_.get(),
594+
resizer_->split_load_move_.get()};
595595

596596
{
597597
est::IncrementalParasiticsGuard guard(estimate_parasitics_);
@@ -740,7 +740,7 @@ bool RepairSetup::repairPath(Path* path,
740740
fanout,
741741
drvr_index);
742742

743-
for (BaseMove* move : move_sequence) {
743+
for (BaseMove* move : move_sequence_) {
744744
debugPrint(logger_,
745745
RSZ,
746746
"repair_setup",
@@ -885,14 +885,14 @@ void RepairSetup::repairSetupLastGasp(const OptoParams& params,
885885
int& num_viols,
886886
const int max_iterations)
887887
{
888-
move_sequence.clear();
888+
move_sequence_.clear();
889889
if (!params.skip_vt_swap) {
890-
move_sequence.push_back(resizer_->vt_swap_speed_move_.get());
890+
move_sequence_.push_back(resizer_->vt_swap_speed_move_.get());
891891
}
892-
move_sequence.push_back(resizer_->size_up_match_move_.get());
893-
move_sequence.push_back(resizer_->size_up_move_.get());
892+
move_sequence_.push_back(resizer_->size_up_match_move_.get());
893+
move_sequence_.push_back(resizer_->size_up_move_.get());
894894
if (!params.skip_pin_swap) {
895-
move_sequence.push_back(resizer_->swap_pins_move_.get());
895+
move_sequence_.push_back(resizer_->swap_pins_move_.get());
896896
}
897897

898898
// Sort remaining failing endpoints

‎src/rsz/src/RepairSetup.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class RepairSetup : public sta::dbStaState
155155
int removed_buffer_count_ = 0;
156156
double initial_design_area_ = 0;
157157

158-
std::vector<BaseMove*> move_sequence;
158+
std::vector<BaseMove*> move_sequence_;
159159

160160
const MinMax* min_ = MinMax::min();
161161
const MinMax* max_ = MinMax::max();

0 commit comments

Comments
 (0)