Updating golden test data with new lvsdb files

2025-05-17 17:15:04 +02:00 · 2025-05-17 17:15:04 +02:00 · 135030649b
parent 6cd4b97cd3
commit 135030649b
18 changed files with 86 additions and 994 deletions
--- a/testdata/lvs/ringo_device_subcircuits.lvsdb.2
+++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_layout_var.lvsdb.2
+++ b/testdata/lvs/ringo_layout_var.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple.lvsdb.2
+++ b/testdata/lvs/ringo_simple.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_compare2.lvsdb.2
+++ b/testdata/lvs/ringo_simple_compare2.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
+++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
+++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
@ -361,41 +361,41 @@ layout(
  rect((0 350) (27600 7650))

  # Nets with their geometries
-  net(1
+  net(1 name($3)
   rect(l4 (26050 2800) (525 550))
   rect(l4 (-525 -300) (300 300))
   rect(l4 (-25 -2000) (250 1450))
   rect(l8 (-465 310) (180 180))
   rect(l11 (-240 -240) (300 300))
  )
-  net(2
+  net(2 name($4)
   rect(l11 (4040 2950) (610 300))
  )
-  net(3
+  net(3 name($5)
   rect(l11 (5550 2950) (900 300))
  )
-  net(4
+  net(4 name($6)
   rect(l11 (7350 2950) (900 300))
  )
-  net(5
+  net(5 name($7)
   rect(l11 (9150 2950) (900 300))
  )
-  net(6
+  net(6 name($8)
   rect(l11 (10950 2950) (900 300))
  )
-  net(7
+  net(7 name($9)
   rect(l11 (12750 2950) (900 300))
  )
-  net(8
+  net(8 name($10)
   rect(l11 (14550 2950) (900 300))
  )
-  net(9
+  net(9 name($11)
   rect(l11 (16350 2950) (900 300))
  )
-  net(10
+  net(10 name($12)
   rect(l11 (18150 2950) (900 300))
  )
-  net(11
+  net(11 name($13)
   rect(l11 (19950 2950) (900 300))
  )
  net(12 name(FB)
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
+++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
@ -202,7 +202,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_io.lvsdb.2
+++ b/testdata/lvs/ringo_simple_io.lvsdb.2
@ -176,7 +176,7 @@ J(
   R(l11 (-150 -150) (300 300))
  )
  N(7 I(SUBSTRATE))
-  N(8 I($I3)
+  N(8 I($I5)
   R(l6 (975 1660) (425 950))
   R(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_io2.lvsdb.2
+++ b/testdata/lvs/ringo_simple_io2.lvsdb.2
@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   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 (-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))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   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 (-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 (-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 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 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 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   circuit(7 7 match)
-   circuit(8 8 match)
-   circuit(9 9 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
-   circuit(1 1 match)
-  )
- )
-)
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
+++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
+++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
+++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
@ -201,7 +201,7 @@ layout(
   rect(l17 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l9 (975 1660) (425 950))
   rect(l9 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.2
+++ b/testdata/lvs/ringo_simple_simplification.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
@ -560,22 +560,22 @@ layout(
   rect(l10 (-24850 -800) (500 1500))
   rect(l10 (22900 -1500) (500 1500))
  )
-  net(10
+  net(10 name($I22)
   rect(l11 (7350 2950) (900 300))
  )
-  net(11
+  net(11 name($I18)
   rect(l11 (16350 2950) (900 300))
  )
-  net(12
+  net(12 name($I36)
   rect(l11 (9150 2950) (900 300))
  )
-  net(13
+  net(13 name($I37)
   rect(l11 (10950 2950) (900 300))
  )
-  net(14
+  net(14 name($I38)
   rect(l11 (12750 2950) (900 300))
  )
-  net(15
+  net(15 name($I39)
   rect(l11 (14550 2950) (900 300))
  )

--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
+++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
@ -560,22 +560,22 @@ layout(
   rect(l10 (-24850 -800) (500 1500))
   rect(l10 (22900 -1500) (500 1500))
  )
-  net(10
+  net(10 name($I22)
   rect(l11 (7350 2950) (900 300))
  )
-  net(11
+  net(11 name($I18)
   rect(l11 (16350 2950) (900 300))
  )
-  net(12
+  net(12 name($I36)
   rect(l11 (9150 2950) (900 300))
  )
-  net(13
+  net(13 name($I37)
   rect(l11 (10950 2950) (900 300))
  )
-  net(14
+  net(14 name($I38)
   rect(l11 (12750 2950) (900 300))
  )
-  net(15
+  net(15 name($I39)
   rect(l11 (14550 2950) (900 300))
  )

--- a/testdata/lvs/ringo_simple_with_tol.lvsdb.2
+++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
+++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
@ -199,7 +199,7 @@ layout(
   rect(l11 (-150 -150) (300 300))
  )
  net(7 name(SUBSTRATE))
-  net(8 name($I3)
+  net(8 name($I5)
   rect(l6 (975 1660) (425 950))
   rect(l6 (-400 -950) (425 950))
  )
--- a/testdata/lvs/test_22a.lvsdb.2
+++ b/testdata/lvs/test_22a.lvsdb.2
@ -832,16 +832,16 @@ layout(
   rect(l24 (2030 -150) (150 150))
   rect(l24 (2030 -150) (150 150))
  )
-  net(27
+  net(27 name($28)
   polygon(l7 (955 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(28
+  net(28 name($29)
   polygon(l7 (7495 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(29
+  net(29 name($30)
   polygon(l7 (3135 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(30
+  net(30 name($31)
   polygon(l7 (5315 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
  net(31 name('wl[1]')
@ -893,7 +893,7 @@ layout(
   rect(l24 (2030 -150) (150 150))
   rect(l24 (2030 -150) (150 150))
  )
-  net(32
+  net(32 name($33)
   polygon(l2 (395 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -904,12 +904,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(33
+  net(33 name($34)
   rect(l7 (940 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(34
+  net(34 name($35)
   polygon(l2 (1365 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -920,7 +920,7 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(35
+  net(35 name($36)
   polygon(l2 (2575 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -931,12 +931,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(36
+  net(36 name($37)
   rect(l7 (3120 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(37
+  net(37 name($38)
   polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -947,12 +947,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(38
+  net(38 name($39)
   rect(l7 (5300 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(39
+  net(39 name($40)
   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -963,7 +963,7 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(40
+  net(40 name($41)
   polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -974,12 +974,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(41
+  net(41 name($42)
   rect(l7 (7480 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(42
+  net(42 name($43)
   polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -990,29 +990,29 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(43
+  net(43 name($44)
   polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(44
+  net(44 name($45)
   polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(45
+  net(45 name($46)
   polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(46
+  net(46 name($47)
   polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(47
+  net(47 name($49)
   rect(l7 (290 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(48
+  net(48 name($50)
   rect(l7 (2470 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(49
+  net(49 name($51)
   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -1023,12 +1023,12 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(50
+  net(50 name($52)
   rect(l7 (4650 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(51
+  net(51 name($53)
   rect(l7 (6830 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
--- a/testdata/lvs/test_22b.lvsdb.2
+++ b/testdata/lvs/test_22b.lvsdb.2
@ -832,16 +832,16 @@ layout(
   rect(l24 (2030 -150) (150 150))
   rect(l24 (2030 -150) (150 150))
  )
-  net(27
+  net(27 name($28)
   polygon(l7 (955 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(28
+  net(28 name($29)
   polygon(l7 (7495 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(29
+  net(29 name($30)
   polygon(l7 (3135 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
-  net(30
+  net(30 name($31)
   polygon(l7 (5315 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
  )
  net(31 name('wl[1]')
@ -893,7 +893,7 @@ layout(
   rect(l24 (2030 -150) (150 150))
   rect(l24 (2030 -150) (150 150))
  )
-  net(32
+  net(32 name($33)
   polygon(l2 (395 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -904,12 +904,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(33
+  net(33 name($34)
   rect(l7 (940 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(34
+  net(34 name($35)
   polygon(l2 (1365 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -920,7 +920,7 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(35
+  net(35 name($36)
   polygon(l2 (2575 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -931,12 +931,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(36
+  net(36 name($37)
   rect(l7 (3120 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(37
+  net(37 name($38)
   polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -947,12 +947,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(38
+  net(38 name($39)
   rect(l7 (5300 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(39
+  net(39 name($40)
   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -963,7 +963,7 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(40
+  net(40 name($41)
   polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
   rect(l2 (-525 1670) (445 420))
   polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@ -974,12 +974,12 @@ layout(
   rect(l22 (0 -270) (950 150))
   rect(l22 (0 -840) (150 2010))
  )
-  net(41
+  net(41 name($42)
   rect(l7 (7480 3965) (950 150))
   rect(l7 (-1280 -150) (330 270))
   rect(l7 (950 -960) (150 2010))
  )
-  net(42
+  net(42 name($43)
   polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -990,29 +990,29 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(43
+  net(43 name($44)
   polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(44
+  net(44 name($45)
   polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(45
+  net(45 name($46)
   polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(46
+  net(46 name($47)
   polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
  )
-  net(47
+  net(47 name($49)
   rect(l7 (290 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(48
+  net(48 name($50)
   rect(l7 (2470 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(49
+  net(49 name($51)
   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
   rect(l2 (-340 1670) (445 420))
   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@ -1023,12 +1023,12 @@ layout(
   rect(l22 (-1100 -1320) (150 2010))
   rect(l22 (950 -960) (330 270))
  )
-  net(50
+  net(50 name($52)
   rect(l7 (4650 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))
  )
-  net(51
+  net(51 name($53)
   rect(l7 (6830 4445) (950 150))
   rect(l7 (-1100 -1320) (150 2010))
   rect(l7 (950 -960) (330 270))