Skip to content

Commit 5ee8ea6

Browse files
authored
Merge pull request #10433 from erendn/rename_size_down
rsz: Rename SizeDownMove to SizeDownFanoutMove
2 parents cd4f504 + 44c01fc commit 5ee8ea6

41 files changed

Lines changed: 226 additions & 217 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/rsz/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ cc_library(
6868
"src/move/RerouteCandidate.hh",
6969
"src/move/RerouteGenerator.cc",
7070
"src/move/RerouteGenerator.hh",
71-
"src/move/SizeDownCandidate.cc",
72-
"src/move/SizeDownCandidate.hh",
73-
"src/move/SizeDownGenerator.cc",
74-
"src/move/SizeDownGenerator.hh",
71+
"src/move/SizeDownFanoutCandidate.cc",
72+
"src/move/SizeDownFanoutCandidate.hh",
73+
"src/move/SizeDownFanoutGenerator.cc",
74+
"src/move/SizeDownFanoutGenerator.hh",
7575
"src/move/SizeUpCandidate.cc",
7676
"src/move/SizeUpCandidate.hh",
7777
"src/move/SizeUpGenerator.cc",

src/rsz/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ repair_timing
223223
[-phases]
224224
[-skip_pin_swap]
225225
[-skip_gate_cloning]
226-
[-skip_size_down]
226+
[-skip_size_down_fanout]
227227
[-skip_buffering]
228228
[-skip_buffer_removal]
229229
[-skip_last_gasp]
@@ -253,7 +253,7 @@ repair_timing
253253
| `-phases` | Specify a particular order of setup timing optimization phases. The default is "LEGACY LAST_GASP CRIT_VT_SWAP". |
254254
| `-skip_pin_swap` | Flag to skip pin swap. The default is to perform pin swap transform during setup fixing. |
255255
| `-skip_gate_cloning` | Flag to skip gate cloning. The default is to perform gate cloning transform during setup fixing. |
256-
| `-skip_size_down` | Flag to skip gate down sizing. The default is to perform non-critical fanout gate down sizing transform during setup fixing. |
256+
| `-skip_size_down_fanout` | Flag to skip fanout gate down sizing. The default is to perform non-critical fanout gate down sizing transform during setup fixing. |
257257
| `-skip_buffering` | Flag to skip rebuffering and load splitting. The default is to perform rebuffering and load splitting transforms during setup fixing. |
258258
| `-skip_buffer_removal` | Flag to skip buffer removal. The default is to perform buffer removal transform during setup fixing. |
259259
| `-skip_last_gasp` | Flag to skip final ("last gasp") optimizations. The default is to perform greedy sizing at the end of optimization. |

src/rsz/doc/architecture.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ enum class MoveType : uint8_t
222222
kClone,
223223
kSizeUp,
224224
kSizeUpMatch,
225-
kSizeDown,
225+
kSizeDownFanout,
226226
kSwapPins,
227227
kVtSwap,
228228
kUnbuffer,
@@ -582,7 +582,7 @@ Current generator/candidate families:
582582
| Clone | `CloneGenerator` | `CloneCandidate` |
583583
| SizeUp | `SizeUpGenerator`, `SizeUpMtGenerator` | `SizeUpCandidate`, `SizeUpMtCandidate` |
584584
| SizeUpMatch | `SizeUpMatchGenerator` | `SizeUpMatchCandidate` |
585-
| SizeDown | `SizeDownGenerator` | `SizeDownCandidate` |
585+
| SizeDownFanout | `SizeDownFanoutGenerator` | `SizeDownFanoutCandidate` |
586586
| SwapPins | `SwapPinsGenerator` | `SwapPinsCandidate` |
587587
| VtSwap | `VtSwapGenerator`, `VtSwapMtGenerator` | `VtSwapCandidate`, `VtSwapMtCandidate` |
588588
| Unbuffer | `UnbufferGenerator` | `UnbufferCandidate` |
@@ -648,7 +648,7 @@ SetupMt1Policy:
648648
| Removed | `BufferMove.cc`, `BufferMove.hh` | Replaced by `move/BufferGenerator.*`, `move/BufferCandidate.*`. |
649649
| Removed | `CloneMove.cc`, `CloneMove.hh` | Replaced by `move/CloneGenerator.*`, `move/CloneCandidate.*`. |
650650
| Removed | `SizeUpMove.cc`, `SizeUpMove.hh` | Replaced by `move/SizeUpGenerator.*`, `move/SizeUpCandidate.*`, `move/SizeUpMt*`, `move/SizeUpMatch*`. |
651-
| Removed | `SizeDownMove.cc`, `SizeDownMove.hh` | Replaced by `move/SizeDownGenerator.*`, `move/SizeDownCandidate.*`. |
651+
| Removed | `SizeDownMove.cc`, `SizeDownMove.hh` | Replaced by `move/SizeDownFanoutGenerator.*`, `move/SizeDownFanoutCandidate.*`. |
652652
| Removed | `SwapPinsMove.cc`, `SwapPinsMove.hh` | Replaced by `move/SwapPinsGenerator.*`, `move/SwapPinsCandidate.*`. |
653653
| Removed | `VTSwapMove.cc`, `VTSwapMove.hh` | Replaced by `move/VtSwapGenerator.*`, `move/VtSwapCandidate.*`, `move/VtSwapMt*`, `move/MeasuredVtSwap*`. |
654654
| Removed | `UnbufferMove.cc`, `UnbufferMove.hh` | Replaced by `move/UnbufferGenerator.*`, `move/UnbufferCandidate.*`. |

src/rsz/include/rsz/Resizer.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ enum class MoveType : uint8_t
9797
kClone,
9898
kSizeUp,
9999
kSizeUpMatch,
100-
kSizeDown,
100+
kSizeDownFanout,
101101
kSwapPins,
102102
kVtSwap,
103103
kUnbuffer,
@@ -340,7 +340,7 @@ class Resizer : public sta::dbStaState, public sta::dbNetworkObserver
340340
const char* phases,
341341
bool skip_pin_swap,
342342
bool skip_gate_cloning,
343-
bool skip_size_down,
343+
bool skip_size_down_fanout,
344344
bool skip_buffering,
345345
bool skip_buffer_removal,
346346
bool skip_last_gasp,

src/rsz/src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ add_library(rsz_lib
5151
move/MoveGenerator.cc
5252
move/RerouteCandidate.cc
5353
move/RerouteGenerator.cc
54-
move/SizeDownCandidate.cc
55-
move/SizeDownGenerator.cc
54+
move/SizeDownFanoutCandidate.cc
55+
move/SizeDownFanoutGenerator.cc
5656
move/SizeUpCandidate.cc
5757
move/SizeUpGenerator.cc
5858
move/SizeUpMatchCandidate.cc

src/rsz/src/MoveCommitter.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ void MoveCommitter::logPendingMoves(const char* action,
443443
move_count,
444444
pendingMoves(MoveType::kSizeUp),
445445
pendingMoves(MoveType::kSizeUpMatch),
446-
pendingMoves(MoveType::kSizeDown),
446+
pendingMoves(MoveType::kSizeDownFanout),
447447
pendingMoves(MoveType::kBuffer),
448448
pendingMoves(MoveType::kClone),
449449
pendingMoves(MoveType::kSwapPins),
@@ -467,7 +467,7 @@ void MoveCommitter::logCommittedTotals() const
467467
resizer_.rejectedLegacyMoveCount(),
468468
committedMoves(MoveType::kSizeUp),
469469
committedMoves(MoveType::kSizeUpMatch),
470-
committedMoves(MoveType::kSizeDown),
470+
committedMoves(MoveType::kSizeDownFanout),
471471
committedMoves(MoveType::kBuffer),
472472
committedMoves(MoveType::kClone),
473473
committedMoves(MoveType::kSwapPins),

src/rsz/src/Optimizer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ bool Optimizer::repairSetup(const sta::Pin* const end_pin)
220220
config.match_cell_footprint = resizer_.matchCellFootprint();
221221
config.sequence = {MoveType::kUnbuffer,
222222
MoveType::kVtSwap,
223-
MoveType::kSizeDown,
223+
MoveType::kSizeDownFanout,
224224
MoveType::kSizeUp,
225225
MoveType::kSwapPins,
226226
MoveType::kBuffer,

src/rsz/src/OptimizerTypes.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ struct OptimizerRunConfig
395395
bool verbose{false};
396396
bool skip_pin_swap{false};
397397
bool skip_gate_cloning{false};
398-
bool skip_size_down{false};
398+
bool skip_size_down_fanout{false};
399399
bool skip_buffering{false};
400400
bool skip_buffer_removal{false};
401401
bool skip_last_gasp{false};
@@ -439,8 +439,8 @@ inline const char* moveName(const MoveType move_type)
439439
return "SizeUpMove";
440440
case MoveType::kSizeUpMatch:
441441
return "SizeUpMatchMove";
442-
case MoveType::kSizeDown:
443-
return "SizeDownMove";
442+
case MoveType::kSizeDownFanout:
443+
return "SizeDownFanoutMove";
444444
case MoveType::kSwapPins:
445445
return "SwapPinsMove";
446446
case MoveType::kVtSwap:

src/rsz/src/Resizer-py.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ using namespace rsz;
8585
const char* phases,
8686
bool skip_pin_swap,
8787
bool skip_gate_cloning,
88-
bool skip_size_down,
88+
bool skip_size_down_fanout,
8989
bool skip_buffering,
9090
bool skip_buffer_removal,
9191
bool skip_last_gasp,
@@ -98,7 +98,7 @@ using namespace rsz;
9898
max_passes, max_iterations, max_repairs_per_pass,
9999
match_cell_footprint, verbose, move_seq,
100100
phases ? phases : "",
101-
skip_pin_swap, skip_gate_cloning, skip_size_down,
101+
skip_pin_swap, skip_gate_cloning, skip_size_down_fanout,
102102
skip_buffering, skip_buffer_removal,
103103
skip_last_gasp, skip_vt_swap, skip_crit_vt_swap);
104104
}

src/rsz/src/Resizer.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4909,7 +4909,7 @@ bool Resizer::repairSetup(double setup_margin,
49094909
const char* phases,
49104910
bool skip_pin_swap,
49114911
bool skip_gate_cloning,
4912-
bool skip_size_down,
4912+
bool skip_size_down_fanout,
49134913
bool skip_buffering,
49144914
bool skip_buffer_removal,
49154915
bool skip_last_gasp,
@@ -4929,7 +4929,7 @@ bool Resizer::repairSetup(double setup_margin,
49294929
config.phases = phases != nullptr ? phases : "";
49304930
config.skip_pin_swap = skip_pin_swap;
49314931
config.skip_gate_cloning = skip_gate_cloning;
4932-
config.skip_size_down = skip_size_down;
4932+
config.skip_size_down_fanout = skip_size_down_fanout;
49334933
config.skip_buffering = skip_buffering;
49344934
config.skip_buffer_removal = skip_buffer_removal;
49354935
config.skip_last_gasp = skip_last_gasp;
@@ -6093,8 +6093,8 @@ MoveType Resizer::moveTypeFromString(const std::string& s)
60936093
if (lower == "sizeup") {
60946094
return MoveType::kSizeUp;
60956095
}
6096-
if (lower == "sizedown") {
6097-
return MoveType::kSizeDown;
6096+
if (lower == "size_down_fanout" || lower == "size_down") {
6097+
return MoveType::kSizeDownFanout;
60986098
}
60996099
if (lower == "clone") {
61006100
return MoveType::kClone;
@@ -6127,7 +6127,7 @@ std::vector<MoveType> Resizer::parseMoveSequence(const std::string& sequence)
61276127
std::ranges::transform(lower, lower.begin(), ::tolower);
61286128
if (lower == "size") {
61296129
result.push_back(MoveType::kSizeUp);
6130-
result.push_back(MoveType::kSizeDown);
6130+
result.push_back(MoveType::kSizeDownFanout);
61316131
continue;
61326132
}
61336133
result.push_back(moveTypeFromString(lower));

0 commit comments

Comments
 (0)