Skip to content

Commit c63828d

Browse files
committed
mpl: update regression tests
Signed-off-by: João Mai <[email protected]>
1 parent ab58031 commit c63828d

15 files changed

+40
-40
lines changed

src/mpl/test/boundary_push1.defok

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
183183
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
184184
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
185185
COMPONENTS 4 ;
186-
- MACRO_1 HM_100x100_1x1 + FIXED ( 600 610 ) FS ;
187-
- MACRO_2 HM_100x100_1x1 + FIXED ( 600 241970 ) FS ;
188-
- MACRO_3 HM_100x100_1x1 + FIXED ( 239440 241970 ) FS ;
189-
- MACRO_4 HM_100x100_1x1 + FIXED ( 239440 610 ) FS ;
186+
- MACRO_1 HM_100x100_1x1 + FIXED ( 600 610 ) S ;
187+
- MACRO_2 HM_100x100_1x1 + FIXED ( 600 241970 ) S ;
188+
- MACRO_3 HM_100x100_1x1 + FIXED ( 239440 241970 ) S ;
189+
- MACRO_4 HM_100x100_1x1 + FIXED ( 239440 610 ) S ;
190190
END COMPONENTS
191191
PINS 4 ;
192192
- io_1 + NET io_1 + DIRECTION INPUT + USE SIGNAL ;

src/mpl/test/boundary_push2.defok

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
184184
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
185185
COMPONENTS 54 ;
186186
- MACRO_1 HM_100x100_1x1 + FIXED ( 600 20770 ) S ;
187-
- MACRO_2 HM_100x100_1x1 + FIXED ( 239440 221810 ) FS ;
188-
- MACRO_3 HM_100x100_1x1 + FIXED ( 600 221810 ) FS ;
189-
- MACRO_4 HM_100x100_1x1 + FIXED ( 239440 20770 ) FS ;
187+
- MACRO_2 HM_100x100_1x1 + FIXED ( 239440 221810 ) S ;
188+
- MACRO_3 HM_100x100_1x1 + FIXED ( 600 221810 ) S ;
189+
- MACRO_4 HM_100x100_1x1 + FIXED ( 239440 20770 ) S ;
190190
- _001_ DFF_X1 + PLACED ( 216790 219801 ) N ;
191191
- _002_ DFF_X1 + PLACED ( 216790 219801 ) N ;
192192
- _003_ DFF_X1 + PLACED ( 216790 219801 ) N ;

src/mpl/test/boundary_push3.defok

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
184184
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
185185
COMPONENTS 54 ;
186186
- MACRO_1 HM_100x100_1x1 + FIXED ( 220620 610 ) S ;
187-
- MACRO_2 HM_100x100_1x1 + FIXED ( 19420 610 ) FS ;
188-
- MACRO_3 HM_100x100_1x1 + FIXED ( 19420 241970 ) FS ;
189-
- MACRO_4 HM_100x100_1x1 + FIXED ( 220620 241970 ) FS ;
187+
- MACRO_2 HM_100x100_1x1 + FIXED ( 19420 610 ) S ;
188+
- MACRO_3 HM_100x100_1x1 + FIXED ( 19420 241970 ) S ;
189+
- MACRO_4 HM_100x100_1x1 + FIXED ( 220620 241970 ) S ;
190190
- _001_ DFF_X1 + PLACED ( 216790 219801 ) N ;
191191
- _002_ DFF_X1 + PLACED ( 216790 219801 ) N ;
192192
- _003_ DFF_X1 + PLACED ( 216790 219801 ) N ;

src/mpl/test/centralization1.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
241241
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
242242
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
243243
COMPONENTS 1 ;
244-
- MACRO_1 HM_100x100_1x1 + FIXED ( 202100 202490 ) FS ;
244+
- MACRO_1 HM_100x100_1x1 + FIXED ( 202100 202490 ) S ;
245245
END COMPONENTS
246246
PINS 1 ;
247247
- io_1 + NET io_1 + DIRECTION INPUT + USE SIGNAL ;

src/mpl/test/clocked_macro.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
339339
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
340340
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
341341
COMPONENTS 1 ;
342-
- U1 CLOCKED_MACRO + FIXED ( 17880 16610 ) FS ;
342+
- U1 CLOCKED_MACRO + FIXED ( 17880 16610 ) S ;
343343
END COMPONENTS
344344
NETS 3 ;
345345
- clk ( U1 CK ) + USE SIGNAL ;

src/mpl/test/guides1.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
114114
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
115115
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
116116
COMPONENTS 401 ;
117-
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 8010 ) FS ;
117+
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 8010 ) S ;
118118
- _001_ DFF_X1 + PLACED ( 38680 123200 ) N ;
119119
- _002_ DFF_X1 + PLACED ( 38680 123200 ) N ;
120120
- _003_ DFF_X1 + PLACED ( 38680 123200 ) N ;

src/mpl/test/guides2.defok

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,16 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
339339
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
340340
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
341341
COMPONENTS 10 ;
342-
- U1 HM_100x400_4x4 + FIXED ( 665880 16610 ) S ;
343-
- U10 HM_100x100_1x1 + FIXED ( 17880 232430 ) FN ;
344-
- U2 HM_100x100_1x1 + FIXED ( 233880 448450 ) S ;
345-
- U3 HM_100x100_1x1 + FIXED ( 233880 664610 ) S ;
346-
- U4 HM_100x100_1x1 + FIXED ( 233880 16550 ) FN ;
347-
- U5 HM_100x100_1x1 + FIXED ( 17880 448450 ) S ;
348-
- U6 HM_100x400_4x4 + FIXED ( 449880 16590 ) N ;
349-
- U7 HM_100x100_1x1 + FIXED ( 233880 232430 ) N ;
350-
- U8 HM_100x100_1x1 + FIXED ( 17880 664610 ) S ;
351-
- U9 HM_100x100_1x1 + FIXED ( 17880 16550 ) FN ;
342+
- U1 HM_100x400_4x4 + FIXED ( 665880 16590 ) FN ;
343+
- U10 HM_100x100_1x1 + FIXED ( 17880 448450 ) S ;
344+
- U2 HM_100x100_1x1 + FIXED ( 17880 16550 ) FN ;
345+
- U3 HM_100x100_1x1 + FIXED ( 17880 664470 ) FN ;
346+
- U4 HM_100x100_1x1 + FIXED ( 233880 232430 ) FN ;
347+
- U5 HM_100x100_1x1 + FIXED ( 17880 232430 ) FN ;
348+
- U6 HM_100x400_4x4 + FIXED ( 449880 16610 ) FS ;
349+
- U7 HM_100x100_1x1 + FIXED ( 233880 16550 ) N ;
350+
- U8 HM_100x100_1x1 + FIXED ( 233880 664610 ) FS ;
351+
- U9 HM_100x100_1x1 + FIXED ( 233880 448450 ) FS ;
352352
END COMPONENTS
353353
NETS 12 ;
354354
- w1 ( U2 I1 ) ( U1 O1 ) + USE SIGNAL ;

src/mpl/test/io_constraints1.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
114114
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
115115
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
116116
COMPONENTS 401 ;
117-
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 8010 ) FS ;
117+
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 8010 ) S ;
118118
- _001_ DFF_X1 + PLACED ( 38680 123200 ) N ;
119119
- _002_ DFF_X1 + PLACED ( 38680 123200 ) N ;
120120
- _003_ DFF_X1 + PLACED ( 38680 123200 ) N ;

src/mpl/test/io_constraints10.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
114114
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
115115
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
116116
COMPONENTS 401 ;
117-
- MACRO_1 HM_100x100_1x1 + FIXED ( 8000 23970 ) FS ;
117+
- MACRO_1 HM_100x100_1x1 + FIXED ( 8000 23970 ) S ;
118118
- _001_ DFF_X1 + PLACED ( 254680 123200 ) N ;
119119
- _002_ DFF_X1 + PLACED ( 254680 123200 ) N ;
120120
- _003_ DFF_X1 + PLACED ( 254680 123200 ) N ;

src/mpl/test/io_constraints2.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
114114
TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
115115
TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
116116
COMPONENTS 401 ;
117-
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 20050 ) FS ;
117+
- MACRO_1 HM_100x100_1x1 + FIXED ( 91820 20050 ) S ;
118118
- _001_ DFF_X1 + PLACED ( 37944 123200 ) N ;
119119
- _002_ DFF_X1 + PLACED ( 37944 123200 ) N ;
120120
- _003_ DFF_X1 + PLACED ( 37944 123200 ) N ;

0 commit comments

Comments
 (0)