Including internal net names in LVS DB

Problem: so far, these names have not been conveyed.
But after the net IDs changed in the LVS DB (renumbering),
the names should be retained. Otherwise it is difficult to
relate log level entries or Spice netlists to them.

src/db/db/dbLayoutToNetlistWriter.cc

@@ -692,6 +692,8 @@ void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Net &net,
             *outp << tl::to_string (id);
             if (! net.name ().empty ()) {
               TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.name ());
+            } else if (net.id () != id) {
+              TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.expanded_name ());
             }
 
             *outp << endl;

src/lvs/unit_tests/lvsTests.cc

@@ -154,7 +154,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_4.lvsdb");
+  run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_5.lvsdb");
 }
 
 TEST(18_private)
@@ -177,7 +177,7 @@ TEST(20_private)
 
 TEST(21_private)
 {
-  run_test (_this, "test_21.lylvs", "test_21.cir.gz", "test_21.gds.gz", true, "test_21_5.lvsdb");
+  run_test (_this, "test_21.lylvs", "test_21.cir.gz", "test_21.gds.gz", true, "test_21_6.lvsdb");
 }
 
 //  issue #1021

testdata/lvs/bbdevices1.lvsdb

@@ -210,7 +210,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -224,7 +224,7 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($8)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices1b.lvsdb

@@ -140,7 +140,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -154,7 +154,7 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($8)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices2.lvsdb

@@ -220,7 +220,7 @@ layout(
   net(4
    rect(l2 (822690 427000) (63970 82000))
   )
-  net(5
+  net(5 name($7)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -234,13 +234,13 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(6
+  net(6 name($10)
    rect(l14 (-126000 -195000) (292000 25000))
   )
-  net(7
+  net(7 name($12)
    rect(l14 (-410240 -216150) (83240 87150))
   )
-  net(8
+  net(8 name($13)
    rect(l14 (846960 -242000) (77190 75500))
   )
 

testdata/lvs/bbdevices2b.lvsdb

@@ -150,7 +150,7 @@ layout(
   net(4
    rect(l2 (822690 427000) (63970 82000))
   )
-  net(5
+  net(5 name($7)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -164,13 +164,13 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(6
+  net(6 name($10)
    rect(l14 (-126000 -195000) (292000 25000))
   )
-  net(7
+  net(7 name($12)
    rect(l14 (-410240 -216150) (83240 87150))
   )
-  net(8
+  net(8 name($13)
    rect(l14 (846960 -242000) (77190 75500))
   )
 

testdata/lvs/bbdevices3.lvsdb

@@ -210,7 +210,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -224,7 +224,7 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($8)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices3b.lvsdb

@@ -140,7 +140,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -154,7 +154,7 @@ layout(
    rect(l14 (-270500 7500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($8)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices4.lvsdb

@@ -207,7 +207,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -220,7 +220,7 @@ layout(
    rect(l14 (-25000 -193000) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($7)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices4b.lvsdb

@@ -137,7 +137,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -150,7 +150,7 @@ layout(
    rect(l14 (-25000 -193000) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(4
+  net(4 name($7)
    rect(l14 (-126000 -195000) (292000 25000))
   )
 

testdata/lvs/bbdevices5.lvsdb

@@ -210,7 +210,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -224,10 +224,10 @@ layout(
    rect(l14 (-24000 -225500) (118960 25000))
    rect(l14 (-182460 113000) (150000 150000))
   )
-  net(4
+  net(4 name($7)
    rect(l14 (-126000 -195000) (292000 25000))
   )
-  net(5
+  net(5 name($10)
    rect(l14 (509690 -219000) (113310 25000))
   )
 

testdata/lvs/bbdevices5b.lvsdb

@@ -140,7 +140,7 @@ layout(
   net(2
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($5)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -154,10 +154,10 @@ layout(
    rect(l14 (-24000 -225500) (118960 25000))
    rect(l14 (-182460 113000) (150000 150000))
   )
-  net(4
+  net(4 name($7)
    rect(l14 (-126000 -195000) (292000 25000))
   )
-  net(5
+  net(5 name($10)
    rect(l14 (509690 -219000) (113310 25000))
   )
 

testdata/lvs/custom_compare.lvsdb

@@ -38,12 +38,12 @@ layout(
   rect((0 0) (10255 5900))
 
   # Nets with their geometries
-  net(1
+  net(1 name($13)
    rect(l3 (4850 4600) (180 180))
    rect(l1 (-245 -250) (310 320))
    rect(l1 (0 -250) (200 250))
   )
-  net(2
+  net(2 name($14)
    rect(l3 (10010 3500) (180 180))
    rect(l1 (-245 -250) (310 320))
    rect(l1 (-510 -250) (200 250))

testdata/lvs/must_connect1.lvsdb

@@ -258,7 +258,7 @@ J(
   N(6 I(Q)
    R(l12 (13260 2010) (0 0))
   )
-  N(7
+  N(7 I($8)
    R(l10 (3450 4840) (3055 250))
    R(l10 (2885 -250) (1975 250))
   )

testdata/lvs/must_connect1_tl.lvsdb

@@ -258,7 +258,7 @@ J(
   N(6 I(Q)
    R(l12 (13260 2010) (0 0))
   )
-  N(7
+  N(7 I($8)
    R(l10 (3450 4840) (3055 250))
    R(l10 (2885 -250) (1975 250))
   )

testdata/lvs/must_connect3.lvsdb

@@ -240,21 +240,21 @@ J(
    R(l10 (-1975 -8190) (1975 575))
    R(l10 (-1005 -255) (0 0))
   )
-  N(3
+  N(3 I($I1)
    R(l3 (12950 2130) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(4
+  N(4 I($I2)
    R(l3 (12100 7300) (640 530))
    R(l7 (-540 -415) (270 250))
    R(l8 (-1695 -250) (1695 250))
    R(l8 (-4075 -5650) (2630 250))
    R(l8 (-250 0) (250 5150))
   )
-  N(5
+  N(5 I($I3)
    R(l7 (6465 7325) (220 240))
    R(l8 (-4100 -5365) (3125 250))
    R(l8 (-250 0) (250 4860))

testdata/lvs/res_combine1.lvsdb.1

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine1.lvsdb.2

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine1.lvsdb.3

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine1.lvsdb.4

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine1.lvsdb.5

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine1.lvsdb.6

@@ -68,7 +68,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.1

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.2

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.3

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.4

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.5

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine2.lvsdb.6

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.1

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.2

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.3

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.4

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.5

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/res_combine3.lvsdb.6

@@ -64,7 +64,7 @@ layout(
    rect(l1 (-22675 -1970) (540 2000))
    rect(l1 (-21840 -1605) (540 2000))
   )
-  net(2
+  net(2 name($5)
    rect(l4 (19795 5575) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))

testdata/lvs/ringo_device_subcircuits.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_device_subcircuits.lvsdb.2

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_layout_var.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_layout_var.lvsdb.2

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_mixed_hierarchy.lvsdb

@@ -308,31 +308,31 @@ layout(
    rect(l2 (950 -1500) (425 1500))
    rect(l6 (-425 -4890) (425 950))
   )
-  net(5
+  net(5 name($7)
    rect(l11 (5550 2950) (900 300))
   )
-  net(6
+  net(6 name($8)
    rect(l11 (7350 2950) (900 300))
   )
-  net(7
+  net(7 name($9)
    rect(l11 (9150 2950) (900 300))
   )
-  net(8
+  net(8 name($10)
    rect(l11 (10950 2950) (900 300))
   )
-  net(9
+  net(9 name($11)
    rect(l11 (12750 2950) (900 300))
   )
-  net(10
+  net(10 name($12)
    rect(l11 (14550 2950) (900 300))
   )
-  net(11
+  net(11 name($13)
    rect(l11 (16350 2950) (900 300))
   )
-  net(12
+  net(12 name($14)
    rect(l11 (18150 2950) (900 300))
   )
-  net(13
+  net(13 name($15)
    rect(l11 (19950 2950) (900 300))
   )
   net(14 name(OUT)
@@ -341,7 +341,7 @@ layout(
    rect(l13 (-100 -100) (0 0))
    rect(l13 (-200 -200) (400 400))
   )
-  net(15
+  net(15 name($21)
    rect(l6 (2775 1660) (450 950))
   )
   net(16 name(VSS)

testdata/lvs/ringo_simple.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple.lvsdb.2

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_blackboxing.lvsdb

@@ -169,22 +169,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))
   )
 

testdata/lvs/ringo_simple_blackboxing_netter.lvsdb

@@ -169,22 +169,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))
   )
 

testdata/lvs/ringo_simple_compare2.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_compare2.lvsdb.2

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_device_scaling.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_dummy_device.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    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)

testdata/lvs/ringo_simple_implicit_connections.lvsdb.1

@@ -202,7 +202,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_io.lvsdb.1

@@ -176,7 +176,7 @@ J(
    R(l11 (-150 -150) (300 300))
   )
   N(7 I(SUBSTRATE))
-  N(8
+  N(8 I($I3)
    R(l6 (975 1660) (425 950))
    R(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_io.lvsdb.2

@@ -176,7 +176,7 @@ J(
    R(l11 (-150 -150) (300 300))
   )
   N(7 I(SUBSTRATE))
-  N(8
+  N(8 I($I3)
    R(l6 (975 1660) (425 950))
    R(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_io2.l2n.1

@@ -175,7 +175,7 @@ X(ND2X1
   R(l11 (-150 -150) (300 300))
  )
  N(7 I(SUBSTRATE))
- N(8
+ N(8 I($I3)
   R(l6 (975 1660) (425 950))
   R(l6 (-400 -950) (425 950))
  )

testdata/lvs/ringo_simple_io2.l2n.2

@@ -175,7 +175,7 @@ X(ND2X1
   R(l11 (-150 -150) (300 300))
  )
  N(7 I(SUBSTRATE))
- N(8
+ N(8 I($I3)
   R(l6 (975 1660) (425 950))
   R(l6 (-400 -950) (425 950))
  )

testdata/lvs/ringo_simple_io2.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_io2.lvsdb.2

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_pin_swapping.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_same_device_classes.lvsdb.1

@@ -201,7 +201,7 @@ layout(
    rect(l17 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l9 (975 1660) (425 950))
    rect(l9 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l9 (975 1660) (425 950))
    rect(l9 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_simplification.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    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))
   )
 

testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    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))
   )
 

testdata/lvs/ringo_simple_with_tol.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/ringo_simple_with_tol_early.lvsdb.1

@@ -199,7 +199,7 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

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
+  net(8 name($I3)
    rect(l6 (975 1660) (425 950))
    rect(l6 (-400 -950) (425 950))
   )

testdata/lvs/soft_connect3.l2n

@@ -81,13 +81,13 @@ X(NTRANS
   R(l12 (-290 -690) (360 760))
   R(l6 (-680 -855) (775 950))
  )
- N(2
+ N(2 I($3)
   R(l8 (290 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
   R(l6 (-455 -855) (775 950))
  )
- N(3
+ N(3 I($5)
   R(l4 (-125 -800) (250 1600))
  )
  N(4 I(SUBSTRATE))
@@ -117,13 +117,13 @@ X(PTRANS
   R(l12 (-290 -690) (360 760))
   R(l2 (-680 -855) (775 950))
  )
- N(2
+ N(2 I($3)
   R(l8 (290 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
   R(l2 (-455 -855) (775 950))
  )
- N(3
+ N(3 I($5)
   R(l4 (-125 -800) (250 1600))
  )
  N(4)

testdata/lvs/soft_connect4.l2n

@@ -108,12 +108,12 @@ X(INV
   R(l10 (-700 -950) (400 1000))
   R(l2 (-1875 -975) (775 950))
  )
- N(3
+ N(3 I($4)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))
  )
- N(4
+ N(4 I($5)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (-220 2180) (220 220))
@@ -170,7 +170,7 @@ X(TOP
   R(l12 (1810 2600) (690 400))
   R(l16 (-400 -200) (0 0))
  )
- N(4
+ N(4 I($5)
   R(l3 (4000 3400) (2700 2000))
  )
  N(5 I(SUBSTRATE))

testdata/lvs/soft_connect5.l2n

@@ -108,12 +108,12 @@ X(INV
   R(l10 (-700 -950) (400 1000))
   R(l2 (-1875 -975) (775 950))
  )
- N(3
+ N(3 I($4)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))
  )
- N(4
+ N(4 I($5)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (-220 2180) (220 220))

testdata/lvs/soft_connect6.l2n

@@ -104,7 +104,7 @@ X(INV
   R(l14 (-200 -900) (1000 900))
   R(l6 (-2175 -925) (775 950))
  )
- N(3
+ N(3 I($4)
   R(l3 (-1500 1800) (3000 2000))
   R(l3 (-200 -2000) (1000 2000))
   R(l8 (-2010 -1310) (220 220))
@@ -122,7 +122,7 @@ X(INV
   R(l10 (-700 -950) (400 1000))
   R(l2 (-1875 -975) (775 950))
  )
- N(4
+ N(4 I($6)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))

testdata/lvs/stray_texts1.l2n

@@ -27,10 +27,10 @@ X(CHILD
   J(l1 D (1820 510))
   R(l2 (-70 -90) (160 160))
  )
- N(5
+ N(5 I($8)
   R(l2 (2370 410) (170 200))
  )
- N(6
+ N(6 I($9)
   R(l2 (2910 430) (190 200))
  )
  P(1 I(A))

testdata/lvs/stray_texts2.l2n

@@ -25,10 +25,10 @@ X(CHILD
   R(l1 (1750 420) (160 160))
   R(l1 (-90 -70) (0 0))
  )
- N(5
+ N(5 I($6)
   R(l1 (2370 410) (170 200))
  )
- N(6
+ N(6 I($7)
   R(l1 (2910 430) (190 200))
  )
  P(1 I(A))

testdata/lvs/test_22a.lvsdb.1

@@ -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 (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))
@@ -963,34 +963,34 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(40
+  net(40 name($41)
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(41
+  net(41 name($42)
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(42
+  net(42 name($43)
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(43
+  net(43 name($44)
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(44 name($45)
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(45 name($47)
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(46
+  net(46 name($48)
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(47
+  net(47 name($49)
    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))
@@ -1001,12 +1001,12 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(48
+  net(48 name($50)
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(49
+  net(49 name($51)
    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))
@@ -1017,7 +1017,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(50
+  net(50 name($52)
    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))
@@ -1028,7 +1028,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (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))

testdata/lvs/test_22b.lvsdb.1

@@ -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 (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))
@@ -963,34 +963,34 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(40
+  net(40 name($41)
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(41
+  net(41 name($42)
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(42
+  net(42 name($43)
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(43
+  net(43 name($44)
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(44 name($45)
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(45 name($47)
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(46
+  net(46 name($48)
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(47
+  net(47 name($49)
    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))
@@ -1001,12 +1001,12 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(48
+  net(48 name($50)
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(49
+  net(49 name($51)
    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))
@@ -1017,7 +1017,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(50
+  net(50 name($52)
    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))
@@ -1028,7 +1028,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (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))

testdata/lvs/test_22c.lvsdb.1

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)

testdata/lvs/test_22c.lvsdb.2

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)

testdata/lvs/test_22c.lvsdb.3

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)

testdata/lvs/test_22d.lvsdb.1

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)

testdata/lvs/test_22d.lvsdb.2

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)

testdata/lvs/test_22d.lvsdb.3

@@ -265,7 +265,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l2 (-355 -210) (420 265))
   )
-  net(9
+  net(9 name($10)
    polygon(l7 (265 140) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
   net(10 name(vss)