diff --git a/src/db/db/dbNetShape.cc b/src/db/db/dbNetShape.cc index 161f1b9e0..4c20d296a 100644 --- a/src/db/db/dbNetShape.cc +++ b/src/db/db/dbNetShape.cc @@ -134,7 +134,7 @@ bool NetShape::interacts_with (const db::NetShape &other) const // Polygon vs. polygon db::PolygonRef pr_other = other.polygon_ref (); db::PolygonRef pr = polygon_ref (); - db::Polygon p = pr_other.obj ().transformed (pr.trans ().inverted () * pr_other.trans ()); + db::Polygon p = pr_other.obj ().transformed (pr.trans ().inverted () * pr_other.trans (), false); return db::interact_pp (pr.obj (), p); } else { diff --git a/src/drc/drc/built-in-macros/_drc_engine.rb b/src/drc/drc/built-in-macros/_drc_engine.rb index 3600355ca..560b45c82 100644 --- a/src/drc/drc/built-in-macros/_drc_engine.rb +++ b/src/drc/drc/built-in-macros/_drc_engine.rb @@ -2682,7 +2682,7 @@ CODE # TODO: align with LayoutToNetlist by using a "master" L2N # object which keeps the DSS. @dss.text_property_name = "LABEL" - @dss.text_enlargement = 1 + @dss.text_enlargement = 0 @dss.reject_odd_polygons = @deep_reject_odd_polygons @dss.max_vertex_count = @max_vertex_count @dss.max_area_ratio = @max_area_ratio diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc index 23091b46c..eed4957f8 100644 --- a/src/drc/unit_tests/drcSimpleTests.cc +++ b/src/drc/unit_tests/drcSimpleTests.cc @@ -1312,3 +1312,9 @@ TEST(53_cellWiseExtentWithClip) { run_test (_this, "53", false); } + +TEST(54_issue1011) +{ + run_test (_this, "54", false); +} + diff --git a/src/lvs/unit_tests/lvsTests.cc b/src/lvs/unit_tests/lvsTests.cc index aecfa796d..4dfdde11b 100644 --- a/src/lvs/unit_tests/lvsTests.cc +++ b/src/lvs/unit_tests/lvsTests.cc @@ -152,7 +152,7 @@ TEST(16_private) TEST(17_private) { test_is_long_runner (); - run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b.lvsdb"); + run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_2.lvsdb"); } TEST(18_private) @@ -170,7 +170,7 @@ TEST(19_private) TEST(20_private) { // test_is_long_runner (); - run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20b.lvsdb"); + run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20b_2.lvsdb"); } TEST(21_private) diff --git a/testdata/drc/drcSimpleTests_54.drc b/testdata/drc/drcSimpleTests_54.drc new file mode 100644 index 000000000..ae26b63fa --- /dev/null +++ b/testdata/drc/drcSimpleTests_54.drc @@ -0,0 +1,18 @@ +source $drc_test_source +target $drc_test_target + +deep + +layer = input(1) +layer.output(1, 0) + +layer.width(0.5.micron).output(100,0) + +t = layer.texts("*", as_boxes) +t.output(101, 0) + +layer2 = labels(1) +layer2.output(102, 0) +t = layer2.texts("*", as_boxes) +t.output(103, 0) + diff --git a/testdata/drc/drcSimpleTests_54.gds b/testdata/drc/drcSimpleTests_54.gds new file mode 100644 index 000000000..5cd83d002 Binary files /dev/null and b/testdata/drc/drcSimpleTests_54.gds differ diff --git a/testdata/drc/drcSimpleTests_au54.gds b/testdata/drc/drcSimpleTests_au54.gds new file mode 100644 index 000000000..6a3116281 Binary files /dev/null and b/testdata/drc/drcSimpleTests_au54.gds differ diff --git a/testdata/lvs/bbdevices1.lvsdb b/testdata/lvs/bbdevices1.lvsdb index cb3ae8cc0..27cd08e35 100644 --- a/testdata/lvs/bbdevices1.lvsdb +++ b/testdata/lvs/bbdevices1.lvsdb @@ -49,19 +49,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (832000 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (576500 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (754499 -114001) (2 2)) + rect(l15 (754500 -114000) (0 0)) ) # Outgoing pins and their connections to nets @@ -71,19 +71,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -93,19 +93,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -115,19 +115,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -142,11 +142,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -162,11 +162,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -182,11 +182,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets diff --git a/testdata/lvs/bbdevices1b.lvsdb b/testdata/lvs/bbdevices1b.lvsdb index 30d688cef..0be76fb34 100644 --- a/testdata/lvs/bbdevices1b.lvsdb +++ b/testdata/lvs/bbdevices1b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -58,7 +58,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -67,7 +67,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -76,7 +76,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(A)) diff --git a/testdata/lvs/bbdevices2.lvsdb b/testdata/lvs/bbdevices2.lvsdb index 5a782379a..c9372a16f 100644 --- a/testdata/lvs/bbdevices2.lvsdb +++ b/testdata/lvs/bbdevices2.lvsdb @@ -49,19 +49,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (832000 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (576500 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (754499 -114001) (2 2)) + rect(l15 (754500 -114000) (0 0)) ) # Outgoing pins and their connections to nets @@ -72,19 +72,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -95,19 +95,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -118,19 +118,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -146,11 +146,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -166,11 +166,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -186,11 +186,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets diff --git a/testdata/lvs/bbdevices2b.lvsdb b/testdata/lvs/bbdevices2b.lvsdb index 5e44f84c1..2ff9faa34 100644 --- a/testdata/lvs/bbdevices2b.lvsdb +++ b/testdata/lvs/bbdevices2b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -59,7 +59,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -69,7 +69,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -79,7 +79,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(B)) diff --git a/testdata/lvs/bbdevices3.lvsdb b/testdata/lvs/bbdevices3.lvsdb index e870f11be..fb30c8ab9 100644 --- a/testdata/lvs/bbdevices3.lvsdb +++ b/testdata/lvs/bbdevices3.lvsdb @@ -49,19 +49,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (586500 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (830000 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (757499 -114001) (2 2)) + rect(l15 (757500 -114000) (0 0)) ) # Outgoing pins and their connections to nets @@ -71,19 +71,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -93,19 +93,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -115,19 +115,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -142,11 +142,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -162,11 +162,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -182,11 +182,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets diff --git a/testdata/lvs/bbdevices3b.lvsdb b/testdata/lvs/bbdevices3b.lvsdb index bae0d36a5..9aecb5013 100644 --- a/testdata/lvs/bbdevices3b.lvsdb +++ b/testdata/lvs/bbdevices3b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -58,7 +58,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -67,7 +67,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -76,7 +76,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(A)) diff --git a/testdata/lvs/bbdevices4.lvsdb b/testdata/lvs/bbdevices4.lvsdb index 47cbefd91..5a9aa2c04 100644 --- a/testdata/lvs/bbdevices4.lvsdb +++ b/testdata/lvs/bbdevices4.lvsdb @@ -49,19 +49,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -71,19 +71,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -93,19 +93,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -120,11 +120,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -140,11 +140,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -160,11 +160,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets @@ -175,19 +175,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (832000 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (576500 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (754499 -114001) (2 2)) + rect(l15 (754500 -114000) (0 0)) ) ) diff --git a/testdata/lvs/bbdevices4b.lvsdb b/testdata/lvs/bbdevices4b.lvsdb index e26fe15c3..7ee00acb8 100644 --- a/testdata/lvs/bbdevices4b.lvsdb +++ b/testdata/lvs/bbdevices4b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -58,7 +58,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -67,7 +67,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -106,7 +106,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) ) circuit(testall diff --git a/testdata/lvs/bbdevices5.lvsdb b/testdata/lvs/bbdevices5.lvsdb index cf5b49052..8acdab170 100644 --- a/testdata/lvs/bbdevices5.lvsdb +++ b/testdata/lvs/bbdevices5.lvsdb @@ -49,19 +49,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (832000 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (576500 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (754499 -114001) (2 2)) + rect(l15 (754500 -114000) (0 0)) ) # Outgoing pins and their connections to nets @@ -71,19 +71,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -93,19 +93,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -115,19 +115,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -142,11 +142,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -162,11 +162,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -182,11 +182,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets diff --git a/testdata/lvs/bbdevices5b.lvsdb b/testdata/lvs/bbdevices5b.lvsdb index 624a9a521..cb9e6fb77 100644 --- a/testdata/lvs/bbdevices5b.lvsdb +++ b/testdata/lvs/bbdevices5b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -58,7 +58,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -67,7 +67,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -76,7 +76,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(A)) diff --git a/testdata/lvs/bbdevices6.lvsdb b/testdata/lvs/bbdevices6.lvsdb index 09a133d7a..28492175b 100644 --- a/testdata/lvs/bbdevices6.lvsdb +++ b/testdata/lvs/bbdevices6.lvsdb @@ -49,19 +49,19 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Nets with their geometries net(1 name(B) rect(l15 (832000 -242000) (93500 75500)) - rect(l15 (-46751 -37751) (2 2)) + rect(l15 (-46750 -37750) (0 0)) ) net(2 name(A) rect(l15 (576500 -249000) (105500 81500)) - rect(l15 (-52751 -40751) (2 2)) + rect(l15 (-52750 -40750) (0 0)) ) net(3 name(BWBTEST) - rect(l15 (754499 -114001) (2 2)) + rect(l15 (754500 -114000) (0 0)) ) # Outgoing pins and their connections to nets @@ -71,19 +71,19 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Nets with their geometries net(1 name(B) rect(l3 (793500 427000) (120500 82000)) - rect(l3 (-60251 -41001) (2 2)) + rect(l3 (-60250 -41000) (0 0)) ) net(2 name(A) rect(l3 (572500 432500) (74500 73500)) - rect(l3 (-37251 -36751) (2 2)) + rect(l3 (-37250 -36750) (0 0)) ) net(3 name(FWBTEST) - rect(l3 (797999 565499) (2 2)) + rect(l3 (798000 565500) (0 0)) ) # Outgoing pins and their connections to nets @@ -93,19 +93,19 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Nets with their geometries net(1 name(B) rect(l3 (-221000 412500) (162000 152500)) - rect(l3 (-81001 -76251) (2 2)) + rect(l3 (-81000 -76250) (0 0)) ) net(2 name(A) rect(l3 (-449500 422500) (146000 144500)) - rect(l3 (-71001 -71251) (2 2)) + rect(l3 (-71000 -71250) (0 0)) ) net(3 name(FBGATEST) - rect(l3 (-417001 610499) (2 2)) + rect(l3 (-417000 610500) (0 0)) ) # Outgoing pins and their connections to nets @@ -115,19 +115,19 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Nets with their geometries net(1 name(B) rect(l15 (-468000 -280000) (177000 189000)) - rect(l15 (-88501 -94501) (2 2)) + rect(l15 (-88500 -94500) (0 0)) ) net(2 name(A) rect(l15 (-218500 -290000) (193000 203000)) - rect(l15 (-94001 -101501) (2 2)) + rect(l15 (-94000 -101500) (0 0)) ) net(3 name(BBGATEST) - rect(l15 (-422001 -313001) (2 2)) + rect(l15 (-422000 -313000) (0 0)) ) # Outgoing pins and their connections to nets @@ -142,11 +142,11 @@ layout( # Nets with their geometries net(1 name(A) rect(l16 (317000 -232000) (92000 92000)) - rect(l16 (-46001 -46001) (2 2)) + rect(l16 (-46000 -46000) (0 0)) ) net(2 name(B) rect(l16 (95500 -231000) (116000 97000)) - rect(l16 (-58001 -48501) (2 2)) + rect(l16 (-58000 -48500) (0 0)) ) # Outgoing pins and their connections to nets @@ -162,11 +162,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l11 (323000 151500) (76000 83000)) - rect(l11 (-38001 -41501) (2 2)) + rect(l11 (-38000 -41500) (0 0)) ) net(2 name(A) rect(l11 (96500 159500) (90000 73000)) - rect(l11 (-45001 -36501) (2 2)) + rect(l11 (-45000 -36500) (0 0)) ) # Outgoing pins and their connections to nets @@ -182,11 +182,11 @@ layout( # Nets with their geometries net(1 name(B) rect(l1 (327000 436500) (72000 93000)) - rect(l1 (-36001 -46501) (2 2)) + rect(l1 (-36000 -46500) (0 0)) ) net(2 name(A) rect(l1 (101500 443500) (82000 84000)) - rect(l1 (-41001 -42001) (2 2)) + rect(l1 (-41000 -42000) (0 0)) ) # Outgoing pins and their connections to nets diff --git a/testdata/lvs/bbdevices6b.lvsdb b/testdata/lvs/bbdevices6b.lvsdb index 71432c4f9..cf9afeb29 100644 --- a/testdata/lvs/bbdevices6b.lvsdb +++ b/testdata/lvs/bbdevices6b.lvsdb @@ -49,7 +49,7 @@ layout( circuit(BWBTEST # Circuit boundary - rect((554500 -276000) (403000 162001)) + rect((554500 -276000) (403000 162000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -58,7 +58,7 @@ layout( circuit(FWBTEST # Circuit boundary - rect((536500 386500) (404000 179001)) + rect((536500 386500) (404000 179000)) # Outgoing pins and their connections to nets pin(name(A)) @@ -67,7 +67,7 @@ layout( circuit(FBGATEST # Circuit boundary - rect((-449500 412500) (390500 198001)) + rect((-449500 412500) (390500 198000)) # Outgoing pins and their connections to nets pin(name(B)) @@ -76,7 +76,7 @@ layout( circuit(BBGATEST # Circuit boundary - rect((-468000 -313001) (442500 226001)) + rect((-468000 -313000) (442500 226000)) # Outgoing pins and their connections to nets pin(name(A)) diff --git a/testdata/lvs/blackbox1.lvsdb b/testdata/lvs/blackbox1.lvsdb index a9012c999..7005d4f01 100644 --- a/testdata/lvs/blackbox1.lvsdb +++ b/testdata/lvs/blackbox1.lvsdb @@ -49,57 +49,57 @@ layout( rect(l1 (-7500 0) (1000 4000)) rect(l1 (-6000 0) (6000 1000)) rect(l1 (-9000 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -5501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -5500) (1000 1000)) ) net(2 name('4') rect(l1 (1000 2000) (1000 10000)) rect(l1 (-17500 0) (17500 1000)) rect(l1 (-20500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (17499 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (17500 -10500) (1000 1000)) ) net(3 name('2') rect(l1 (-15500 -2000) (12500 1000)) rect(l1 (-15500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -500) (1000 1000)) ) net(4 name('1') rect(l1 (-15500 -13000) (6000 1000)) rect(l1 (-1000 0) (1000 6000)) rect(l1 (-9000 -8000) (3500 3000)) rect(l1 (4500 5000) (7500 1000)) - rect(l1 (-13501 -7501) (2 2)) - rect(l2 (12499 6499) (1000 1000)) + rect(l1 (-13500 -7500) (0 0)) + rect(l2 (12500 6500) (1000 1000)) ) net(5 name('8') rect(l1 (1000 -13000) (22000 1000)) rect(l1 (-22000 0) (1000 7000)) rect(l1 (20500 -9000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-23501 6499) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-23500 6500) (1000 1000)) ) net(6 name('7') rect(l1 (6000 -6000) (7000 1000)) rect(l1 (-1000 0) (1000 12000)) rect(l1 (-1000 0) (11000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-18501 -13501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-18500 -13500) (1000 1000)) ) net(7 name('5') rect(l1 (6000 2000) (1000 10000)) rect(l1 (-1000 0) (17000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-18501 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-18500 -10500) (1000 1000)) ) net(8 name('6') rect(l1 (16000 -2000) (7000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-18501 -501) (3500 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (-18500 -500) (3500 1000)) rect(l3 (6500 -1000) (1000 1000)) rect(l3 (-8500 -1000) (1000 1000)) rect(l4 (-1000 -1000) (8500 1000)) diff --git a/testdata/lvs/blackbox2.lvsdb b/testdata/lvs/blackbox2.lvsdb index 4fa169913..733ee3295 100644 --- a/testdata/lvs/blackbox2.lvsdb +++ b/testdata/lvs/blackbox2.lvsdb @@ -49,57 +49,57 @@ layout( rect(l1 (-7500 0) (1000 4000)) rect(l1 (-6000 0) (6000 1000)) rect(l1 (-9000 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -5501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -5500) (1000 1000)) ) net(2 name('3') rect(l1 (1000 2000) (1000 10000)) rect(l1 (-17500 0) (17500 1000)) rect(l1 (-20500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (17499 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (17500 -10500) (1000 1000)) ) net(3 name('2') rect(l1 (-15500 -2000) (12500 1000)) rect(l1 (-15500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -500) (1000 1000)) ) net(4 name('1') rect(l1 (-15500 -13000) (6000 1000)) rect(l1 (-1000 0) (1000 6000)) rect(l1 (-9000 -8000) (3500 3000)) rect(l1 (4500 5000) (7500 1000)) - rect(l1 (-13501 -7501) (2 2)) - rect(l2 (12499 6499) (1000 1000)) + rect(l1 (-13500 -7500) (0 0)) + rect(l2 (12500 6500) (1000 1000)) ) net(5 name('8') rect(l1 (1000 -13000) (22000 1000)) rect(l1 (-22000 0) (1000 7000)) rect(l1 (20500 -9000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-23501 6499) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-23500 6500) (1000 1000)) ) net(6 name('7') rect(l1 (6000 -6000) (7000 1000)) rect(l1 (-1000 0) (1000 12000)) rect(l1 (-1000 0) (11000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-18501 -13501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-18500 -13500) (1000 1000)) ) net(7 name('5') rect(l1 (6000 2000) (1000 10000)) rect(l1 (-1000 0) (17000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-18501 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-18500 -10500) (1000 1000)) ) net(8 name('6') rect(l1 (16000 -2000) (7000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-18501 -501) (3500 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (-18500 -500) (3500 1000)) rect(l3 (6500 -1000) (1000 1000)) rect(l3 (-8500 -1000) (1000 1000)) rect(l4 (-1000 -1000) (8500 1000)) diff --git a/testdata/lvs/blackbox3.lvsdb b/testdata/lvs/blackbox3.lvsdb index 1dd6f3942..953dea630 100644 --- a/testdata/lvs/blackbox3.lvsdb +++ b/testdata/lvs/blackbox3.lvsdb @@ -55,49 +55,49 @@ layout( rect(l1 (-7500 0) (1000 4000)) rect(l1 (-6000 0) (6000 1000)) rect(l1 (-9000 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -5501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -5500) (1000 1000)) ) net(3 name('4') rect(l1 (1000 2000) (1000 10000)) rect(l1 (-17500 0) (17500 1000)) rect(l1 (-20500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (17499 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (17500 -10500) (1000 1000)) ) net(4 name('2') rect(l1 (-15500 -2000) (12500 1000)) rect(l1 (-15500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -500) (1000 1000)) ) net(5 name('1') rect(l1 (-15500 -13000) (6000 1000)) rect(l1 (-1000 0) (1000 6000)) rect(l1 (-9000 -8000) (3500 3000)) rect(l1 (4500 5000) (7500 1000)) - rect(l1 (-13501 -7501) (2 2)) - rect(l2 (12499 6499) (1000 1000)) + rect(l1 (-13500 -7500) (0 0)) + rect(l2 (12500 6500) (1000 1000)) ) net(6 name('8') rect(l1 (1000 -13000) (22000 1000)) rect(l1 (-22000 0) (1000 7000)) rect(l1 (20500 -9000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-23501 6499) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-23500 6500) (1000 1000)) ) net(7 name('5') rect(l1 (6000 2000) (1000 10000)) rect(l1 (-1000 0) (17000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-18501 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-18500 -10500) (1000 1000)) ) net(8 name('6') rect(l1 (16000 -2000) (7000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-18501 -501) (3500 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (-18500 -500) (3500 1000)) rect(l3 (6500 -1000) (1000 1000)) rect(l3 (-8500 -1000) (1000 1000)) rect(l4 (-1000 -1000) (8500 1000)) @@ -106,7 +106,7 @@ layout( net(9 name('7') rect(l1 (18080 7000) (4920 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) + rect(l1 (-1500 -1500) (0 0)) ) # Subcircuits and their connections diff --git a/testdata/lvs/blackbox4.lvsdb b/testdata/lvs/blackbox4.lvsdb index fb865f98d..f36d797c6 100644 --- a/testdata/lvs/blackbox4.lvsdb +++ b/testdata/lvs/blackbox4.lvsdb @@ -49,36 +49,36 @@ layout( rect(l1 (-7500 0) (1000 4000)) rect(l1 (-6000 0) (6000 1000)) rect(l1 (-9000 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -5501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -5500) (1000 1000)) ) net(2 name('4') rect(l1 (1000 2000) (1000 10000)) rect(l1 (-17500 0) (17500 1000)) rect(l1 (-20500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (17499 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (17500 -10500) (1000 1000)) ) net(3 name('2') rect(l1 (-15500 -2000) (12500 1000)) rect(l1 (-15500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -500) (1000 1000)) ) net(4 name('1') rect(l1 (-15500 -13000) (6000 1000)) rect(l1 (-1000 0) (1000 6000)) rect(l1 (-9000 -8000) (3500 3000)) rect(l1 (4500 5000) (7500 1000)) - rect(l1 (-13501 -7501) (2 2)) - rect(l2 (12499 6499) (1000 1000)) + rect(l1 (-13500 -7500) (0 0)) + rect(l2 (12500 6500) (1000 1000)) ) net(5 name('8') rect(l1 (1000 -13000) (22000 1000)) rect(l1 (-22000 0) (1000 7000)) rect(l1 (20500 -9000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-23501 6499) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-23500 6500) (1000 1000)) ) net(6 name('5,7') rect(l1 (6000 -6000) (7000 1000)) @@ -89,16 +89,16 @@ layout( rect(l1 (-8590 -10000) (1000 10000)) rect(l1 (-1000 0) (17000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -6501) (2 2)) - rect(l1 (-2 4998) (2 2)) - rect(l2 (-18501 -18501) (1000 1000)) + rect(l1 (-1500 -6500) (0 0)) + rect(l1 (0 5000) (0 0)) + rect(l2 (-18500 -18500) (1000 1000)) rect(l2 (-1000 7000) (1000 1000)) ) net(7 name('6') rect(l1 (16000 -2000) (7000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-18501 -501) (3500 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (-18500 -500) (3500 1000)) rect(l3 (6500 -1000) (1000 1000)) rect(l3 (-8500 -1000) (1000 1000)) rect(l4 (-1000 -1000) (8500 1000)) diff --git a/testdata/lvs/blackbox5.lvsdb b/testdata/lvs/blackbox5.lvsdb index 3c2726f5a..0969f0954 100644 --- a/testdata/lvs/blackbox5.lvsdb +++ b/testdata/lvs/blackbox5.lvsdb @@ -55,36 +55,36 @@ layout( rect(l1 (-7500 0) (1000 4000)) rect(l1 (-6000 0) (6000 1000)) rect(l1 (-9000 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -5501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -5500) (1000 1000)) ) net(3 name('4') rect(l1 (1000 2000) (1000 10000)) rect(l1 (-17500 0) (17500 1000)) rect(l1 (-20500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (17499 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (17500 -10500) (1000 1000)) ) net(4 name('2') rect(l1 (-15500 -2000) (12500 1000)) rect(l1 (-15500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (12499 -501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (12500 -500) (1000 1000)) ) net(5 name('1') rect(l1 (-15500 -13000) (6000 1000)) rect(l1 (-1000 0) (1000 6000)) rect(l1 (-9000 -8000) (3500 3000)) rect(l1 (4500 5000) (7500 1000)) - rect(l1 (-13501 -7501) (2 2)) - rect(l2 (12499 6499) (1000 1000)) + rect(l1 (-13500 -7500) (0 0)) + rect(l2 (12500 6500) (1000 1000)) ) net(6 name('8') rect(l1 (1000 -13000) (22000 1000)) rect(l1 (-22000 0) (1000 7000)) rect(l1 (20500 -9000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l2 (-23501 6499) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l2 (-23500 6500) (1000 1000)) ) net(7 name('5,7') rect(l1 (6000 2000) (1000 10000)) @@ -93,15 +93,15 @@ layout( rect(l1 (-6960 -6450) (700 4950)) rect(l1 (-2270 -5500) (5530 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-2 4998) (2 2)) - rect(l2 (-18501 -10501) (1000 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (0 5000) (0 0)) + rect(l2 (-18500 -10500) (1000 1000)) ) net(8 name('6') rect(l1 (16000 -2000) (7000 1000)) rect(l1 (-500 -2000) (3500 3000)) - rect(l1 (-1501 -1501) (2 2)) - rect(l1 (-18501 -501) (3500 1000)) + rect(l1 (-1500 -1500) (0 0)) + rect(l1 (-18500 -500) (3500 1000)) rect(l3 (6500 -1000) (1000 1000)) rect(l3 (-8500 -1000) (1000 1000)) rect(l4 (-1000 -1000) (8500 1000)) diff --git a/testdata/lvs/double_height.lvsdb b/testdata/lvs/double_height.lvsdb index 7a1634dd0..2ad29707b 100644 --- a/testdata/lvs/double_height.lvsdb +++ b/testdata/lvs/double_height.lvsdb @@ -120,23 +120,23 @@ J( R((0 0) (3000 9200)) N(1 I(VDD) R(l10 (0 3150) (3000 2900)) - R(l13 (-1891 -1451) (2 2)) + R(l13 (-1890 -1450) (0 0)) ) N(2 I(A1) - R(l11 (1479 7109) (2 2)) + R(l11 (1480 7110) (0 0)) ) N(3 I(A2) - R(l11 (1519 1949) (2 2)) + R(l11 (1520 1950) (0 0)) ) N(4 I(Q1) - R(l12 (1919 7069) (2 2)) + R(l12 (1920 7070) (0 0)) ) N(5 I(Q2) - R(l12 (1939 1949) (2 2)) + R(l12 (1940 1950) (0 0)) ) N(6 I(VSS) - R(l13 (2679 8389) (2 2)) - R(l13 (-32 -7642) (2 2)) + R(l13 (2680 8390) (0 0)) + R(l13 (-30 -7640) (0 0)) ) P(1 I(VDD)) P(2 I(A1)) @@ -168,20 +168,20 @@ J( ) N(2 I(IN) R(l3 (-90 6850) (1590 650)) - R(l11 (-701 -351) (2 2)) + R(l11 (-700 -350) (0 0)) ) N(3 I(OUT) R(l8 (-90 1720) (1890 470)) - R(l12 (-1171 -231) (2 2)) + R(l12 (-1170 -230) (0 0)) ) N(4 I(VSS) R(l10 (3000 655) (1385 250)) R(l10 (-250 0) (250 7220)) R(l10 (-1385 0) (1385 250)) - R(l13 (-686 -126) (2 2)) + R(l13 (-685 -125) (0 0)) ) N(5 I(VDD) - R(l13 (2299 4599) (2 2)) + R(l13 (2300 4600) (0 0)) ) P(2 I(IN)) P(3 I(OUT)) diff --git a/testdata/lvs/double_height2.lvsdb b/testdata/lvs/double_height2.lvsdb index 6922163e3..3fa095fe8 100644 --- a/testdata/lvs/double_height2.lvsdb +++ b/testdata/lvs/double_height2.lvsdb @@ -119,24 +119,24 @@ J( X(INV2 R((0 0) (3000 9200)) N(1 I(A1) - R(l11 (1479 7109) (2 2)) + R(l11 (1480 7110) (0 0)) ) N(2 I(A2) - R(l11 (1519 1949) (2 2)) + R(l11 (1520 1950) (0 0)) ) N(3 I(Q1) - R(l12 (1919 7069) (2 2)) + R(l12 (1920 7070) (0 0)) ) N(4 I(Q2) - R(l12 (1939 1949) (2 2)) + R(l12 (1940 1950) (0 0)) ) N(5 I(R) - R(l13 (2719 5559) (2 2)) - R(l13 (-92 -1942) (2 2)) + R(l13 (2720 5560) (0 0)) + R(l13 (-90 -1940) (0 0)) ) N(6 I(VSS) - R(l13 (2679 8389) (2 2)) - R(l13 (-32 -7642) (2 2)) + R(l13 (2680 8390) (0 0)) + R(l13 (-30 -7640) (0 0)) ) P(1 I(A1)) P(2 I(A2)) @@ -161,24 +161,24 @@ J( R((-90 0) (3090 9200)) N(1 I(ANY) R(l3 (-90 6850) (1590 650)) - R(l11 (-701 -351) (2 2)) + R(l11 (-700 -350) (0 0)) ) N(2 I(R) - R(l11 (1479 2369) (2 2)) - R(l8 (439 4579) (690 510)) - R(l12 (-301 -291) (2 2)) + R(l11 (1480 2370) (0 0)) + R(l8 (440 4580) (690 510)) + R(l12 (-300 -290) (0 0)) ) N(3 I(ANY) R(l8 (-90 1720) (1890 470)) - R(l12 (-1171 -231) (2 2)) + R(l12 (-1170 -230) (0 0)) ) N(4 I(PWR) - R(l13 (299 5549) (2 2)) - R(l13 (-12 -1992) (2 2)) + R(l13 (300 5550) (0 0)) + R(l13 (-10 -1990) (0 0)) ) N(5 I(GND) - R(l13 (319 8399) (2 2)) - R(l13 (-52 -7602) (2 2)) + R(l13 (320 8400) (0 0)) + R(l13 (-50 -7600) (0 0)) ) P(1 I(ANY)) P(2 I(R)) diff --git a/testdata/lvs/floating.lvsdb b/testdata/lvs/floating.lvsdb index 29042b22a..ee3408fed 100644 --- a/testdata/lvs/floating.lvsdb +++ b/testdata/lvs/floating.lvsdb @@ -88,8 +88,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(2 name(VDD) @@ -101,8 +101,8 @@ layout( rect(l11 (-590 1460) (1800 800)) rect(l11 (-1050 -550) (300 300)) rect(l11 (-700 -850) (300 300)) - rect(l11 (299 499) (2 2)) - rect(l11 (-601 -2201) (300 1400)) + rect(l11 (300 500) (0 0)) + rect(l11 (-600 -2200) (300 1400)) rect(l2 (-350 -1450) (425 1500)) rect(l9 (-75 450) (500 500)) ) @@ -113,8 +113,8 @@ layout( rect(l4 (-250 1940) (250 2000)) rect(l4 (-250 -2000) (250 2000)) rect(l8 (-465 -3790) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(4 name(VSS) rect(l8 (810 710) (180 180)) @@ -122,8 +122,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-590 -2100) (1800 800)) rect(l11 (-1050 -550) (300 300)) - rect(l11 (-101 -151) (2 2)) - rect(l11 (-601 399) (300 1360)) + rect(l11 (-100 -150) (0 0)) + rect(l11 (-600 400) (300 1360)) rect(l6 (-350 -900) (425 950)) rect(l10 (-75 -2010) (500 400)) ) @@ -170,22 +170,22 @@ layout( # Nets with their geometries net(1 name('A<1>') - rect(l11 (599 3099) (2 2)) + rect(l11 (600 3100) (0 0)) ) net(2 name('A<2>') - rect(l11 (2399 3099) (2 2)) + rect(l11 (2400 3100) (0 0)) ) net(3 name('B<2>') - rect(l11 (2999 3999) (2 2)) + rect(l11 (3000 4000) (0 0)) ) net(4 name('B<1>') - rect(l11 (1199 3999) (2 2)) + rect(l11 (1200 4000) (0 0)) ) net(5 name(VDD) - rect(l11 (1799 7199) (2 2)) + rect(l11 (1800 7200) (0 0)) ) net(6 name(VSS) - rect(l11 (1799 799) (2 2)) + rect(l11 (1800 800) (0 0)) ) # Outgoing pins and their connections to nets @@ -220,10 +220,10 @@ layout( rect(l11 (3100 2950) (950 300)) ) net(2 name(A) - rect(l11 (599 3099) (2 2)) + rect(l11 (600 3100) (0 0)) ) net(3 name(C) - rect(l11 (2399 3099) (2 2)) + rect(l11 (2400 3100) (0 0)) ) net(4 name(SUBSTRATE)) net(5) diff --git a/testdata/lvs/invchain_cheat.lvsdb b/testdata/lvs/invchain_cheat.lvsdb index 67ff6bc68..f4ba78725 100644 --- a/testdata/lvs/invchain_cheat.lvsdb +++ b/testdata/lvs/invchain_cheat.lvsdb @@ -146,22 +146,22 @@ J( X(INV3 R((0 0) (6300 4600)) N(1 I('3') - R(l11 (1509 1929) (2 2)) + R(l11 (1510 1930) (0 0)) ) N(2 I('5') - R(l11 (2319 1909) (2 2)) + R(l11 (2320 1910) (0 0)) ) N(3 I('7') - R(l11 (4829 1889) (2 2)) + R(l11 (4830 1890) (0 0)) ) N(4 I('4') - R(l12 (1089 1969) (2 2)) + R(l12 (1090 1970) (0 0)) ) N(5 I('6') - R(l12 (2679 1939) (2 2)) + R(l12 (2680 1940) (0 0)) ) N(6 I('8') - R(l12 (4409 1919) (2 2)) + R(l12 (4410 1920) (0 0)) ) N(7) N(8) @@ -196,7 +196,7 @@ J( R((-1500 -800) (10400 4600)) N(1 I(IN) R(l3 (-1295 925) (1235 350)) - R(l11 (-911 -151) (2 2)) + R(l11 (-910 -150) (0 0)) ) N(2 R(l3 (445 805) (480 550)) @@ -224,17 +224,17 @@ J( R(l8 (-1065 -285) (1105 350)) ) N(7 I(OUT) - R(l12 (7789 1099) (2 2)) + R(l12 (7790 1100) (0 0)) ) N(8 I(VSS) - R(l13 (6599 -1) (2 2)) - R(l13 (-3302 -2) (2 2)) - R(l13 (-3302 -2) (2 2)) + R(l13 (6600 0) (0 0)) + R(l13 (-3300 0) (0 0)) + R(l13 (-3300 0) (0 0)) ) N(9 I(VDD) - R(l13 (3299 2799) (2 2)) - R(l13 (3298 -2) (2 2)) - R(l13 (-6602 -2) (2 2)) + R(l13 (3300 2800) (0 0)) + R(l13 (3300 0) (0 0)) + R(l13 (-6600 0) (0 0)) ) P(1 I(IN)) P(7 I(OUT)) diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.1 b/testdata/lvs/ringo_device_subcircuits.lvsdb.1 index d9f58648a..06212f154 100644 --- a/testdata/lvs/ringo_device_subcircuits.lvsdb.1 +++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.2 b/testdata/lvs/ringo_device_subcircuits.lvsdb.2 index 30f6382ed..4a2536ed7 100644 --- a/testdata/lvs/ringo_device_subcircuits.lvsdb.2 +++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_layout_var.lvsdb.1 b/testdata/lvs/ringo_layout_var.lvsdb.1 index 167b0044a..7385ada3b 100644 --- a/testdata/lvs/ringo_layout_var.lvsdb.1 +++ b/testdata/lvs/ringo_layout_var.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -368,8 +368,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -378,8 +378,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -387,8 +387,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -400,8 +400,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -485,8 +485,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -500,29 +500,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -531,15 +531,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_layout_var.lvsdb.2 b/testdata/lvs/ringo_layout_var.lvsdb.2 index d82b5247a..3264fd8a0 100644 --- a/testdata/lvs/ringo_layout_var.lvsdb.2 +++ b/testdata/lvs/ringo_layout_var.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -368,8 +368,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -378,8 +378,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -387,8 +387,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -400,8 +400,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -485,8 +485,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -500,29 +500,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -531,15 +531,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_mixed_hierarchy.lvsdb b/testdata/lvs/ringo_mixed_hierarchy.lvsdb index 9a4c2d3ef..f97da3336 100644 --- a/testdata/lvs/ringo_mixed_hierarchy.lvsdb +++ b/testdata/lvs/ringo_mixed_hierarchy.lvsdb @@ -144,8 +144,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -154,8 +154,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -163,8 +163,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -176,8 +176,8 @@ layout( rect(l4 (-250 1940) (250 2000)) rect(l4 (-250 -2000) (250 2000)) rect(l8 (-465 -3790) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -232,15 +232,15 @@ layout( rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) rect(l11 (-240 -240) (300 300)) - rect(l11 (-131 -151) (2 2)) - rect(l11 (18449 -1051) (900 300)) + rect(l11 (-130 -150) (0 0)) + rect(l11 (18450 -1050) (900 300)) rect(l11 (-1390 590) (320 320)) rect(l11 (-18460 -320) (320 320)) rect(l12 (17880 -260) (200 200)) rect(l12 (-18340 -200) (200 200)) rect(l13 (100 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (17919 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (17920 -200) (400 400)) rect(l13 (-18540 -400) (400 400)) ) net(2 name('A,ENABLE') @@ -251,11 +251,11 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l8 (-265 -3790) (180 180)) rect(l11 (-240 -240) (300 300)) - rect(l11 (-151 -151) (2 2)) - rect(l11 (-161 -161) (320 320)) + rect(l11 (-150 -150) (0 0)) + rect(l11 (-160 -160) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(3 name(VDD) rect(l3 (1700 4500) (2600 3500)) @@ -274,16 +274,16 @@ layout( rect(l8 (-180 -1280) (180 180)) rect(l11 (-21840 -1290) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l11 (-102 48) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-1150 -400) (0 0)) + rect(l11 (-100 50) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l2 (-23025 -2550) (450 1500)) rect(l9 (-2275 -450) (500 1500)) rect(l9 (22900 -1500) (500 1500)) @@ -338,8 +338,8 @@ layout( net(14 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 rect(l6 (2775 1660) (450 950)) @@ -355,16 +355,16 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-22540 -40) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l11 (-102 48) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-1150 -400) (0 0)) + rect(l11 (-100 50) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l6 (-23700 460) (425 950)) rect(l10 (-1575 -2210) (500 1500)) rect(l10 (22900 -1500) (500 1500)) diff --git a/testdata/lvs/ringo_simple.lvsdb.1 b/testdata/lvs/ringo_simple.lvsdb.1 index b4494918c..aab318d16 100644 --- a/testdata/lvs/ringo_simple.lvsdb.1 +++ b/testdata/lvs/ringo_simple.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple.lvsdb.2 b/testdata/lvs/ringo_simple.lvsdb.2 index b585c4ca4..3a8a977fb 100644 --- a/testdata/lvs/ringo_simple.lvsdb.2 +++ b/testdata/lvs/ringo_simple.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_blackboxing.lvsdb b/testdata/lvs/ringo_simple_blackboxing.lvsdb index ac20fdda6..938c32edf 100644 --- a/testdata/lvs/ringo_simple_blackboxing.lvsdb +++ b/testdata/lvs/ringo_simple_blackboxing.lvsdb @@ -111,8 +111,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -126,29 +126,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -157,15 +157,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb index ac20fdda6..938c32edf 100644 --- a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb +++ b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb @@ -111,8 +111,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -126,29 +126,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -157,15 +157,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.1 b/testdata/lvs/ringo_simple_compare2.lvsdb.1 index b4494918c..aab318d16 100644 --- a/testdata/lvs/ringo_simple_compare2.lvsdb.1 +++ b/testdata/lvs/ringo_simple_compare2.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.2 b/testdata/lvs/ringo_simple_compare2.lvsdb.2 index b585c4ca4..3a8a977fb 100644 --- a/testdata/lvs/ringo_simple_compare2.lvsdb.2 +++ b/testdata/lvs/ringo_simple_compare2.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 index fb98c1325..3a6b7972c 100644 --- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 +++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 index c9d7da964..36a0dc190 100644 --- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 +++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_dmos.lvsdb.1 b/testdata/lvs/ringo_simple_dmos.lvsdb.1 index f68490049..1c92dfcf0 100644 --- a/testdata/lvs/ringo_simple_dmos.lvsdb.1 +++ b/testdata/lvs/ringo_simple_dmos.lvsdb.1 @@ -147,8 +147,8 @@ layout( rect(l10 (-180 -730) (180 180)) rect(l13 (-240 -790) (300 1700)) rect(l13 (-1350 0) (2400 800)) - rect(l13 (-1151 -401) (2 2)) - rect(l3 (-276 -2151) (425 1500)) + rect(l13 (-1150 -400) (0 0)) + rect(l3 (-275 -2150) (425 1500)) rect(l3 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -163,8 +163,8 @@ layout( polygon(l13 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l13 (-110 1390) (300 1400)) polygon(l13 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l13 (-141 -501) (2 2)) - rect(l13 (-1751 1099) (300 1400)) + rect(l13 (-140 -500) (0 0)) + rect(l13 (-1750 1100) (300 1400)) rect(l13 (1100 -1700) (300 300)) rect(l13 (-300 0) (300 1400)) rect(l1 (-1750 -1450) (425 1500)) @@ -176,8 +176,8 @@ layout( rect(l10 (-180 370) (180 180)) rect(l13 (-240 -1300) (300 1360)) rect(l13 (-650 -2160) (2400 800)) - rect(l13 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l13 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l8 (975 1660) (425 950)) @@ -193,8 +193,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-285 1050) (180 180)) - rect(l13 (-71 -91) (2 2)) - rect(l13 (-171 -151) (300 300)) + rect(l13 (-70 -90) (0 0)) + rect(l13 (-170 -150) (300 300)) ) net(7 name(A) rect(l5 (725 2860) (250 1940)) @@ -203,8 +203,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-265 150) (180 180)) - rect(l13 (-91 -91) (2 2)) - rect(l13 (-151 -151) (300 300)) + rect(l13 (-90 -90) (0 0)) + rect(l13 (-150 -150) (300 300)) ) net(8 name(SUBSTRATE)) @@ -285,8 +285,8 @@ layout( rect(l13 (-240 -240) (300 1400)) rect(l13 (-650 300) (1800 800)) rect(l13 (-1450 -1100) (300 300)) - rect(l13 (299 399) (2 2)) - rect(l3 (-651 -2151) (425 1500)) + rect(l13 (300 400) (0 0)) + rect(l3 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l10 (1110 5160) (180 180)) @@ -295,8 +295,8 @@ layout( rect(l10 (-180 -4120) (180 180)) rect(l10 (-180 370) (180 180)) rect(l13 (-240 -790) (300 4790)) - rect(l13 (-151 -2501) (2 2)) - rect(l1 (-226 1049) (425 1500)) + rect(l13 (-150 -2500) (0 0)) + rect(l1 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -304,8 +304,8 @@ layout( rect(l10 (-180 370) (180 180)) rect(l13 (-240 -1300) (300 1360)) rect(l13 (-650 -2160) (1800 800)) - rect(l13 (-851 -401) (2 2)) - rect(l8 (-651 859) (425 950)) + rect(l13 (-850 -400) (0 0)) + rect(l8 (-650 860) (425 950)) ) net(4 rect(l4 (-100 4500) (2000 3500)) @@ -317,8 +317,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-465 150) (180 180)) - rect(l13 (-91 -91) (2 2)) - rect(l13 (-151 -151) (300 300)) + rect(l13 (-90 -90) (0 0)) + rect(l13 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -402,8 +402,8 @@ layout( rect(l14 (-18400 -260) (200 200)) rect(l14 (17940 -200) (200 200)) rect(l15 (-18040 -300) (17740 400)) - rect(l15 (-17921 -201) (2 2)) - rect(l15 (-221 -201) (400 400)) + rect(l15 (-17920 -200) (0 0)) + rect(l15 (-220 -200) (400 400)) rect(l15 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -417,29 +417,29 @@ layout( rect(l10 (23220 370) (180 180)) rect(l10 (-180 370) (180 180)) rect(l10 (-180 -1280) (180 180)) - rect(l13 (-21741 859) (2 2)) - rect(l13 (-2351 -451) (1200 800)) + rect(l13 (-21740 860) (0 0)) + rect(l13 (-2350 -450) (1200 800)) rect(l13 (-750 -1450) (300 1400)) - rect(l13 (-101 -351) (2 2)) - rect(l13 (-1251 -401) (600 800)) + rect(l13 (-100 -350) (0 0)) + rect(l13 (-1250 -400) (600 800)) rect(l13 (23400 -800) (1200 800)) rect(l13 (-750 -1450) (300 1400)) - rect(l13 (-101 -351) (2 2)) - rect(l13 (549 -401) (600 800)) + rect(l13 (-100 -350) (0 0)) + rect(l13 (550 -400) (600 800)) rect(l11 (-24850 -1500) (500 1500)) rect(l11 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l13 (23440 3840) (320 320)) rect(l14 (-260 -260) (200 200)) - rect(l15 (-101 -101) (2 2)) - rect(l15 (-201 -201) (400 400)) + rect(l15 (-100 -100) (0 0)) + rect(l15 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l13 (2440 2940) (320 320)) rect(l14 (-260 -260) (200 200)) - rect(l15 (-101 -101) (2 2)) - rect(l15 (-201 -201) (400 400)) + rect(l15 (-100 -100) (0 0)) + rect(l15 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l10 (1110 1610) (180 180)) @@ -448,15 +448,15 @@ layout( rect(l10 (23220 370) (180 180)) rect(l10 (-180 -1280) (180 180)) rect(l10 (-180 370) (180 180)) - rect(l13 (-21741 -391) (2 2)) - rect(l13 (-1901 -401) (300 1400)) + rect(l13 (-21740 -390) (0 0)) + rect(l13 (-1900 -400) (300 1400)) rect(l13 (-750 -1450) (1200 800)) - rect(l13 (-551 -401) (2 2)) - rect(l13 (-1251 -401) (600 800)) + rect(l13 (-550 -400) (0 0)) + rect(l13 (-1250 -400) (600 800)) rect(l13 (23850 -750) (300 1400)) rect(l13 (-750 -1450) (1200 800)) - rect(l13 (-551 -401) (2 2)) - rect(l13 (549 -401) (600 800)) + rect(l13 (-550 -400) (0 0)) + rect(l13 (550 -400) (600 800)) rect(l12 (-24850 -800) (500 1500)) rect(l12 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_dmos.lvsdb.2 b/testdata/lvs/ringo_simple_dmos.lvsdb.2 index bd0320264..15b294dcf 100644 --- a/testdata/lvs/ringo_simple_dmos.lvsdb.2 +++ b/testdata/lvs/ringo_simple_dmos.lvsdb.2 @@ -147,8 +147,8 @@ layout( rect(l10 (-180 -730) (180 180)) rect(l13 (-240 -790) (300 1700)) rect(l13 (-1350 0) (2400 800)) - rect(l13 (-1151 -401) (2 2)) - rect(l3 (-251 -2151) (425 1500)) + rect(l13 (-1150 -400) (0 0)) + rect(l3 (-250 -2150) (425 1500)) rect(l3 (-450 -1500) (425 1500)) ) net(2 name(OUT) @@ -163,8 +163,8 @@ layout( polygon(l13 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l13 (-110 1390) (300 1400)) polygon(l13 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l13 (-141 -501) (2 2)) - rect(l13 (-1751 1099) (300 1400)) + rect(l13 (-140 -500) (0 0)) + rect(l13 (-1750 1100) (300 1400)) rect(l13 (1100 -1700) (300 300)) rect(l13 (-300 0) (300 1400)) rect(l1 (-1750 -1450) (425 1500)) @@ -176,8 +176,8 @@ layout( rect(l10 (-180 370) (180 180)) rect(l13 (-240 -1300) (300 1360)) rect(l13 (-650 -2160) (2400 800)) - rect(l13 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l13 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l8 (1000 1660) (425 950)) @@ -193,8 +193,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-285 1050) (180 180)) - rect(l13 (-71 -91) (2 2)) - rect(l13 (-171 -151) (300 300)) + rect(l13 (-70 -90) (0 0)) + rect(l13 (-170 -150) (300 300)) ) net(7 name(A) rect(l5 (725 2860) (250 1940)) @@ -203,8 +203,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-265 150) (180 180)) - rect(l13 (-91 -91) (2 2)) - rect(l13 (-151 -151) (300 300)) + rect(l13 (-90 -90) (0 0)) + rect(l13 (-150 -150) (300 300)) ) net(8 name(SUBSTRATE)) @@ -285,8 +285,8 @@ layout( rect(l13 (-240 -240) (300 1400)) rect(l13 (-650 300) (1800 800)) rect(l13 (-1450 -1100) (300 300)) - rect(l13 (299 399) (2 2)) - rect(l3 (-651 -2151) (425 1500)) + rect(l13 (300 400) (0 0)) + rect(l3 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l10 (1110 5160) (180 180)) @@ -295,8 +295,8 @@ layout( rect(l10 (-180 -4120) (180 180)) rect(l10 (-180 370) (180 180)) rect(l13 (-240 -790) (300 4790)) - rect(l13 (-151 -2501) (2 2)) - rect(l1 (-226 1049) (425 1500)) + rect(l13 (-150 -2500) (0 0)) + rect(l1 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -304,8 +304,8 @@ layout( rect(l10 (-180 370) (180 180)) rect(l13 (-240 -1300) (300 1360)) rect(l13 (-650 -2160) (1800 800)) - rect(l13 (-851 -401) (2 2)) - rect(l8 (-651 859) (425 950)) + rect(l13 (-850 -400) (0 0)) + rect(l8 (-650 860) (425 950)) ) net(4 rect(l4 (-100 4500) (2000 3500)) @@ -317,8 +317,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l10 (-465 150) (180 180)) - rect(l13 (-91 -91) (2 2)) - rect(l13 (-151 -151) (300 300)) + rect(l13 (-90 -90) (0 0)) + rect(l13 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -402,8 +402,8 @@ layout( rect(l14 (-18400 -260) (200 200)) rect(l14 (17940 -200) (200 200)) rect(l15 (-18040 -300) (17740 400)) - rect(l15 (-17921 -201) (2 2)) - rect(l15 (-221 -201) (400 400)) + rect(l15 (-17920 -200) (0 0)) + rect(l15 (-220 -200) (400 400)) rect(l15 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -417,29 +417,29 @@ layout( rect(l10 (23220 370) (180 180)) rect(l10 (-180 370) (180 180)) rect(l10 (-180 -1280) (180 180)) - rect(l13 (-21741 859) (2 2)) - rect(l13 (-2351 -451) (1200 800)) + rect(l13 (-21740 860) (0 0)) + rect(l13 (-2350 -450) (1200 800)) rect(l13 (-750 -1450) (300 1400)) - rect(l13 (-101 -351) (2 2)) - rect(l13 (-1251 -401) (600 800)) + rect(l13 (-100 -350) (0 0)) + rect(l13 (-1250 -400) (600 800)) rect(l13 (23400 -800) (1200 800)) rect(l13 (-750 -1450) (300 1400)) - rect(l13 (-101 -351) (2 2)) - rect(l13 (549 -401) (600 800)) + rect(l13 (-100 -350) (0 0)) + rect(l13 (550 -400) (600 800)) rect(l11 (-24850 -1500) (500 1500)) rect(l11 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l13 (23440 3840) (320 320)) rect(l14 (-260 -260) (200 200)) - rect(l15 (-101 -101) (2 2)) - rect(l15 (-201 -201) (400 400)) + rect(l15 (-100 -100) (0 0)) + rect(l15 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l13 (2440 2940) (320 320)) rect(l14 (-260 -260) (200 200)) - rect(l15 (-101 -101) (2 2)) - rect(l15 (-201 -201) (400 400)) + rect(l15 (-100 -100) (0 0)) + rect(l15 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l10 (1110 1610) (180 180)) @@ -448,15 +448,15 @@ layout( rect(l10 (23220 370) (180 180)) rect(l10 (-180 -1280) (180 180)) rect(l10 (-180 370) (180 180)) - rect(l13 (-21741 -391) (2 2)) - rect(l13 (-1901 -401) (300 1400)) + rect(l13 (-21740 -390) (0 0)) + rect(l13 (-1900 -400) (300 1400)) rect(l13 (-750 -1450) (1200 800)) - rect(l13 (-551 -401) (2 2)) - rect(l13 (-1251 -401) (600 800)) + rect(l13 (-550 -400) (0 0)) + rect(l13 (-1250 -400) (600 800)) rect(l13 (23850 -750) (300 1400)) rect(l13 (-750 -1450) (1200 800)) - rect(l13 (-551 -401) (2 2)) - rect(l13 (549 -401) (600 800)) + rect(l13 (-550 -400) (0 0)) + rect(l13 (550 -400) (600 800)) rect(l12 (-24850 -800) (500 1500)) rect(l12 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.1 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1 index f5c5cb5a0..7c990189a 100644 --- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.1 +++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -405,8 +405,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(13 name(VDD) @@ -423,15 +423,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) @@ -441,14 +441,14 @@ layout( net(14 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(16 name(VSS) rect(l8 (26010 1770) (180 180)) @@ -463,15 +463,15 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (1260 -40) (300 1360)) rect(l11 (400 -1360) (300 1360)) - rect(l11 (-24001 -1711) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-24000 -1710) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 index 2833efc33..bc6aa1a53 100644 --- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 +++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -405,8 +405,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(13 name(VDD) @@ -423,15 +423,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) @@ -441,14 +441,14 @@ layout( net(14 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(16 name(VSS) rect(l8 (26010 1770) (180 180)) @@ -463,15 +463,15 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (1260 -40) (300 1360)) rect(l11 (400 -1360) (300 1360)) - rect(l11 (-24001 -1711) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-24000 -1710) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.3 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.3 index 8fc3eac47..84267cce5 100644 --- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.3 +++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.3 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -405,8 +405,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(13 name(VDD) @@ -423,15 +423,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) @@ -441,14 +441,14 @@ layout( net(14 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(16 name(VSS) rect(l8 (26010 1770) (180 180)) @@ -463,15 +463,15 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (1260 -40) (300 1360)) rect(l11 (400 -1360) (300 1360)) - rect(l11 (-24001 -1711) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-24000 -1710) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) rect(l11 (0 -800) (600 800)) diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 index ff9b41108..d3d97f200 100644 --- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 +++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-19150 -260) (200 200)) rect(l12 (18690 -200) (200 200)) rect(l13 (-18840 -300) (18890 400)) - rect(l13 (-19071 -201) (2 2)) - rect(l13 (-171 -201) (400 400)) + rect(l13 (-19070 -200) (0 0)) + rect(l13 (-170 -200) (400 400)) rect(l13 (18490 -400) (400 400)) ) net(12 name(VDD) @@ -417,20 +417,20 @@ layout( rect(l8 (25720 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-4891 1009) (2 2)) - rect(l11 (2798 -52) (2 2)) - rect(l11 (-22152 -102) (2 2)) - rect(l11 (19749 -451) (1200 800)) + rect(l11 (-4890 1010) (0 0)) + rect(l11 (2800 -50) (0 0)) + rect(l11 (-22150 -100) (0 0)) + rect(l11 (19750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-22751 -401) (1200 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-22750 -400) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (25900 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-5250 -1500) (500 1500)) rect(l9 (-22600 -1500) (500 1500)) rect(l9 (25400 -1500) (500 1500)) @@ -438,14 +438,14 @@ layout( net(13 name(OUT) rect(l11 (25990 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-151 -101) (2 2)) - rect(l13 (-151 -201) (400 400)) + rect(l13 (-150 -100) (0 0)) + rect(l13 (-150 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2490 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-151 -101) (2 2)) - rect(l13 (-151 -201) (400 400)) + rect(l13 (-150 -100) (0 0)) + rect(l13 (-150 -200) (400 400)) ) net(15 name(VSS) rect(l8 (27010 1610) (180 180)) @@ -457,20 +457,20 @@ layout( rect(l8 (-22280 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (24709 -291) (2 2)) - rect(l11 (-3852 -2) (2 2)) - rect(l11 (-19202 -102) (2 2)) - rect(l11 (23999 -401) (300 1400)) + rect(l11 (24710 -290) (0 0)) + rect(l11 (-3850 0) (0 0)) + rect(l11 (-19200 -100) (0 0)) + rect(l11 (24000 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (-5150 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-22301 -351) (300 1400)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-22300 -350) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l10 (26250 -800) (500 1500)) rect(l10 (-4300 -1500) (500 1500)) rect(l10 (-22600 -1500) (500 1500)) diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 index 0363a34ef..959964f06 100644 --- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 +++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-19150 -260) (200 200)) rect(l12 (18690 -200) (200 200)) rect(l13 (-18840 -300) (18890 400)) - rect(l13 (-19071 -201) (2 2)) - rect(l13 (-171 -201) (400 400)) + rect(l13 (-19070 -200) (0 0)) + rect(l13 (-170 -200) (400 400)) rect(l13 (18490 -400) (400 400)) ) net(12 name(VDD) @@ -417,20 +417,20 @@ layout( rect(l8 (25720 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-4891 1009) (2 2)) - rect(l11 (2798 -52) (2 2)) - rect(l11 (-22152 -102) (2 2)) - rect(l11 (19749 -451) (1200 800)) + rect(l11 (-4890 1010) (0 0)) + rect(l11 (2800 -50) (0 0)) + rect(l11 (-22150 -100) (0 0)) + rect(l11 (19750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-22751 -401) (1200 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-22750 -400) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (25900 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-5250 -1500) (500 1500)) rect(l9 (-22600 -1500) (500 1500)) rect(l9 (25400 -1500) (500 1500)) @@ -438,14 +438,14 @@ layout( net(13 name(OUT) rect(l11 (25990 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-151 -101) (2 2)) - rect(l13 (-151 -201) (400 400)) + rect(l13 (-150 -100) (0 0)) + rect(l13 (-150 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2490 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-151 -101) (2 2)) - rect(l13 (-151 -201) (400 400)) + rect(l13 (-150 -100) (0 0)) + rect(l13 (-150 -200) (400 400)) ) net(15 name(VSS) rect(l8 (27010 1610) (180 180)) @@ -457,20 +457,20 @@ layout( rect(l8 (-22280 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (24709 -291) (2 2)) - rect(l11 (-3852 -2) (2 2)) - rect(l11 (-19202 -102) (2 2)) - rect(l11 (23999 -401) (300 1400)) + rect(l11 (24710 -290) (0 0)) + rect(l11 (-3850 0) (0 0)) + rect(l11 (-19200 -100) (0 0)) + rect(l11 (24000 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l11 (-5150 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-22301 -351) (300 1400)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-22300 -350) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l10 (26250 -800) (500 1500)) rect(l10 (-4300 -1500) (500 1500)) rect(l10 (-22600 -1500) (500 1500)) diff --git a/testdata/lvs/ringo_simple_io.lvsdb.1 b/testdata/lvs/ringo_simple_io.lvsdb.1 index ed998ca98..cc99cf3db 100644 --- a/testdata/lvs/ringo_simple_io.lvsdb.1 +++ b/testdata/lvs/ringo_simple_io.lvsdb.1 @@ -120,8 +120,8 @@ J( R(l8 (-180 -730) (180 180)) R(l11 (-240 -790) (300 1700)) R(l11 (-1350 0) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l2 (-276 -2151) (425 1500)) + R(l11 (-1150 -400) (0 0)) + R(l2 (-275 -2150) (425 1500)) R(l2 (-400 -1500) (425 1500)) ) N(2 I(OUT) @@ -136,8 +136,8 @@ J( Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) R(l11 (-110 1390) (300 1400)) Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - R(l11 (-141 -501) (2 2)) - R(l11 (-1751 1099) (300 1400)) + R(l11 (-140 -500) (0 0)) + R(l11 (-1750 1100) (300 1400)) R(l11 (1100 -1700) (300 300)) R(l11 (-300 0) (300 1400)) R(l2 (-1750 -1450) (425 1500)) @@ -149,8 +149,8 @@ J( R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l6 (-951 859) (425 950)) + R(l11 (-1150 -400) (0 0)) + R(l6 (-950 860) (425 950)) ) N(4 R(l3 (-100 4500) (2600 3500)) @@ -162,8 +162,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-285 1050) (180 180)) - R(l11 (-71 -91) (2 2)) - R(l11 (-171 -151) (300 300)) + R(l11 (-70 -90) (0 0)) + R(l11 (-170 -150) (300 300)) ) N(6 I(A) R(l4 (725 2860) (250 1940)) @@ -172,8 +172,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-265 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(7 I(SUBSTRATE)) N(8 @@ -249,8 +249,8 @@ J( R(l11 (-240 -240) (300 1400)) R(l11 (-650 300) (1800 800)) R(l11 (-1450 -1100) (300 300)) - R(l11 (299 399) (2 2)) - R(l2 (-651 -2151) (425 1500)) + R(l11 (300 400) (0 0)) + R(l2 (-650 -2150) (425 1500)) ) N(2 I(OUT) R(l8 (1110 5160) (180 180)) @@ -259,8 +259,8 @@ J( R(l8 (-180 -4120) (180 180)) R(l8 (-180 370) (180 180)) R(l11 (-240 -790) (300 4790)) - R(l11 (-151 -2501) (2 2)) - R(l2 (-226 1049) (425 1500)) + R(l11 (-150 -2500) (0 0)) + R(l2 (-225 1050) (425 1500)) R(l6 (-425 -4890) (425 950)) ) N(3 I(VSS) @@ -268,8 +268,8 @@ J( R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (1800 800)) - R(l11 (-851 -401) (2 2)) - R(l6 (-651 859) (425 950)) + R(l11 (-850 -400) (0 0)) + R(l6 (-650 860) (425 950)) ) N(4 R(l3 (-100 4500) (2000 3500)) @@ -281,8 +281,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-465 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(6 I(SUBSTRATE)) P(1 I(VDD)) @@ -357,8 +357,8 @@ J( R(l12 (-18400 -260) (200 200)) R(l12 (17940 -200) (200 200)) R(l13 (-18040 -300) (17740 400)) - R(l13 (-17921 -201) (2 2)) - R(l13 (-221 -201) (400 400)) + R(l13 (-17920 -200) (0 0)) + R(l13 (-220 -200) (400 400)) R(l13 (17740 -400) (400 400)) ) N(12 I(VDD) @@ -372,29 +372,29 @@ J( R(l8 (23220 370) (180 180)) R(l8 (-180 370) (180 180)) R(l8 (-180 -1280) (180 180)) - R(l11 (-21741 859) (2 2)) - R(l11 (-2351 -451) (1200 800)) + R(l11 (-21740 860) (0 0)) + R(l11 (-2350 -450) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23400 -800) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (550 -400) (600 800)) R(l9 (-24850 -1500) (500 1500)) R(l9 (22900 -1500) (500 1500)) ) N(13 I(OUT) R(l11 (23440 3840) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(14 I(ENABLE) R(l11 (2440 2940) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(15 I(VSS) R(l8 (1110 1610) (180 180)) @@ -403,15 +403,15 @@ J( R(l8 (23220 370) (180 180)) R(l8 (-180 -1280) (180 180)) R(l8 (-180 370) (180 180)) - R(l11 (-21741 -391) (2 2)) - R(l11 (-1901 -401) (300 1400)) + R(l11 (-21740 -390) (0 0)) + R(l11 (-1900 -400) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23850 -750) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (550 -400) (600 800)) R(l10 (-24850 -800) (500 1500)) R(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_io.lvsdb.2 b/testdata/lvs/ringo_simple_io.lvsdb.2 index 8b7238826..5a8273d4f 100644 --- a/testdata/lvs/ringo_simple_io.lvsdb.2 +++ b/testdata/lvs/ringo_simple_io.lvsdb.2 @@ -120,8 +120,8 @@ J( R(l8 (-180 -730) (180 180)) R(l11 (-240 -790) (300 1700)) R(l11 (-1350 0) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l2 (-276 -2151) (425 1500)) + R(l11 (-1150 -400) (0 0)) + R(l2 (-275 -2150) (425 1500)) R(l2 (-400 -1500) (425 1500)) ) N(2 I(OUT) @@ -136,8 +136,8 @@ J( Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) R(l11 (-110 1390) (300 1400)) Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - R(l11 (-141 -501) (2 2)) - R(l11 (-1751 1099) (300 1400)) + R(l11 (-140 -500) (0 0)) + R(l11 (-1750 1100) (300 1400)) R(l11 (1100 -1700) (300 300)) R(l11 (-300 0) (300 1400)) R(l2 (-375 -1450) (425 1500)) @@ -149,8 +149,8 @@ J( R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l6 (-951 859) (425 950)) + R(l11 (-1150 -400) (0 0)) + R(l6 (-950 860) (425 950)) ) N(4 R(l3 (-100 4500) (2600 3500)) @@ -162,8 +162,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-285 1050) (180 180)) - R(l11 (-71 -91) (2 2)) - R(l11 (-171 -151) (300 300)) + R(l11 (-70 -90) (0 0)) + R(l11 (-170 -150) (300 300)) ) N(6 I(A) R(l4 (725 2860) (250 1940)) @@ -172,8 +172,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-265 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(7 I(SUBSTRATE)) N(8 @@ -249,8 +249,8 @@ J( R(l11 (-240 -240) (300 1400)) R(l11 (-650 300) (1800 800)) R(l11 (-1450 -1100) (300 300)) - R(l11 (299 399) (2 2)) - R(l2 (-651 -2151) (425 1500)) + R(l11 (300 400) (0 0)) + R(l2 (-650 -2150) (425 1500)) ) N(2 I(OUT) R(l8 (1110 5160) (180 180)) @@ -259,8 +259,8 @@ J( R(l8 (-180 -4120) (180 180)) R(l8 (-180 370) (180 180)) R(l11 (-240 -790) (300 4790)) - R(l11 (-151 -2501) (2 2)) - R(l2 (-226 1049) (425 1500)) + R(l11 (-150 -2500) (0 0)) + R(l2 (-225 1050) (425 1500)) R(l6 (-425 -4890) (425 950)) ) N(3 I(VSS) @@ -268,8 +268,8 @@ J( R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (1800 800)) - R(l11 (-851 -401) (2 2)) - R(l6 (-651 859) (425 950)) + R(l11 (-850 -400) (0 0)) + R(l6 (-650 860) (425 950)) ) N(4 R(l3 (-100 4500) (2000 3500)) @@ -281,8 +281,8 @@ J( R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-465 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(6 I(SUBSTRATE)) P(1 I(VDD)) @@ -357,8 +357,8 @@ J( R(l12 (-18400 -260) (200 200)) R(l12 (17940 -200) (200 200)) R(l13 (-18040 -300) (17740 400)) - R(l13 (-17921 -201) (2 2)) - R(l13 (-221 -201) (400 400)) + R(l13 (-17920 -200) (0 0)) + R(l13 (-220 -200) (400 400)) R(l13 (17740 -400) (400 400)) ) N(12 I(VDD) @@ -372,29 +372,29 @@ J( R(l8 (23220 370) (180 180)) R(l8 (-180 370) (180 180)) R(l8 (-180 -1280) (180 180)) - R(l11 (-21741 859) (2 2)) - R(l11 (-2351 -451) (1200 800)) + R(l11 (-21740 860) (0 0)) + R(l11 (-2350 -450) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23400 -800) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (550 -400) (600 800)) R(l9 (-24850 -1500) (500 1500)) R(l9 (22900 -1500) (500 1500)) ) N(13 I(OUT) R(l11 (23440 3840) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(14 I(ENABLE) R(l11 (2440 2940) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(15 I(VSS) R(l8 (1110 1610) (180 180)) @@ -403,15 +403,15 @@ J( R(l8 (23220 370) (180 180)) R(l8 (-180 -1280) (180 180)) R(l8 (-180 370) (180 180)) - R(l11 (-21741 -391) (2 2)) - R(l11 (-1901 -401) (300 1400)) + R(l11 (-21740 -390) (0 0)) + R(l11 (-1900 -400) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23850 -750) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (550 -400) (600 800)) R(l10 (-24850 -800) (500 1500)) R(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_io2.l2n.1 b/testdata/lvs/ringo_simple_io2.l2n.1 index 7e0cf804b..5dff4a81c 100644 --- a/testdata/lvs/ringo_simple_io2.l2n.1 +++ b/testdata/lvs/ringo_simple_io2.l2n.1 @@ -119,8 +119,8 @@ X(ND2X1 R(l8 (-180 -730) (180 180)) R(l11 (-240 -790) (300 1700)) R(l11 (-1350 0) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l2 (-276 -2151) (425 1500)) + R(l11 (-1150 -400) (0 0)) + R(l2 (-275 -2150) (425 1500)) R(l2 (-400 -1500) (425 1500)) ) N(2 I(OUT) @@ -135,8 +135,8 @@ X(ND2X1 Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) R(l11 (-110 1390) (300 1400)) Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - R(l11 (-141 -501) (2 2)) - R(l11 (-1751 1099) (300 1400)) + R(l11 (-140 -500) (0 0)) + R(l11 (-1750 1100) (300 1400)) R(l11 (1100 -1700) (300 300)) R(l11 (-300 0) (300 1400)) R(l2 (-1750 -1450) (425 1500)) @@ -148,8 +148,8 @@ X(ND2X1 R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l6 (-951 859) (425 950)) + R(l11 (-1150 -400) (0 0)) + R(l6 (-950 860) (425 950)) ) N(4 R(l3 (-100 4500) (2600 3500)) @@ -161,8 +161,8 @@ X(ND2X1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-285 1050) (180 180)) - R(l11 (-71 -91) (2 2)) - R(l11 (-171 -151) (300 300)) + R(l11 (-70 -90) (0 0)) + R(l11 (-170 -150) (300 300)) ) N(6 I(A) R(l4 (725 2860) (250 1940)) @@ -171,8 +171,8 @@ X(ND2X1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-265 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(7 I(SUBSTRATE)) N(8 @@ -248,8 +248,8 @@ X(INVX1 R(l11 (-240 -240) (300 1400)) R(l11 (-650 300) (1800 800)) R(l11 (-1450 -1100) (300 300)) - R(l11 (299 399) (2 2)) - R(l2 (-651 -2151) (425 1500)) + R(l11 (300 400) (0 0)) + R(l2 (-650 -2150) (425 1500)) ) N(2 I(OUT) R(l8 (1110 5160) (180 180)) @@ -258,8 +258,8 @@ X(INVX1 R(l8 (-180 -4120) (180 180)) R(l8 (-180 370) (180 180)) R(l11 (-240 -790) (300 4790)) - R(l11 (-151 -2501) (2 2)) - R(l2 (-226 1049) (425 1500)) + R(l11 (-150 -2500) (0 0)) + R(l2 (-225 1050) (425 1500)) R(l6 (-425 -4890) (425 950)) ) N(3 I(VSS) @@ -267,8 +267,8 @@ X(INVX1 R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (1800 800)) - R(l11 (-851 -401) (2 2)) - R(l6 (-651 859) (425 950)) + R(l11 (-850 -400) (0 0)) + R(l6 (-650 860) (425 950)) ) N(4 R(l3 (-100 4500) (2000 3500)) @@ -280,8 +280,8 @@ X(INVX1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-465 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(6 I(SUBSTRATE)) P(1 I(VDD)) @@ -356,8 +356,8 @@ X(RINGO R(l12 (-18400 -260) (200 200)) R(l12 (17940 -200) (200 200)) R(l13 (-18040 -300) (17740 400)) - R(l13 (-17921 -201) (2 2)) - R(l13 (-221 -201) (400 400)) + R(l13 (-17920 -200) (0 0)) + R(l13 (-220 -200) (400 400)) R(l13 (17740 -400) (400 400)) ) N(12 I(VDD) @@ -371,29 +371,29 @@ X(RINGO R(l8 (23220 370) (180 180)) R(l8 (-180 370) (180 180)) R(l8 (-180 -1280) (180 180)) - R(l11 (-21741 859) (2 2)) - R(l11 (-2351 -451) (1200 800)) + R(l11 (-21740 860) (0 0)) + R(l11 (-2350 -450) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23400 -800) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (550 -400) (600 800)) R(l9 (-24850 -1500) (500 1500)) R(l9 (22900 -1500) (500 1500)) ) N(13 I(OUT) R(l11 (23440 3840) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(14 I(ENABLE) R(l11 (2440 2940) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(15 I(VSS) R(l8 (1110 1610) (180 180)) @@ -402,15 +402,15 @@ X(RINGO R(l8 (23220 370) (180 180)) R(l8 (-180 -1280) (180 180)) R(l8 (-180 370) (180 180)) - R(l11 (-21741 -391) (2 2)) - R(l11 (-1901 -401) (300 1400)) + R(l11 (-21740 -390) (0 0)) + R(l11 (-1900 -400) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23850 -750) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (550 -400) (600 800)) R(l10 (-24850 -800) (500 1500)) R(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_io2.l2n.2 b/testdata/lvs/ringo_simple_io2.l2n.2 index 6b6d1f1d7..fdc09bcfd 100644 --- a/testdata/lvs/ringo_simple_io2.l2n.2 +++ b/testdata/lvs/ringo_simple_io2.l2n.2 @@ -119,8 +119,8 @@ X(ND2X1 R(l8 (-180 -730) (180 180)) R(l11 (-240 -790) (300 1700)) R(l11 (-1350 0) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l2 (-276 -2151) (425 1500)) + R(l11 (-1150 -400) (0 0)) + R(l2 (-275 -2150) (425 1500)) R(l2 (-400 -1500) (425 1500)) ) N(2 I(OUT) @@ -135,8 +135,8 @@ X(ND2X1 Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) R(l11 (-110 1390) (300 1400)) Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - R(l11 (-141 -501) (2 2)) - R(l11 (-1751 1099) (300 1400)) + R(l11 (-140 -500) (0 0)) + R(l11 (-1750 1100) (300 1400)) R(l11 (1100 -1700) (300 300)) R(l11 (-300 0) (300 1400)) R(l2 (-375 -1450) (425 1500)) @@ -148,8 +148,8 @@ X(ND2X1 R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (2400 800)) - R(l11 (-1151 -401) (2 2)) - R(l6 (-951 859) (425 950)) + R(l11 (-1150 -400) (0 0)) + R(l6 (-950 860) (425 950)) ) N(4 R(l3 (-100 4500) (2600 3500)) @@ -161,8 +161,8 @@ X(ND2X1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-285 1050) (180 180)) - R(l11 (-71 -91) (2 2)) - R(l11 (-171 -151) (300 300)) + R(l11 (-70 -90) (0 0)) + R(l11 (-170 -150) (300 300)) ) N(6 I(A) R(l4 (725 2860) (250 1940)) @@ -171,8 +171,8 @@ X(ND2X1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-265 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(7 I(SUBSTRATE)) N(8 @@ -248,8 +248,8 @@ X(INVX1 R(l11 (-240 -240) (300 1400)) R(l11 (-650 300) (1800 800)) R(l11 (-1450 -1100) (300 300)) - R(l11 (299 399) (2 2)) - R(l2 (-651 -2151) (425 1500)) + R(l11 (300 400) (0 0)) + R(l2 (-650 -2150) (425 1500)) ) N(2 I(OUT) R(l8 (1110 5160) (180 180)) @@ -258,8 +258,8 @@ X(INVX1 R(l8 (-180 -4120) (180 180)) R(l8 (-180 370) (180 180)) R(l11 (-240 -790) (300 4790)) - R(l11 (-151 -2501) (2 2)) - R(l2 (-226 1049) (425 1500)) + R(l11 (-150 -2500) (0 0)) + R(l2 (-225 1050) (425 1500)) R(l6 (-425 -4890) (425 950)) ) N(3 I(VSS) @@ -267,8 +267,8 @@ X(INVX1 R(l8 (-180 370) (180 180)) R(l11 (-240 -1300) (300 1360)) R(l11 (-650 -2160) (1800 800)) - R(l11 (-851 -401) (2 2)) - R(l6 (-651 859) (425 950)) + R(l11 (-850 -400) (0 0)) + R(l6 (-650 860) (425 950)) ) N(4 R(l3 (-100 4500) (2000 3500)) @@ -280,8 +280,8 @@ X(INVX1 R(l4 (-250 -2000) (250 2000)) R(l4 (-250 -5390) (250 1450)) R(l8 (-465 150) (180 180)) - R(l11 (-91 -91) (2 2)) - R(l11 (-151 -151) (300 300)) + R(l11 (-90 -90) (0 0)) + R(l11 (-150 -150) (300 300)) ) N(6 I(SUBSTRATE)) P(1 I(VDD)) @@ -356,8 +356,8 @@ X(RINGO R(l12 (-18400 -260) (200 200)) R(l12 (17940 -200) (200 200)) R(l13 (-18040 -300) (17740 400)) - R(l13 (-17921 -201) (2 2)) - R(l13 (-221 -201) (400 400)) + R(l13 (-17920 -200) (0 0)) + R(l13 (-220 -200) (400 400)) R(l13 (17740 -400) (400 400)) ) N(12 I(VDD) @@ -371,29 +371,29 @@ X(RINGO R(l8 (23220 370) (180 180)) R(l8 (-180 370) (180 180)) R(l8 (-180 -1280) (180 180)) - R(l11 (-21741 859) (2 2)) - R(l11 (-2351 -451) (1200 800)) + R(l11 (-21740 860) (0 0)) + R(l11 (-2350 -450) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23400 -800) (1200 800)) R(l11 (-750 -1450) (300 1400)) - R(l11 (-101 -351) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-100 -350) (0 0)) + R(l11 (550 -400) (600 800)) R(l9 (-24850 -1500) (500 1500)) R(l9 (22900 -1500) (500 1500)) ) N(13 I(OUT) R(l11 (23440 3840) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(14 I(ENABLE) R(l11 (2440 2940) (320 320)) R(l12 (-260 -260) (200 200)) - R(l13 (-101 -101) (2 2)) - R(l13 (-201 -201) (400 400)) + R(l13 (-100 -100) (0 0)) + R(l13 (-200 -200) (400 400)) ) N(15 I(VSS) R(l8 (1110 1610) (180 180)) @@ -402,15 +402,15 @@ X(RINGO R(l8 (23220 370) (180 180)) R(l8 (-180 -1280) (180 180)) R(l8 (-180 370) (180 180)) - R(l11 (-21741 -391) (2 2)) - R(l11 (-1901 -401) (300 1400)) + R(l11 (-21740 -390) (0 0)) + R(l11 (-1900 -400) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (-1251 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (-1250 -400) (600 800)) R(l11 (23850 -750) (300 1400)) R(l11 (-750 -1450) (1200 800)) - R(l11 (-551 -401) (2 2)) - R(l11 (549 -401) (600 800)) + R(l11 (-550 -400) (0 0)) + R(l11 (550 -400) (600 800)) R(l10 (-24850 -800) (500 1500)) R(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.1 b/testdata/lvs/ringo_simple_io2.lvsdb.1 index b4494918c..aab318d16 100644 --- a/testdata/lvs/ringo_simple_io2.lvsdb.1 +++ b/testdata/lvs/ringo_simple_io2.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.2 b/testdata/lvs/ringo_simple_io2.lvsdb.2 index b585c4ca4..3a8a977fb 100644 --- a/testdata/lvs/ringo_simple_io2.lvsdb.2 +++ b/testdata/lvs/ringo_simple_io2.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 index 638555d57..af99b469c 100644 --- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 +++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 index a2b8e370d..f85823972 100644 --- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 +++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 index 42ac52dd1..8190cddd7 100644 --- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 +++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 index cb34ae9bf..04c3053f3 100644 --- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 +++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 index 1260655ac..5fe96aee2 100644 --- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 +++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 @@ -145,8 +145,8 @@ layout( rect(l14 (-180 -730) (180 180)) rect(l17 (-240 -790) (300 1700)) rect(l17 (-1350 0) (2400 800)) - rect(l17 (-1151 -401) (2 2)) - rect(l4 (-276 -2151) (425 1500)) + rect(l17 (-1150 -400) (0 0)) + rect(l4 (-275 -2150) (425 1500)) rect(l4 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -161,8 +161,8 @@ layout( polygon(l17 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l17 (-110 1390) (300 1400)) polygon(l17 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l17 (-141 -501) (2 2)) - rect(l17 (-1751 1099) (300 1400)) + rect(l17 (-140 -500) (0 0)) + rect(l17 (-1750 1100) (300 1400)) rect(l17 (1100 -1700) (300 300)) rect(l17 (-300 0) (300 1400)) rect(l4 (-1750 -1450) (425 1500)) @@ -174,8 +174,8 @@ layout( rect(l14 (-180 370) (180 180)) rect(l17 (-240 -1300) (300 1360)) rect(l17 (-650 -2160) (2400 800)) - rect(l17 (-1151 -401) (2 2)) - rect(l9 (-951 859) (425 950)) + rect(l17 (-1150 -400) (0 0)) + rect(l9 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -187,8 +187,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-285 1050) (180 180)) - rect(l17 (-71 -91) (2 2)) - rect(l17 (-171 -151) (300 300)) + rect(l17 (-70 -90) (0 0)) + rect(l17 (-170 -150) (300 300)) ) net(6 name(A) rect(l5 (725 2860) (250 1940)) @@ -197,8 +197,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-265 150) (180 180)) - rect(l17 (-91 -91) (2 2)) - rect(l17 (-151 -151) (300 300)) + rect(l17 (-90 -90) (0 0)) + rect(l17 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -283,8 +283,8 @@ layout( rect(l17 (-240 -240) (300 1400)) rect(l17 (-650 300) (1800 800)) rect(l17 (-1450 -1100) (300 300)) - rect(l17 (299 399) (2 2)) - rect(l4 (-651 -2151) (425 1500)) + rect(l17 (300 400) (0 0)) + rect(l4 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l14 (1110 5160) (180 180)) @@ -293,8 +293,8 @@ layout( rect(l14 (-180 -4120) (180 180)) rect(l14 (-180 370) (180 180)) rect(l17 (-240 -790) (300 4790)) - rect(l17 (-151 -2501) (2 2)) - rect(l4 (-226 1049) (425 1500)) + rect(l17 (-150 -2500) (0 0)) + rect(l4 (-225 1050) (425 1500)) rect(l9 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -302,8 +302,8 @@ layout( rect(l14 (-180 370) (180 180)) rect(l17 (-240 -1300) (300 1360)) rect(l17 (-650 -2160) (1800 800)) - rect(l17 (-851 -401) (2 2)) - rect(l9 (-651 859) (425 950)) + rect(l17 (-850 -400) (0 0)) + rect(l9 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -315,8 +315,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-465 150) (180 180)) - rect(l17 (-91 -91) (2 2)) - rect(l17 (-151 -151) (300 300)) + rect(l17 (-90 -90) (0 0)) + rect(l17 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -400,8 +400,8 @@ layout( rect(l18 (-18400 -260) (200 200)) rect(l18 (17940 -200) (200 200)) rect(l19 (-18040 -300) (17740 400)) - rect(l19 (-17921 -201) (2 2)) - rect(l19 (-221 -201) (400 400)) + rect(l19 (-17920 -200) (0 0)) + rect(l19 (-220 -200) (400 400)) rect(l19 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -415,29 +415,29 @@ layout( rect(l14 (23220 370) (180 180)) rect(l14 (-180 370) (180 180)) rect(l14 (-180 -1280) (180 180)) - rect(l17 (-21741 859) (2 2)) - rect(l17 (-2351 -451) (1200 800)) + rect(l17 (-21740 860) (0 0)) + rect(l17 (-2350 -450) (1200 800)) rect(l17 (-750 -1450) (300 1400)) - rect(l17 (-101 -351) (2 2)) - rect(l17 (-1251 -401) (600 800)) + rect(l17 (-100 -350) (0 0)) + rect(l17 (-1250 -400) (600 800)) rect(l17 (23400 -800) (1200 800)) rect(l17 (-750 -1450) (300 1400)) - rect(l17 (-101 -351) (2 2)) - rect(l17 (549 -401) (600 800)) + rect(l17 (-100 -350) (0 0)) + rect(l17 (550 -400) (600 800)) rect(l15 (-24850 -1500) (500 1500)) rect(l15 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l17 (23440 3840) (320 320)) rect(l18 (-260 -260) (200 200)) - rect(l19 (-101 -101) (2 2)) - rect(l19 (-201 -201) (400 400)) + rect(l19 (-100 -100) (0 0)) + rect(l19 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l17 (2440 2940) (320 320)) rect(l18 (-260 -260) (200 200)) - rect(l19 (-101 -101) (2 2)) - rect(l19 (-201 -201) (400 400)) + rect(l19 (-100 -100) (0 0)) + rect(l19 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l14 (1110 1610) (180 180)) @@ -446,15 +446,15 @@ layout( rect(l14 (23220 370) (180 180)) rect(l14 (-180 -1280) (180 180)) rect(l14 (-180 370) (180 180)) - rect(l17 (-21741 -391) (2 2)) - rect(l17 (-1901 -401) (300 1400)) + rect(l17 (-21740 -390) (0 0)) + rect(l17 (-1900 -400) (300 1400)) rect(l17 (-750 -1450) (1200 800)) - rect(l17 (-551 -401) (2 2)) - rect(l17 (-1251 -401) (600 800)) + rect(l17 (-550 -400) (0 0)) + rect(l17 (-1250 -400) (600 800)) rect(l17 (23850 -750) (300 1400)) rect(l17 (-750 -1450) (1200 800)) - rect(l17 (-551 -401) (2 2)) - rect(l17 (549 -401) (600 800)) + rect(l17 (-550 -400) (0 0)) + rect(l17 (550 -400) (600 800)) rect(l16 (-24850 -800) (500 1500)) rect(l16 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 index f244f5156..be3084317 100644 --- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 +++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 @@ -145,8 +145,8 @@ layout( rect(l14 (-180 -730) (180 180)) rect(l17 (-240 -790) (300 1700)) rect(l17 (-1350 0) (2400 800)) - rect(l17 (-1151 -401) (2 2)) - rect(l4 (-276 -2151) (425 1500)) + rect(l17 (-1150 -400) (0 0)) + rect(l4 (-275 -2150) (425 1500)) rect(l4 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -161,8 +161,8 @@ layout( polygon(l17 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l17 (-110 1390) (300 1400)) polygon(l17 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l17 (-141 -501) (2 2)) - rect(l17 (-1751 1099) (300 1400)) + rect(l17 (-140 -500) (0 0)) + rect(l17 (-1750 1100) (300 1400)) rect(l17 (1100 -1700) (300 300)) rect(l17 (-300 0) (300 1400)) rect(l4 (-375 -1450) (425 1500)) @@ -174,8 +174,8 @@ layout( rect(l14 (-180 370) (180 180)) rect(l17 (-240 -1300) (300 1360)) rect(l17 (-650 -2160) (2400 800)) - rect(l17 (-1151 -401) (2 2)) - rect(l9 (-951 859) (425 950)) + rect(l17 (-1150 -400) (0 0)) + rect(l9 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -187,8 +187,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-285 1050) (180 180)) - rect(l17 (-71 -91) (2 2)) - rect(l17 (-171 -151) (300 300)) + rect(l17 (-70 -90) (0 0)) + rect(l17 (-170 -150) (300 300)) ) net(6 name(A) rect(l5 (725 2860) (250 1940)) @@ -197,8 +197,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-265 150) (180 180)) - rect(l17 (-91 -91) (2 2)) - rect(l17 (-151 -151) (300 300)) + rect(l17 (-90 -90) (0 0)) + rect(l17 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -283,8 +283,8 @@ layout( rect(l17 (-240 -240) (300 1400)) rect(l17 (-650 300) (1800 800)) rect(l17 (-1450 -1100) (300 300)) - rect(l17 (299 399) (2 2)) - rect(l4 (-651 -2151) (425 1500)) + rect(l17 (300 400) (0 0)) + rect(l4 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l14 (1110 5160) (180 180)) @@ -293,8 +293,8 @@ layout( rect(l14 (-180 -4120) (180 180)) rect(l14 (-180 370) (180 180)) rect(l17 (-240 -790) (300 4790)) - rect(l17 (-151 -2501) (2 2)) - rect(l4 (-226 1049) (425 1500)) + rect(l17 (-150 -2500) (0 0)) + rect(l4 (-225 1050) (425 1500)) rect(l9 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -302,8 +302,8 @@ layout( rect(l14 (-180 370) (180 180)) rect(l17 (-240 -1300) (300 1360)) rect(l17 (-650 -2160) (1800 800)) - rect(l17 (-851 -401) (2 2)) - rect(l9 (-651 859) (425 950)) + rect(l17 (-850 -400) (0 0)) + rect(l9 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -315,8 +315,8 @@ layout( rect(l5 (-250 -2000) (250 2000)) rect(l5 (-250 -5390) (250 1450)) rect(l14 (-465 150) (180 180)) - rect(l17 (-91 -91) (2 2)) - rect(l17 (-151 -151) (300 300)) + rect(l17 (-90 -90) (0 0)) + rect(l17 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -400,8 +400,8 @@ layout( rect(l18 (-18400 -260) (200 200)) rect(l18 (17940 -200) (200 200)) rect(l19 (-18040 -300) (17740 400)) - rect(l19 (-17921 -201) (2 2)) - rect(l19 (-221 -201) (400 400)) + rect(l19 (-17920 -200) (0 0)) + rect(l19 (-220 -200) (400 400)) rect(l19 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -415,29 +415,29 @@ layout( rect(l14 (23220 370) (180 180)) rect(l14 (-180 370) (180 180)) rect(l14 (-180 -1280) (180 180)) - rect(l17 (-21741 859) (2 2)) - rect(l17 (-2351 -451) (1200 800)) + rect(l17 (-21740 860) (0 0)) + rect(l17 (-2350 -450) (1200 800)) rect(l17 (-750 -1450) (300 1400)) - rect(l17 (-101 -351) (2 2)) - rect(l17 (-1251 -401) (600 800)) + rect(l17 (-100 -350) (0 0)) + rect(l17 (-1250 -400) (600 800)) rect(l17 (23400 -800) (1200 800)) rect(l17 (-750 -1450) (300 1400)) - rect(l17 (-101 -351) (2 2)) - rect(l17 (549 -401) (600 800)) + rect(l17 (-100 -350) (0 0)) + rect(l17 (550 -400) (600 800)) rect(l15 (-24850 -1500) (500 1500)) rect(l15 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l17 (23440 3840) (320 320)) rect(l18 (-260 -260) (200 200)) - rect(l19 (-101 -101) (2 2)) - rect(l19 (-201 -201) (400 400)) + rect(l19 (-100 -100) (0 0)) + rect(l19 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l17 (2440 2940) (320 320)) rect(l18 (-260 -260) (200 200)) - rect(l19 (-101 -101) (2 2)) - rect(l19 (-201 -201) (400 400)) + rect(l19 (-100 -100) (0 0)) + rect(l19 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l14 (1110 1610) (180 180)) @@ -446,15 +446,15 @@ layout( rect(l14 (23220 370) (180 180)) rect(l14 (-180 -1280) (180 180)) rect(l14 (-180 370) (180 180)) - rect(l17 (-21741 -391) (2 2)) - rect(l17 (-1901 -401) (300 1400)) + rect(l17 (-21740 -390) (0 0)) + rect(l17 (-1900 -400) (300 1400)) rect(l17 (-750 -1450) (1200 800)) - rect(l17 (-551 -401) (2 2)) - rect(l17 (-1251 -401) (600 800)) + rect(l17 (-550 -400) (0 0)) + rect(l17 (-1250 -400) (600 800)) rect(l17 (23850 -750) (300 1400)) rect(l17 (-750 -1450) (1200 800)) - rect(l17 (-551 -401) (2 2)) - rect(l17 (549 -401) (600 800)) + rect(l17 (-550 -400) (0 0)) + rect(l17 (550 -400) (600 800)) rect(l16 (-24850 -800) (500 1500)) rect(l16 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.1 b/testdata/lvs/ringo_simple_simplification.lvsdb.1 index fb0393863..ddf531dcf 100644 --- a/testdata/lvs/ringo_simple_simplification.lvsdb.1 +++ b/testdata/lvs/ringo_simple_simplification.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) rect(l2 (950 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (-650 860) (425 950)) rect(l6 (950 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.2 b/testdata/lvs/ringo_simple_simplification.lvsdb.2 index 8ef1094e4..ed9919a88 100644 --- a/testdata/lvs/ringo_simple_simplification.lvsdb.2 +++ b/testdata/lvs/ringo_simple_simplification.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-375 -1450) (425 1500)) rect(l2 (-1800 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (724 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (725 860) (425 950)) rect(l6 (-1800 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.3 b/testdata/lvs/ringo_simple_simplification.lvsdb.3 index 53ac9099a..907d3ad3f 100644 --- a/testdata/lvs/ringo_simple_simplification.lvsdb.3 +++ b/testdata/lvs/ringo_simple_simplification.lvsdb.3 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) rect(l2 (950 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (724 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (725 860) (425 950)) rect(l6 (-1800 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 index 337303dd0..50e5303d3 100644 --- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 +++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) rect(l2 (950 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (-650 860) (425 950)) rect(l6 (950 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 index 03d0da560..65093a30b 100644 --- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 +++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-375 -1450) (425 1500)) rect(l2 (-1800 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (724 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (725 860) (425 950)) rect(l6 (-1800 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.3 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.3 index be1456dd3..c6d878db4 100644 --- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.3 +++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.3 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -373,8 +373,8 @@ layout( rect(l4 (450 -5390) (250 1450)) rect(l4 (-950 -1450) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(2 name(VDD) rect(l8 (410 6260) (180 180)) @@ -387,8 +387,8 @@ layout( rect(l11 (-650 300) (2400 800)) rect(l11 (-2050 -1100) (300 300)) rect(l11 (1100 -300) (300 300)) - rect(l11 (-1101 399) (2 2)) - rect(l11 (799 -2101) (300 1400)) + rect(l11 (-1100 400) (0 0)) + rect(l11 (800 -2100) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) rect(l2 (950 -1500) (425 1500)) ) @@ -399,8 +399,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l2 (-400 -1500) (425 1500)) rect(l6 (-450 -4890) (425 950)) rect(l6 (-400 -950) (425 950)) @@ -413,8 +413,8 @@ layout( rect(l11 (-1640 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) rect(l11 (-650 0) (300 1360)) - rect(l11 (-1101 -1761) (2 2)) - rect(l6 (724 859) (425 950)) + rect(l11 (-1100 -1760) (0 0)) + rect(l6 (725 860) (425 950)) rect(l6 (-1800 -950) (425 950)) ) net(5 @@ -502,8 +502,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(6 name(VDD) @@ -517,29 +517,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-22341 859) (2 2)) - rect(l11 (-1751 -451) (1200 800)) + rect(l11 (-22340 860) (0 0)) + rect(l11 (-1750 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(7 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(8 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(9 name(VSS) rect(l8 (1710 1610) (180 180)) @@ -548,15 +548,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-22341 -391) (2 2)) - rect(l11 (-1301 -401) (300 1400)) + rect(l11 (-22340 -390) (0 0)) + rect(l11 (-1300 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol.lvsdb.1 index 51c6fe9e2..a1d3399c2 100644 --- a/testdata/lvs/ringo_simple_with_tol.lvsdb.1 +++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol.lvsdb.2 index 372bf323d..ee9718b35 100644 --- a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 +++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1 index 51c6fe9e2..a1d3399c2 100644 --- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1 +++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-1750 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) ) diff --git a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 index 372bf323d..ee9718b35 100644 --- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 +++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 @@ -143,8 +143,8 @@ layout( rect(l8 (-180 -730) (180 180)) rect(l11 (-240 -790) (300 1700)) rect(l11 (-1350 0) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l2 (-276 -2151) (425 1500)) + rect(l11 (-1150 -400) (0 0)) + rect(l2 (-275 -2150) (425 1500)) rect(l2 (-400 -1500) (425 1500)) ) net(2 name(OUT) @@ -159,8 +159,8 @@ layout( polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090)) rect(l11 (-110 1390) (300 1400)) polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300)) - rect(l11 (-141 -501) (2 2)) - rect(l11 (-1751 1099) (300 1400)) + rect(l11 (-140 -500) (0 0)) + rect(l11 (-1750 1100) (300 1400)) rect(l11 (1100 -1700) (300 300)) rect(l11 (-300 0) (300 1400)) rect(l2 (-375 -1450) (425 1500)) @@ -172,8 +172,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (2400 800)) - rect(l11 (-1151 -401) (2 2)) - rect(l6 (-951 859) (425 950)) + rect(l11 (-1150 -400) (0 0)) + rect(l6 (-950 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2600 3500)) @@ -185,8 +185,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-285 1050) (180 180)) - rect(l11 (-71 -91) (2 2)) - rect(l11 (-171 -151) (300 300)) + rect(l11 (-70 -90) (0 0)) + rect(l11 (-170 -150) (300 300)) ) net(6 name(A) rect(l4 (725 2860) (250 1940)) @@ -195,8 +195,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-265 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(7 name(SUBSTRATE)) net(8 @@ -281,8 +281,8 @@ layout( rect(l11 (-240 -240) (300 1400)) rect(l11 (-650 300) (1800 800)) rect(l11 (-1450 -1100) (300 300)) - rect(l11 (299 399) (2 2)) - rect(l2 (-651 -2151) (425 1500)) + rect(l11 (300 400) (0 0)) + rect(l2 (-650 -2150) (425 1500)) ) net(2 name(OUT) rect(l8 (1110 5160) (180 180)) @@ -291,8 +291,8 @@ layout( rect(l8 (-180 -4120) (180 180)) rect(l8 (-180 370) (180 180)) rect(l11 (-240 -790) (300 4790)) - rect(l11 (-151 -2501) (2 2)) - rect(l2 (-226 1049) (425 1500)) + rect(l11 (-150 -2500) (0 0)) + rect(l2 (-225 1050) (425 1500)) rect(l6 (-425 -4890) (425 950)) ) net(3 name(VSS) @@ -300,8 +300,8 @@ layout( rect(l8 (-180 370) (180 180)) rect(l11 (-240 -1300) (300 1360)) rect(l11 (-650 -2160) (1800 800)) - rect(l11 (-851 -401) (2 2)) - rect(l6 (-651 859) (425 950)) + rect(l11 (-850 -400) (0 0)) + rect(l6 (-650 860) (425 950)) ) net(4 rect(l3 (-100 4500) (2000 3500)) @@ -313,8 +313,8 @@ layout( rect(l4 (-250 -2000) (250 2000)) rect(l4 (-250 -5390) (250 1450)) rect(l8 (-465 150) (180 180)) - rect(l11 (-91 -91) (2 2)) - rect(l11 (-151 -151) (300 300)) + rect(l11 (-90 -90) (0 0)) + rect(l11 (-150 -150) (300 300)) ) net(6 name(SUBSTRATE)) @@ -398,8 +398,8 @@ layout( rect(l12 (-18400 -260) (200 200)) rect(l12 (17940 -200) (200 200)) rect(l13 (-18040 -300) (17740 400)) - rect(l13 (-17921 -201) (2 2)) - rect(l13 (-221 -201) (400 400)) + rect(l13 (-17920 -200) (0 0)) + rect(l13 (-220 -200) (400 400)) rect(l13 (17740 -400) (400 400)) ) net(12 name(VDD) @@ -413,29 +413,29 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 370) (180 180)) rect(l8 (-180 -1280) (180 180)) - rect(l11 (-21741 859) (2 2)) - rect(l11 (-2351 -451) (1200 800)) + rect(l11 (-21740 860) (0 0)) + rect(l11 (-2350 -450) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23400 -800) (1200 800)) rect(l11 (-750 -1450) (300 1400)) - rect(l11 (-101 -351) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-100 -350) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l9 (-24850 -1500) (500 1500)) rect(l9 (22900 -1500) (500 1500)) ) net(13 name(OUT) rect(l11 (23440 3840) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(14 name(ENABLE) rect(l11 (2440 2940) (320 320)) rect(l12 (-260 -260) (200 200)) - rect(l13 (-101 -101) (2 2)) - rect(l13 (-201 -201) (400 400)) + rect(l13 (-100 -100) (0 0)) + rect(l13 (-200 -200) (400 400)) ) net(15 name(VSS) rect(l8 (1110 1610) (180 180)) @@ -444,15 +444,15 @@ layout( rect(l8 (23220 370) (180 180)) rect(l8 (-180 -1280) (180 180)) rect(l8 (-180 370) (180 180)) - rect(l11 (-21741 -391) (2 2)) - rect(l11 (-1901 -401) (300 1400)) + rect(l11 (-21740 -390) (0 0)) + rect(l11 (-1900 -400) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (-1251 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (-1250 -400) (600 800)) rect(l11 (23850 -750) (300 1400)) rect(l11 (-750 -1450) (1200 800)) - rect(l11 (-551 -401) (2 2)) - rect(l11 (549 -401) (600 800)) + rect(l11 (-550 -400) (0 0)) + rect(l11 (550 -400) (600 800)) rect(l10 (-24850 -800) (500 1500)) rect(l10 (22900 -1500) (500 1500)) )