Skip to content

Commit 4fc5fa3

Browse files
gadfortgadfort
committed
pdn: fix working error to ensure stable ordering in write to db
Signed-off-by: Peter Gadfort <[email protected]>
1 parent d4e1785 commit 4fc5fa3

36 files changed

+1094
-1099
lines changed

‎src/pdn/src/grid_component.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ std::map<Shape*, std::vector<odb::dbBox*>> GridComponent::writeToDb(
343343
all_shapes.begin(), all_shapes.end(), [](const auto& l, const auto& r) {
344344
auto* l_layer = l->getLayer();
345345
int l_level = l_layer->getNumber();
346-
auto* r_layer = l->getLayer();
346+
auto* r_layer = r->getLayer();
347347
int r_level = r_layer->getNumber();
348348

349349
return std::tie(l_level, l->getRect())

‎src/pdn/test/BUILD‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ MANUAL_TESTS = [
139139

140140
# TODO: Enable once difference between bazel and ctest is resolved.
141141
MANUAL_FOR_BAZEL_TESTS = [
142-
"pads_black_parrot",
143-
"pads_black_parrot_flipchip",
144-
"pads_black_parrot_flipchip_connect_bumps",
145-
"pads_black_parrot_flipchip_connect_overpads",
146-
"pads_black_parrot_offset",
147142
]
148143

149144
ALL_TESTS = COMPULSORY_TESTS + MANUAL_TESTS

‎src/pdn/test/core_grid_no_trim.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,9 +820,9 @@ SPECIALNETS 2 ;
820820
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
821821
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
822822
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
823+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
823824
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
824825
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
825-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
826826
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
827827
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
828828
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -1147,9 +1147,9 @@ SPECIALNETS 2 ;
11471147
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 30800 ) ( 196500 30800 )
11481148
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 25200 ) ( 196500 25200 )
11491149
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
1150+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
11501151
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
11511152
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
1152-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
11531153
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
11541154
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
11551155
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_obstruction.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,9 @@ SPECIALNETS 2 ;
849849
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
850850
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
851851
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
852+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
852853
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
853854
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
854-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
855855
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
856856
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
857857
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -2500,9 +2500,9 @@ SPECIALNETS 2 ;
25002500
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 30800 ) ( 188500 30800 )
25012501
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 25200 ) ( 188500 25200 )
25022502
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
2503+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
25032504
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
25042505
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
2505-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
25062506
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
25072507
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
25082508
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_snap.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,9 +839,9 @@ SPECIALNETS 2 ;
839839
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
840840
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
841841
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
842+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
842843
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
843844
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
844-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
845845
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
846846
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
847847
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -2517,9 +2517,9 @@ SPECIALNETS 2 ;
25172517
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 30800 ) ( 188500 30800 )
25182518
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 25200 ) ( 188500 25200 )
25192519
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
2520+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
25202521
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
25212522
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
2522-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
25232523
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
25242524
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
25252525
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_split_cuts.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,9 +840,9 @@ SPECIALNETS 2 ;
840840
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
841841
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
842842
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
843+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
843844
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
844845
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
845-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
846846
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
847847
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
848848
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -3535,9 +3535,9 @@ SPECIALNETS 2 ;
35353535
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 30800 ) ( 188500 30800 )
35363536
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 25200 ) ( 188500 25200 )
35373537
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
3538+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
35383539
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
35393540
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
3540-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
35413541
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
35423542
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
35433543
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_start_power.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,9 +820,9 @@ SPECIALNETS 2 ;
820820
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 28000 ) ( 188500 28000 )
821821
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 22400 ) ( 188500 22400 )
822822
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
823+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
823824
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
824825
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
825-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
826826
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
827827
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
828828
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600
@@ -1147,9 +1147,9 @@ SPECIALNETS 2 ;
11471147
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 30800 ) ( 196500 30800 )
11481148
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 25200 ) ( 196500 25200 )
11491149
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
1150+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
11501151
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
11511152
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
1152-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
11531153
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
11541154
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
11551155
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_start_power_strap_ground.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,9 +825,9 @@ SPECIALNETS 2 ;
825825
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 28000 ) ( 188500 28000 )
826826
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 22400 ) ( 188500 22400 )
827827
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
828+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
828829
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
829830
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
830-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
831831
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
832832
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
833833
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600
@@ -1882,9 +1882,9 @@ SPECIALNETS 2 ;
18821882
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 30800 ) ( 196500 30800 )
18831883
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 25200 ) ( 196500 25200 )
18841884
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
1885+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
18851886
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
18861887
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
1887-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
18881888
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
18891889
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
18901890
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_strap_count.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,9 +826,9 @@ SPECIALNETS 2 ;
826826
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
827827
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
828828
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
829+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
829830
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
830831
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
831-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
832832
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
833833
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
834834
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -1333,9 +1333,9 @@ SPECIALNETS 2 ;
13331333
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 30800 ) ( 188500 30800 )
13341334
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 25200 ) ( 188500 25200 )
13351335
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
1336+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
13361337
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
13371338
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
1338-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
13391339
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
13401340
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
13411341
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

‎src/pdn/test/core_grid_via_snap.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,9 +839,9 @@ SPECIALNETS 2 ;
839839
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 28000 ) ( 196500 28000 )
840840
NEW metal1 340 + SHAPE FOLLOWPIN ( 4140 22400 ) ( 196500 22400 )
841841
NEW metal6 4000 + SHAPE RING ( 194500 6400 ) ( 194500 195200 )
842+
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
842843
NEW metal5 4000 + SHAPE RING ( 4140 193200 ) ( 196500 193200 )
843844
NEW metal5 4000 + SHAPE RING ( 4140 8400 ) ( 196500 8400 )
844-
NEW metal6 4000 + SHAPE RING ( 6140 6400 ) ( 6140 195200 )
845845
NEW metal5 0 + SHAPE RING ( 194500 193200 ) via5_6_4000_4000_7_7_600_600
846846
NEW metal5 0 + SHAPE RING ( 194500 8400 ) via5_6_4000_4000_7_7_600_600
847847
NEW metal5 0 + SHAPE RING ( 6140 193200 ) via5_6_4000_4000_7_7_600_600
@@ -2952,9 +2952,9 @@ SPECIALNETS 2 ;
29522952
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 30800 ) ( 188500 30800 )
29532953
NEW metal1 340 + SHAPE FOLLOWPIN ( 12140 25200 ) ( 188500 25200 )
29542954
NEW metal6 4000 + SHAPE RING ( 186500 14400 ) ( 186500 187200 )
2955+
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
29552956
NEW metal5 4000 + SHAPE RING ( 12140 185200 ) ( 188500 185200 )
29562957
NEW metal5 4000 + SHAPE RING ( 12140 16400 ) ( 188500 16400 )
2957-
NEW metal6 4000 + SHAPE RING ( 14140 14400 ) ( 14140 187200 )
29582958
NEW metal5 0 + SHAPE RING ( 186500 185200 ) via5_6_4000_4000_7_7_600_600
29592959
NEW metal5 0 + SHAPE RING ( 186500 16400 ) via5_6_4000_4000_7_7_600_600
29602960
NEW metal5 0 + SHAPE RING ( 14140 185200 ) via5_6_4000_4000_7_7_600_600

0 commit comments

Comments
 (0)