Skip to content

Commit f8ec7c5

Browse files
malibertymaliberty
authored
Merge pull request #2720 from antonblanchard/drt-args
drt: Move FIXEDSHAPECOST and MARKERDECAY into SearchRepairArgs
2 parents 6544ddd + 72b2e22 commit f8ec7c5

File tree

17 files changed

+176
-121
lines changed

17 files changed

+176
-121
lines changed

‎src/drt/include/triton_route/TritonRoute.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ class TritonRoute
116116
int mazeEndIter,
117117
unsigned int workerDRCCost,
118118
unsigned int workerMarkerCost,
119+
unsigned int workerFixedShapeCost,
120+
float workerMarkerDecay,
119121
int ripupMode,
120122
bool followGuide);
121123

@@ -134,6 +136,8 @@ class TritonRoute
134136
void setDebugWorkerParams(int mazeEndIter,
135137
int drcCost,
136138
int markerCost,
139+
int fixedShapeCost,
140+
float markerDecay,
137141
int ripupMode,
138142
int followGuide);
139143
void setDistributed(bool on = true);

‎src/drt/src/TritonRoute.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,16 @@ void TritonRoute::setDebugPaCommit(bool on)
174174
void TritonRoute::setDebugWorkerParams(int mazeEndIter,
175175
int drcCost,
176176
int markerCost,
177+
int fixedShapeCost,
178+
float markerDecay,
177179
int ripupMode,
178180
int followGuide)
179181
{
180182
debug_->mazeEndIter = mazeEndIter;
181183
debug_->drcCost = drcCost;
182184
debug_->markerCost = markerCost;
185+
debug_->fixedShapeCost = fixedShapeCost;
186+
debug_->markerDecay = markerDecay;
183187
debug_->ripupMode = ripupMode;
184188
debug_->followGuide = followGuide;
185189
}
@@ -238,6 +242,10 @@ void TritonRoute::debugSingleWorker(const std::string& dumpDir,
238242
worker->setMarkerCost(debug_->markerCost);
239243
if (debug_->drcCost != -1)
240244
worker->setDrcCost(debug_->drcCost);
245+
if (debug_->fixedShapeCost != -1)
246+
worker->setFixedShapeCost(debug_->fixedShapeCost);
247+
if (debug_->markerDecay != -1)
248+
worker->setMarkerDecay(debug_->markerDecay);
241249
if (debug_->ripupMode != -1)
242250
worker->setRipupMode(debug_->ripupMode);
243251
if (debug_->followGuide != -1)
@@ -609,6 +617,8 @@ void TritonRoute::stepDR(int size,
609617
int mazeEndIter,
610618
frUInt4 workerDRCCost,
611619
frUInt4 workerMarkerCost,
620+
frUInt4 workerFixedShapeCost,
621+
float workerMarkerDecay,
612622
int ripupMode,
613623
bool followGuide)
614624
{
@@ -617,6 +627,8 @@ void TritonRoute::stepDR(int size,
617627
mazeEndIter,
618628
workerDRCCost,
619629
workerMarkerCost,
630+
workerFixedShapeCost,
631+
workerMarkerDecay,
620632
ripupMode,
621633
followGuide});
622634
num_drvs_ = design_->getTopBlock()->getNumMarkers();

‎src/drt/src/TritonRoute.i‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,14 @@ void
186186
set_worker_debug_params(int maze_end_iter,
187187
int drc_cost,
188188
int marker_cost,
189+
int fixed_shape_cost,
190+
int marker_decay,
189191
int ripup_mode,
190192
int follow_guide)
191193
{
192194
auto* router = ord::OpenRoad::openRoad()->getTritonRoute();
193-
router->setDebugWorkerParams(maze_end_iter, drc_cost, marker_cost, ripup_mode, follow_guide);
195+
router->setDebugWorkerParams(maze_end_iter, drc_cost, marker_cost, fixed_shape_cost,
196+
marker_decay, ripup_mode, follow_guide);
194197
}
195198

196199
void
@@ -211,12 +214,15 @@ void detailed_route_step_drt(int size,
211214
int mazeEndIter,
212215
int workerDRCCost,
213216
int workerMarkerCost,
217+
int workerFixedShapeCost,
218+
float workerMarkerDecay,
214219
int ripupMode,
215220
bool followGuide)
216221
{
217222
auto* router = ord::OpenRoad::openRoad()->getTritonRoute();
218223
router->stepDR(size, offset, mazeEndIter, workerDRCCost,
219-
workerMarkerCost, ripupMode, followGuide);
224+
workerMarkerCost, workerFixedShapeCost,
225+
workerMarkerDecay, ripupMode, followGuide);
220226
}
221227

222228
void step_end()

‎src/drt/src/TritonRoute.tcl‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,15 @@ sta::define_cmd_args "detailed_route_worker_debug" {
349349
[-maze_end_iter iter]
350350
[-drc_cost d_cost]
351351
[-marker_cost m_cost]
352+
[-fixed_shape_cost f_cost]
353+
[-marker_decay m_decay]
352354
[-ripup_mode mode]
353355
[-follow_guide f_guide]
354356
}
355357

356358
proc detailed_route_worker_debug { args } {
357359
sta::parse_key_args "detailed_route_worker_debug" args \
358-
keys {-maze_end_iter -drc_cost -marker_cost -ripup_mode -follow_guide} \
360+
keys {-maze_end_iter -drc_cost -marker_cost -fixed_shape_cost -marker_decay -ripup_mode -follow_guide} \
359361
flags {}
360362
if [info exists keys(-maze_end_iter)] {
361363
set maze_end_iter $keys(-maze_end_iter)
@@ -375,6 +377,18 @@ proc detailed_route_worker_debug { args } {
375377
set marker_cost -1
376378
}
377379

380+
if [info exists keys(-fixed_shape_cost)] {
381+
set fixed_shape_cost $keys(-fixed_shape_cost)
382+
} else {
383+
set fixed_shape_cost -1
384+
}
385+
386+
if [info exists keys(-marker_decay)] {
387+
set marker_decay $keys(-marker_decay)
388+
} else {
389+
set marker_decay -1
390+
}
391+
378392
if [info exists keys(-ripup_mode)] {
379393
set ripup_mode $keys(-ripup_mode)
380394
} else {
@@ -386,7 +400,7 @@ proc detailed_route_worker_debug { args } {
386400
} else {
387401
set follow_guide -1
388402
}
389-
drt::set_worker_debug_params $maze_end_iter $drc_cost $marker_cost $ripup_mode $follow_guide
403+
drt::set_worker_debug_params $maze_end_iter $drc_cost $marker_cost $fixed_shape_cost $marker_decay $ripup_mode $follow_guide
390404
}
391405

392406
proc detailed_route_set_default_via { args } {
@@ -403,8 +417,8 @@ namespace eval drt {
403417

404418
proc step_dr { args } {
405419
# args match FlexDR::SearchRepairArgs
406-
if { [llength $args] != 7 } {
407-
utl::error DRT 308 "step_dr requires seven positional arguments."
420+
if { [llength $args] != 9 } {
421+
utl::error DRT 308 "step_dr requires nine positional arguments."
408422
}
409423

410424
drt::detailed_route_step_drt {*}$args

‎src/drt/src/dr/FlexDR.cpp‎

Lines changed: 77 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,6 +1520,8 @@ void FlexDR::searchRepair(const SearchRepairArgs& args)
15201520
const int mazeEndIter = args.mazeEndIter;
15211521
const frUInt4 workerDRCCost = args.workerDRCCost;
15221522
const frUInt4 workerMarkerCost = args.workerMarkerCost;
1523+
const frUInt4 workerFixedShapeCost = args.workerFixedShapeCost;
1524+
const float workerMarkerDecay = args.workerMarkerDecay;
15231525
const int ripupMode = args.ripupMode;
15241526
const bool followGuide = args.followGuide;
15251527

@@ -1607,7 +1609,10 @@ void FlexDR::searchRepair(const SearchRepairArgs& args)
16071609
worker->setFollowGuide(followGuide);
16081610
// TODO: only pass to relevant workers
16091611
worker->setGraphics(graphics_.get());
1610-
worker->setCost(workerDRCCost, workerMarkerCost);
1612+
worker->setCost(workerDRCCost,
1613+
workerMarkerCost,
1614+
workerFixedShapeCost,
1615+
workerMarkerDecay);
16111616

16121617
int batchIdx = (xIdx % batchStepX) * batchStepY + yIdx % batchStepY;
16131618
if (workers[batchIdx].empty()
@@ -1967,71 +1972,75 @@ static std::vector<FlexDR::SearchRepairArgs> strategy()
19671972
{
19681973
const fr::frUInt4 shapeCost = ROUTESHAPECOST;
19691974

1970-
return {/* 0 */ {7, 0, 3, shapeCost, 0 /*MARKERCOST*/, 1, true},
1971-
/* 1 */ {7, -2, 3, shapeCost, shapeCost /*MARKERCOST*/, 1, true},
1972-
/* 2 */ {7, -5, 3, shapeCost, shapeCost /*MAARKERCOST*/, 1, true},
1973-
/* 3 */ {7, 0, 8, shapeCost, MARKERCOST, 0, false},
1974-
/* 4 */ {7, -1, 8, shapeCost, MARKERCOST, 0, false},
1975-
/* 5 */ {7, -2, 8, shapeCost, MARKERCOST, 0, false},
1976-
/* 6 */ {7, -3, 8, shapeCost, MARKERCOST, 0, false},
1977-
/* 7 */ {7, -4, 8, shapeCost, MARKERCOST, 0, false},
1978-
/* 8 */ {7, -5, 8, shapeCost, MARKERCOST, 0, false},
1979-
/* 9 */ {7, -6, 8, shapeCost, MARKERCOST, 0, false},
1980-
/* 10 */ {7, 0, 8, shapeCost * 2, MARKERCOST, 0, false},
1981-
/* 11 */ {7, -1, 8, shapeCost * 2, MARKERCOST, 0, false},
1982-
/* 12 */ {7, -2, 8, shapeCost * 2, MARKERCOST, 0, false},
1983-
/* 13 */ {7, -3, 8, shapeCost * 2, MARKERCOST, 0, false},
1984-
/* 14 */ {7, -4, 8, shapeCost * 2, MARKERCOST, 0, false},
1985-
/* 15 */ {7, -5, 8, shapeCost * 2, MARKERCOST, 0, false},
1986-
/* 16 */ {7, -6, 8, shapeCost * 2, MARKERCOST, 0, false},
1987-
/* 17 */ {7, -3, 8, shapeCost, MARKERCOST, 1, false},
1988-
/* 18 */ {7, 0, 8, shapeCost * 4, MARKERCOST, 0, false},
1989-
/* 19 */ {7, -1, 8, shapeCost * 4, MARKERCOST, 0, false},
1990-
/* 20 */ {7, -2, 8, shapeCost * 4, MARKERCOST, 0, false},
1991-
/* 21 */ {7, -3, 8, shapeCost * 4, MARKERCOST, 0, false},
1992-
/* 22 */ {7, -4, 8, shapeCost * 4, MARKERCOST, 0, false},
1993-
/* 23 */ {7, -5, 8, shapeCost * 4, MARKERCOST, 0, false},
1994-
/* 24 */ {7, -6, 8, shapeCost * 4, MARKERCOST, 0, false},
1995-
/* 25 */ {5, -2, 8, shapeCost, MARKERCOST, 1, false},
1996-
/* 26 */ {7, 0, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
1997-
/* 27 */ {7, -1, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
1998-
/* 28 */ {7, -2, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
1999-
/* 29 */ {7, -3, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
2000-
/* 30 */ {7, -4, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
2001-
/* 31 */ {7, -5, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
2002-
/* 32 */ {7, -6, 8, shapeCost * 8, MARKERCOST * 2, 0, false},
2003-
/* 33 */ {3, -1, 8, shapeCost, MARKERCOST, 1, false},
2004-
/* 34 */ {7, 0, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2005-
/* 35 */ {7, -1, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2006-
/* 36 */ {7, -2, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2007-
/* 37 */ {7, -3, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2008-
/* 38 */ {7, -4, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2009-
/* 39 */ {7, -5, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2010-
/* 40 */ {7, -6, 8, shapeCost * 16, MARKERCOST * 4, 0, false},
2011-
/* 41 */ {3, -2, 8, shapeCost, MARKERCOST, 1, false},
2012-
/* 42 */ {7, 0, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2013-
/* 43 */ {7, -1, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2014-
/* 44 */ {7, -2, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2015-
/* 45 */ {7, -3, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2016-
/* 46 */ {7, -4, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2017-
/* 47 */ {7, -5, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2018-
/* 48 */ {7, -6, 16, shapeCost * 16, MARKERCOST * 4, 0, false},
2019-
/* 49 */ {3, -0, 8, shapeCost, MARKERCOST, 1, false},
2020-
/* 50 */ {7, 0, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2021-
/* 51 */ {7, -1, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2022-
/* 52 */ {7, -2, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2023-
/* 53 */ {7, -3, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2024-
/* 54 */ {7, -4, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2025-
/* 55 */ {7, -5, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2026-
/* 56 */ {7, -6, 32, shapeCost * 32, MARKERCOST * 8, 0, false},
2027-
/* 57 */ {3, -1, 8, shapeCost, MARKERCOST, 1, false},
2028-
/* 58 */ {7, 0, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2029-
/* 59 */ {7, -1, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2030-
/* 60 */ {7, -2, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2031-
/* 61 */ {7, -3, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2032-
/* 62 */ {7, -4, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2033-
/* 63 */ {7, -5, 64, shapeCost * 64, MARKERCOST * 16, 0, false},
2034-
/* 64 */ {7, -6, 64, shapeCost * 64, MARKERCOST * 16, 0, false}};
1975+
// clang-format off
1976+
return {
1977+
{7, 0, 3, shapeCost, 0, shapeCost, 0.950, 1, true}, // 0
1978+
{7, -2, 3, shapeCost, shapeCost, shapeCost, 0.950, 1, true}, // 1
1979+
{7, -5, 3, shapeCost, shapeCost, shapeCost, 0.950, 1, true}, // 2
1980+
{7, 0, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 3
1981+
{7, -1, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 4
1982+
{7, -2, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 5
1983+
{7, -3, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 6
1984+
{7, -4, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 7
1985+
{7, -5, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 8
1986+
{7, -6, 8, shapeCost, MARKERCOST, 2 * shapeCost, 0.950, 0, false}, // 9
1987+
{7, 0, 8, 2 * shapeCost, MARKERCOST, 3 * shapeCost, 0.950, 0, false}, // 10
1988+
{7, -1, 8, 2 * shapeCost, MARKERCOST, 3 * shapeCost, 0.950, 0, false}, // 11
1989+
{7, -2, 8, 2 * shapeCost, MARKERCOST, 3 * shapeCost, 0.950, 0, false}, // 12
1990+
{7, -3, 8, 2 * shapeCost, MARKERCOST, 3 * shapeCost, 0.950, 0, false}, // 13
1991+
{7, -4, 8, 2 * shapeCost, MARKERCOST, 3 * shapeCost, 0.950, 0, false}, // 14
1992+
{7, -5, 8, 2 * shapeCost, MARKERCOST, 4 * shapeCost, 0.950, 0, false}, // 15
1993+
{7, -6, 8, 2 * shapeCost, MARKERCOST, 4 * shapeCost, 0.950, 0, false}, // 16
1994+
{7, -3, 8, shapeCost, MARKERCOST, 4 * shapeCost, 0.950, 1, false}, // 17
1995+
{7, 0, 8, 4 * shapeCost, MARKERCOST, 4 * shapeCost, 0.950, 0, false}, // 18
1996+
{7, -1, 8, 4 * shapeCost, MARKERCOST, 4 * shapeCost, 0.950, 0, false}, // 19
1997+
{7, -2, 8, 4 * shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 20
1998+
{7, -3, 8, 4 * shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 21
1999+
{7, -4, 8, 4 * shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 22
2000+
{7, -5, 8, 4 * shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 23
2001+
{7, -6, 8, 4 * shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 24
2002+
{5, -2, 8, shapeCost, MARKERCOST, 10 * shapeCost, 0.950, 1, false}, // 25
2003+
{7, 0, 8, 8 * shapeCost, 2 * MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 26
2004+
{7, -1, 8, 8 * shapeCost, 2 * MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 27
2005+
{7, -2, 8, 8 * shapeCost, 2 * MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 28
2006+
{7, -3, 8, 8 * shapeCost, 2 * MARKERCOST, 10 * shapeCost, 0.950, 0, false}, // 29
2007+
{7, -4, 8, 8 * shapeCost, 2 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 30
2008+
{7, -5, 8, 8 * shapeCost, 2 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 31
2009+
{7, -6, 8, 8 * shapeCost, 2 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 32
2010+
{3, -1, 8, shapeCost, MARKERCOST, 50 * shapeCost, 0.950, 1, false}, // 33
2011+
{7, 0, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 34
2012+
{7, -1, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 35
2013+
{7, -2, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 36
2014+
{7, -3, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 37
2015+
{7, -4, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 38
2016+
{7, -5, 8, 16 * shapeCost, 4 * MARKERCOST, 50 * shapeCost, 0.950, 0, false}, // 39
2017+
{7, -6, 8, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 40
2018+
{3, -2, 8, shapeCost, MARKERCOST, 100 * shapeCost, 0.990, 1, false}, // 41
2019+
{7, 0, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 42
2020+
{7, -1, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 43
2021+
{7, -2, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 44
2022+
{7, -3, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 45
2023+
{7, -4, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 46
2024+
{7, -5, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 47
2025+
{7, -6, 16, 16 * shapeCost, 4 * MARKERCOST, 100 * shapeCost, 0.990, 0, false}, // 48
2026+
{3, -0, 8, shapeCost, MARKERCOST, 100 * shapeCost, 0.990, 1, false}, // 49
2027+
{7, 0, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 50
2028+
{7, -1, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 51
2029+
{7, -2, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 52
2030+
{7, -3, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 53
2031+
{7, -4, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 54
2032+
{7, -5, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 55
2033+
{7, -6, 32, 32 * shapeCost, 8 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 56
2034+
{3, -1, 8, shapeCost, MARKERCOST, 100 * shapeCost, 0.999, 1, false}, // 57
2035+
{7, 0, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 58
2036+
{7, -1, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 59
2037+
{7, -2, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 60
2038+
{7, -3, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 61
2039+
{7, -4, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 62
2040+
{7, -5, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false}, // 63
2041+
{7, -6, 64, 64 * shapeCost, 16 * MARKERCOST, 100 * shapeCost, 0.999, 0, false} // 64
2042+
};
2043+
// clang-format on
20352044
}
20362045

20372046
void addRectToPolySet(gtl::polygon_90_set_data<frCoord>& polySet, Rect rect)
@@ -2167,26 +2176,6 @@ int FlexDR::main()
21672176
frTime t;
21682177

21692178
for (auto& args : strategy()) {
2170-
if (iter_ < 3)
2171-
FIXEDSHAPECOST = ROUTESHAPECOST;
2172-
else if (iter_ < 10)
2173-
FIXEDSHAPECOST = 2 * ROUTESHAPECOST;
2174-
else if (iter_ < 15)
2175-
FIXEDSHAPECOST = 3 * ROUTESHAPECOST;
2176-
else if (iter_ < 20)
2177-
FIXEDSHAPECOST = 4 * ROUTESHAPECOST;
2178-
else if (iter_ < 30)
2179-
FIXEDSHAPECOST = 10 * ROUTESHAPECOST;
2180-
else if (iter_ < 40)
2181-
FIXEDSHAPECOST = 50 * ROUTESHAPECOST;
2182-
else
2183-
FIXEDSHAPECOST = 100 * ROUTESHAPECOST;
2184-
2185-
if (iter_ == 40)
2186-
MARKERDECAY = 0.99;
2187-
if (iter_ == 50)
2188-
MARKERDECAY = 0.999;
2189-
21902179
int clipSize = args.size;
21912180
if (args.ripupMode != 1) {
21922181
if (increaseClipsize_) {
@@ -2307,6 +2296,8 @@ void FlexDRWorker::serialize(Archive& ar, const unsigned int version)
23072296
(ar) & ripupMode_;
23082297
(ar) & workerDRCCost_;
23092298
(ar) & workerMarkerCost_;
2299+
(ar) & workerFixedShapeCost_;
2300+
(ar) & workerMarkerDecay_;
23102301
(ar) & pinCnt_;
23112302
(ar) & initNumMarkers_;
23122303
(ar) & apSVia_;

0 commit comments

Comments
 (0)