Skip to content

Commit 2bb4638

Browse files
malibertymaliberty
authored
Merge pull request #8627 from The-OpenROAD-Project-staging/dpl-swaped-names
dpl: fix swapped names strings in RandomGenerator / DisplacementGener…
2 parents 13180d9 + bfb5753 commit 2bb4638

File tree

12 files changed

+52
-51
lines changed

12 files changed

+52
-51
lines changed

‎src/dpl/src/optimization/detailed_random.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ void DetailedRandom::collectCandidates()
506506

507507
////////////////////////////////////////////////////////////////////////////////
508508
////////////////////////////////////////////////////////////////////////////////
509-
RandomGenerator::RandomGenerator() : DetailedGenerator("displacement")
509+
RandomGenerator::RandomGenerator() : DetailedGenerator("random")
510510
{
511511
}
512512

@@ -632,7 +632,8 @@ void RandomGenerator::stats()
632632

633633
////////////////////////////////////////////////////////////////////////////////
634634
////////////////////////////////////////////////////////////////////////////////
635-
DisplacementGenerator::DisplacementGenerator() : DetailedGenerator("random")
635+
DisplacementGenerator::DisplacementGenerator()
636+
: DetailedGenerator("displacement")
636637
{
637638
}
638639

‎src/dpl/test/aes-opt.ok‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Detailed placement improvement.
3030
[INFO DPL-0304] Pass 1 of reordering; objective is 7.301919e+08.
3131
[INFO DPL-0305] End of reordering; objective is 7.301919e+08, improvement is 0.49 percent.
3232
[INFO DPL-0303] Running algorithm for random improvement.
33-
[INFO DPL-0324] Random improver is using displacement generator.
33+
[INFO DPL-0324] Random improver is using random generator.
3434
[INFO DPL-0325] Random improver is using hpwl objective.
3535
[INFO DPL-0326] Random improver cost string is (a).
36-
[INFO DPL-0332] End of pass, Generator displacement called 377660 times.
37-
[INFO DPL-0335] Generator displacement, Cumulative attempts 377660, swaps 222646, moves 150636 since last reset.
36+
[INFO DPL-0332] End of pass, Generator random called 377660 times.
37+
[INFO DPL-0335] Generator random, Cumulative attempts 377660, swaps 222646, moves 150636 since last reset.
3838
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 7.280123e+08, Scratch cost 7.243295e+08, Incremental cost 7.243295e+08, Mismatch? N
3939
[INFO DPL-0338] End of pass, Total cost is 7.243295e+08.
4040
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 0.51 percent.

‎src/dpl/test/blockage1-opt.ok‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ Detailed placement improvement.
3131
[INFO DPL-0304] Pass 1 of reordering; objective is 5.919500e+04.
3232
[INFO DPL-0305] End of reordering; objective is 5.919500e+04, improvement is 0.00 percent.
3333
[INFO DPL-0303] Running algorithm for random improvement.
34-
[INFO DPL-0324] Random improver is using displacement generator.
34+
[INFO DPL-0324] Random improver is using random generator.
3535
[INFO DPL-0325] Random improver is using hpwl objective.
3636
[INFO DPL-0326] Random improver cost string is (a).
37-
[INFO DPL-0332] End of pass, Generator displacement called 20 times.
38-
[INFO DPL-0335] Generator displacement, Cumulative attempts 20, swaps 0, moves 17 since last reset.
37+
[INFO DPL-0332] End of pass, Generator random called 20 times.
38+
[INFO DPL-0335] Generator random, Cumulative attempts 20, swaps 0, moves 17 since last reset.
3939
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 5.919500e+04, Scratch cost 5.681500e+04, Incremental cost 5.681500e+04, Mismatch? N
4040
[INFO DPL-0338] End of pass, Total cost is 5.681500e+04.
4141
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 4.02 percent.
42-
[INFO DPL-0332] End of pass, Generator displacement called 20 times.
43-
[INFO DPL-0335] Generator displacement, Cumulative attempts 40, swaps 0, moves 32 since last reset.
42+
[INFO DPL-0332] End of pass, Generator random called 20 times.
43+
[INFO DPL-0335] Generator random, Cumulative attempts 40, swaps 0, moves 32 since last reset.
4444
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 5.681500e+04, Scratch cost 5.681500e+04, Incremental cost 5.681500e+04, Mismatch? N
4545
[INFO DPL-0338] End of pass, Total cost is 5.681500e+04.
4646
[INFO DPL-0327] Pass 2 of random improver; improvement in cost is 0.00 percent.

‎src/dpl/test/edge_spacing-opt.ok‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ Detailed placement improvement.
3737
[INFO DPL-0304] Pass 2 of reordering; objective is 8.580000e+03.
3838
[INFO DPL-0305] End of reordering; objective is 8.580000e+03, improvement is 4.24 percent.
3939
[INFO DPL-0303] Running algorithm for random improvement.
40-
[INFO DPL-0324] Random improver is using displacement generator.
40+
[INFO DPL-0324] Random improver is using random generator.
4141
[INFO DPL-0325] Random improver is using hpwl objective.
4242
[INFO DPL-0326] Random improver cost string is (a).
43-
[INFO DPL-0332] End of pass, Generator displacement called 500 times.
44-
[INFO DPL-0335] Generator displacement, Cumulative attempts 500, swaps 211, moves 0 since last reset.
43+
[INFO DPL-0332] End of pass, Generator random called 500 times.
44+
[INFO DPL-0335] Generator random, Cumulative attempts 500, swaps 211, moves 0 since last reset.
4545
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 8.580000e+03, Scratch cost 7.060000e+03, Incremental cost 7.060000e+03, Mismatch? N
4646
[INFO DPL-0338] End of pass, Total cost is 7.060000e+03.
4747
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 17.72 percent.
48-
[INFO DPL-0332] End of pass, Generator displacement called 500 times.
49-
[INFO DPL-0335] Generator displacement, Cumulative attempts 1000, swaps 462, moves 0 since last reset.
48+
[INFO DPL-0332] End of pass, Generator random called 500 times.
49+
[INFO DPL-0335] Generator random, Cumulative attempts 1000, swaps 462, moves 0 since last reset.
5050
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 7.060000e+03, Scratch cost 6.300000e+03, Incremental cost 6.300000e+03, Mismatch? N
5151
[INFO DPL-0338] End of pass, Total cost is 6.300000e+03.
5252
[INFO DPL-0327] Pass 2 of random improver; improvement in cost is 10.76 percent.
53-
[INFO DPL-0332] End of pass, Generator displacement called 500 times.
54-
[INFO DPL-0335] Generator displacement, Cumulative attempts 1500, swaps 690, moves 0 since last reset.
53+
[INFO DPL-0332] End of pass, Generator random called 500 times.
54+
[INFO DPL-0335] Generator random, Cumulative attempts 1500, swaps 690, moves 0 since last reset.
5555
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 6.300000e+03, Scratch cost 6.300000e+03, Incremental cost 6.300000e+03, Mismatch? N
5656
[INFO DPL-0338] End of pass, Total cost is 6.300000e+03.
5757
[INFO DPL-0327] Pass 3 of random improver; improvement in cost is 0.00 percent.

‎src/dpl/test/gcd-opt.ok‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Detailed placement improvement.
3131
[INFO DPL-0304] Pass 2 of reordering; objective is 1.493588e+07.
3232
[INFO DPL-0305] End of reordering; objective is 1.493588e+07, improvement is 1.22 percent.
3333
[INFO DPL-0303] Running algorithm for random improvement.
34-
[INFO DPL-0324] Random improver is using displacement generator.
34+
[INFO DPL-0324] Random improver is using random generator.
3535
[INFO DPL-0325] Random improver is using hpwl objective.
3636
[INFO DPL-0326] Random improver cost string is (a).
37-
[INFO DPL-0332] End of pass, Generator displacement called 5880 times.
38-
[INFO DPL-0335] Generator displacement, Cumulative attempts 5880, swaps 1654, moves 4034 since last reset.
37+
[INFO DPL-0332] End of pass, Generator random called 5880 times.
38+
[INFO DPL-0335] Generator random, Cumulative attempts 5880, swaps 1654, moves 4034 since last reset.
3939
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.493588e+07, Scratch cost 1.480906e+07, Incremental cost 1.480906e+07, Mismatch? N
4040
[INFO DPL-0338] End of pass, Total cost is 1.480906e+07.
4141
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 0.85 percent.

‎src/dpl/test/gcd_no_one_site_gaps-opt.ok‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ Detailed placement improvement.
3030
[INFO DPL-0304] Pass 1 of reordering; objective is 1.498735e+07.
3131
[INFO DPL-0305] End of reordering; objective is 1.498735e+07, improvement is 0.87 percent.
3232
[INFO DPL-0303] Running algorithm for random improvement.
33-
[INFO DPL-0324] Random improver is using displacement generator.
33+
[INFO DPL-0324] Random improver is using random generator.
3434
[INFO DPL-0325] Random improver is using hpwl objective.
3535
[INFO DPL-0326] Random improver cost string is (a).
36-
[INFO DPL-0332] End of pass, Generator displacement called 5880 times.
37-
[INFO DPL-0335] Generator displacement, Cumulative attempts 5880, swaps 1619, moves 3999 since last reset.
36+
[INFO DPL-0332] End of pass, Generator random called 5880 times.
37+
[INFO DPL-0335] Generator random, Cumulative attempts 5880, swaps 1619, moves 3999 since last reset.
3838
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.498735e+07, Scratch cost 1.479654e+07, Incremental cost 1.479654e+07, Mismatch? N
3939
[INFO DPL-0338] End of pass, Total cost is 1.479654e+07.
4040
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 1.27 percent.
41-
[INFO DPL-0332] End of pass, Generator displacement called 5880 times.
42-
[INFO DPL-0335] Generator displacement, Cumulative attempts 11760, swaps 3328, moves 7928 since last reset.
41+
[INFO DPL-0332] End of pass, Generator random called 5880 times.
42+
[INFO DPL-0335] Generator random, Cumulative attempts 11760, swaps 3328, moves 7928 since last reset.
4343
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.479654e+07, Scratch cost 1.471108e+07, Incremental cost 1.471108e+07, Mismatch? N
4444
[INFO DPL-0338] End of pass, Total cost is 1.471108e+07.
4545
[INFO DPL-0327] Pass 2 of random improver; improvement in cost is 0.58 percent.

‎src/dpl/test/ibex-opt.ok‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Detailed placement improvement.
3030
[INFO DPL-0304] Pass 1 of reordering; objective is 1.291762e+09.
3131
[INFO DPL-0305] End of reordering; objective is 1.291762e+09, improvement is 0.18 percent.
3232
[INFO DPL-0303] Running algorithm for random improvement.
33-
[INFO DPL-0324] Random improver is using displacement generator.
33+
[INFO DPL-0324] Random improver is using random generator.
3434
[INFO DPL-0325] Random improver is using hpwl objective.
3535
[INFO DPL-0326] Random improver cost string is (a).
36-
[INFO DPL-0332] End of pass, Generator displacement called 586020 times.
37-
[INFO DPL-0335] Generator displacement, Cumulative attempts 586020, swaps 305581, moves 271891 since last reset.
36+
[INFO DPL-0332] End of pass, Generator random called 586020 times.
37+
[INFO DPL-0335] Generator random, Cumulative attempts 586020, swaps 305581, moves 271891 since last reset.
3838
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.290208e+09, Scratch cost 1.287228e+09, Incremental cost 1.287228e+09, Mismatch? N
3939
[INFO DPL-0338] End of pass, Total cost is 1.287228e+09.
4040
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 0.23 percent.

‎src/dpl/test/multi_height1-opt.ok‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Detailed placement improvement.
3636
[INFO DPL-0304] Pass 1 of reordering; objective is 5.901000e+04.
3737
[INFO DPL-0305] End of reordering; objective is 5.901000e+04, improvement is 0.00 percent.
3838
[INFO DPL-0303] Running algorithm for random improvement.
39-
[INFO DPL-0324] Random improver is using displacement generator.
39+
[INFO DPL-0324] Random improver is using random generator.
4040
[INFO DPL-0325] Random improver is using hpwl objective.
4141
[INFO DPL-0326] Random improver cost string is (a).
42-
[INFO DPL-0332] End of pass, Generator displacement called 100 times.
43-
[INFO DPL-0335] Generator displacement, Cumulative attempts 100, swaps 0, moves 42 since last reset.
42+
[INFO DPL-0332] End of pass, Generator random called 100 times.
43+
[INFO DPL-0335] Generator random, Cumulative attempts 100, swaps 0, moves 42 since last reset.
4444
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 5.901000e+04, Scratch cost 5.901000e+04, Incremental cost 5.901000e+04, Mismatch? N
4545
[INFO DPL-0338] End of pass, Total cost is 5.901000e+04.
4646
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 0.00 percent.

‎src/dpl/test/regions1-opt.ok‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ Detailed placement improvement.
3131
[INFO DPL-0304] Pass 1 of reordering; objective is 1.272900e+05.
3232
[INFO DPL-0305] End of reordering; objective is 1.272900e+05, improvement is 0.00 percent.
3333
[INFO DPL-0303] Running algorithm for random improvement.
34-
[INFO DPL-0324] Random improver is using displacement generator.
34+
[INFO DPL-0324] Random improver is using random generator.
3535
[INFO DPL-0325] Random improver is using hpwl objective.
3636
[INFO DPL-0326] Random improver cost string is (a).
37-
[INFO DPL-0332] End of pass, Generator displacement called 100 times.
38-
[INFO DPL-0335] Generator displacement, Cumulative attempts 100, swaps 2, moves 93 since last reset.
37+
[INFO DPL-0332] End of pass, Generator random called 100 times.
38+
[INFO DPL-0335] Generator random, Cumulative attempts 100, swaps 2, moves 93 since last reset.
3939
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.272900e+05, Scratch cost 1.166500e+05, Incremental cost 1.166500e+05, Mismatch? N
4040
[INFO DPL-0338] End of pass, Total cost is 1.166500e+05.
4141
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 8.36 percent.
42-
[INFO DPL-0332] End of pass, Generator displacement called 100 times.
43-
[INFO DPL-0335] Generator displacement, Cumulative attempts 200, swaps 4, moves 183 since last reset.
42+
[INFO DPL-0332] End of pass, Generator random called 100 times.
43+
[INFO DPL-0335] Generator random, Cumulative attempts 200, swaps 4, moves 183 since last reset.
4444
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.166500e+05, Scratch cost 1.166500e+05, Incremental cost 1.166500e+05, Mismatch? N
4545
[INFO DPL-0338] End of pass, Total cost is 1.166500e+05.
4646
[INFO DPL-0327] Pass 2 of random improver; improvement in cost is 0.00 percent.

‎src/dpl/test/regions2-opt.ok‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ Detailed placement improvement.
3232
[INFO DPL-0304] Pass 1 of reordering; objective is 1.272900e+05.
3333
[INFO DPL-0305] End of reordering; objective is 1.272900e+05, improvement is 0.00 percent.
3434
[INFO DPL-0303] Running algorithm for random improvement.
35-
[INFO DPL-0324] Random improver is using displacement generator.
35+
[INFO DPL-0324] Random improver is using random generator.
3636
[INFO DPL-0325] Random improver is using hpwl objective.
3737
[INFO DPL-0326] Random improver cost string is (a).
38-
[INFO DPL-0332] End of pass, Generator displacement called 80 times.
39-
[INFO DPL-0335] Generator displacement, Cumulative attempts 80, swaps 1, moves 77 since last reset.
38+
[INFO DPL-0332] End of pass, Generator random called 80 times.
39+
[INFO DPL-0335] Generator random, Cumulative attempts 80, swaps 1, moves 77 since last reset.
4040
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.272900e+05, Scratch cost 1.181700e+05, Incremental cost 1.181700e+05, Mismatch? N
4141
[INFO DPL-0338] End of pass, Total cost is 1.181700e+05.
4242
[INFO DPL-0327] Pass 1 of random improver; improvement in cost is 7.16 percent.
43-
[INFO DPL-0332] End of pass, Generator displacement called 80 times.
44-
[INFO DPL-0335] Generator displacement, Cumulative attempts 160, swaps 3, moves 150 since last reset.
43+
[INFO DPL-0332] End of pass, Generator random called 80 times.
44+
[INFO DPL-0335] Generator random, Cumulative attempts 160, swaps 3, moves 150 since last reset.
4545
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.181700e+05, Scratch cost 1.166500e+05, Incremental cost 1.166500e+05, Mismatch? N
4646
[INFO DPL-0338] End of pass, Total cost is 1.166500e+05.
4747
[INFO DPL-0327] Pass 2 of random improver; improvement in cost is 1.29 percent.
48-
[INFO DPL-0332] End of pass, Generator displacement called 80 times.
49-
[INFO DPL-0335] Generator displacement, Cumulative attempts 240, swaps 5, moves 225 since last reset.
48+
[INFO DPL-0332] End of pass, Generator random called 80 times.
49+
[INFO DPL-0335] Generator random, Cumulative attempts 240, swaps 5, moves 225 since last reset.
5050
[INFO DPL-0333] End of pass, Objective hpwl, Initial cost 1.166500e+05, Scratch cost 1.166500e+05, Incremental cost 1.166500e+05, Mismatch? N
5151
[INFO DPL-0338] End of pass, Total cost is 1.166500e+05.
5252
[INFO DPL-0327] Pass 3 of random improver; improvement in cost is 0.00 percent.

0 commit comments

Comments
 (0)