luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating unit tests - stray text nets are gone.

This commit is contained in:
Matthias Koefferlein 2024-05-26 17:08:34 +02:00
parent 0c52934100
commit 35d9068f72
13 changed files with 1 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/dbHierNetworkProcessor.cc
View File

@ -2917,7 +2917,7 @@ hier_clusters<T>::build_hier_connections (cell_clusters_box_converter<T> &cbc, c
std::vector<typename local_cluster<T>::id_type> to_delete;
for (typename connected_clusters<T>::const_iterator c = local.begin (); c != local.end (); ++c) {
box_type bbox = c->bbox ();
if ((bbox.empty () || (bbox.width () == 0 && bbox.height () == 0)) && local.connections_for_cluster (c->id ()).empty ()) {
if ((bbox.empty () || (bbox.width () == 0 && bbox.height () == 0)) && c->get_global_nets ().empty () && local.connections_for_cluster (c->id ()).empty ()) {
to_delete.push_back (c->id ());
}
}

4
testdata/lvs/bbdevices1.cir vendored
View File

@ -47,7 +47,6 @@ X$14 4 BBGATEST
.SUBCKT BBGATEST 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -55,7 +54,6 @@ X$14 4 BBGATEST
.SUBCKT FBGATEST 1
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -63,7 +61,6 @@ X$14 4 BBGATEST
.SUBCKT FWBTEST 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST
* cell BWBTEST
@ -71,5 +68,4 @@ X$14 4 BBGATEST
.SUBCKT BWBTEST 2
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST

12
testdata/lvs/bbdevices1.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l15 (576500 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (754500 -114000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -82,9 +79,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -104,9 +98,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -126,9 +117,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))

4
testdata/lvs/bbdevices2.cir vendored
View File

@ -48,7 +48,6 @@ X$14 7 6 BBGATEST
.SUBCKT BBGATEST 1 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -57,7 +56,6 @@ X$14 7 6 BBGATEST
.SUBCKT FBGATEST 1 2
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -66,7 +64,6 @@ X$14 7 6 BBGATEST
.SUBCKT FWBTEST 1 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST
* cell BWBTEST
@ -75,5 +72,4 @@ X$14 7 6 BBGATEST
.SUBCKT BWBTEST 1 2
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST

12
testdata/lvs/bbdevices2.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l15 (576500 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (754500 -114000) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -83,9 +80,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -106,9 +100,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -129,9 +120,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))

4
testdata/lvs/bbdevices3.cir vendored
View File

@ -47,7 +47,6 @@ X$14 4 BBGATEST
.SUBCKT BBGATEST 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -55,7 +54,6 @@ X$14 4 BBGATEST
.SUBCKT FBGATEST 1
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -63,7 +61,6 @@ X$14 4 BBGATEST
.SUBCKT FWBTEST 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST
* cell BWBTEST
@ -71,5 +68,4 @@ X$14 4 BBGATEST
.SUBCKT BWBTEST 1
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST

12
testdata/lvs/bbdevices3.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l15 (830000 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (757500 -114000) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -82,9 +79,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -104,9 +98,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -126,9 +117,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))

4
testdata/lvs/bbdevices4.cir vendored
View File

@ -20,7 +20,6 @@ X$13 4 BBGATEST
.SUBCKT BWBTEST
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST
* cell FDPTEST
@ -52,7 +51,6 @@ X$13 4 BBGATEST
.SUBCKT BBGATEST 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -60,7 +58,6 @@ X$13 4 BBGATEST
.SUBCKT FBGATEST 1
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -68,5 +65,4 @@ X$13 4 BBGATEST
.SUBCKT FWBTEST 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST

12
testdata/lvs/bbdevices4.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -82,9 +79,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -104,9 +98,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -186,9 +177,6 @@ layout(
rect(l15 (576500 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (754500 -114000) (0 0))
)
)
circuit(testall

4
testdata/lvs/bbdevices5.cir vendored
View File

@ -47,7 +47,6 @@ X$14 5 BWBTEST
.SUBCKT BBGATEST 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -55,7 +54,6 @@ X$14 5 BWBTEST
.SUBCKT FBGATEST 1
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -63,7 +61,6 @@ X$14 5 BWBTEST
.SUBCKT FWBTEST 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST
* cell BWBTEST
@ -71,5 +68,4 @@ X$14 5 BWBTEST
.SUBCKT BWBTEST 2
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST

12
testdata/lvs/bbdevices5.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l15 (576500 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (754500 -114000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -82,9 +79,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -104,9 +98,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -126,9 +117,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))

4
testdata/lvs/bbdevices6.cir vendored
View File

@ -47,7 +47,6 @@ X$14 3 FBGATEST
.SUBCKT BBGATEST 2
* net 1 B
* net 2 A
* net 3 BBGATEST
.ENDS BBGATEST
* cell FBGATEST
@ -55,7 +54,6 @@ X$14 3 FBGATEST
.SUBCKT FBGATEST 1
* net 1 B
* net 2 A
* net 3 FBGATEST
.ENDS FBGATEST
* cell FWBTEST
@ -63,7 +61,6 @@ X$14 3 FBGATEST
.SUBCKT FWBTEST 2
* net 1 B
* net 2 A
* net 3 FWBTEST
.ENDS FWBTEST
* cell BWBTEST
@ -71,5 +68,4 @@ X$14 3 FBGATEST
.SUBCKT BWBTEST 2
* net 1 B
* net 2 A
* net 3 BWBTEST
.ENDS BWBTEST

12
testdata/lvs/bbdevices6.lvsdb vendored
View File

@ -60,9 +60,6 @@ layout(
rect(l15 (576500 -249000) (105500 81500))
rect(l15 (-52750 -40750) (0 0))
)
net(3 name(BWBTEST)
rect(l15 (754500 -114000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -82,9 +79,6 @@ layout(
rect(l3 (572500 432500) (74500 73500))
rect(l3 (-37250 -36750) (0 0))
)
net(3 name(FWBTEST)
rect(l3 (798000 565500) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))
@ -104,9 +98,6 @@ layout(
rect(l3 (-449500 422500) (146000 144500))
rect(l3 (-71000 -71250) (0 0))
)
net(3 name(FBGATEST)
rect(l3 (-417000 610500) (0 0))
)
# Outgoing pins and their connections to nets
pin(1 name(B))
@ -126,9 +117,6 @@ layout(
rect(l15 (-218500 -290000) (193000 203000))
rect(l15 (-94000 -101500) (0 0))
)
net(3 name(BBGATEST)
rect(l15 (-422000 -313000) (0 0))
)
# Outgoing pins and their connections to nets
pin(2 name(A))