From 2a8f4c96104cb0fc5d9610a3725defd7db47e70b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 30 Aug 2019 10:52:51 +0200 Subject: [PATCH] Updated test data. --- .../dbLayoutToNetlistReaderTests.cc | 4 +- testdata/algo/l2n_reader_au_1.gds | Bin 18006 -> 20994 bytes testdata/algo/l2n_reader_au_2.gds | Bin 25780 -> 24930 bytes testdata/algo/l2n_reader_au_2r.gds | Bin 0 -> 25780 bytes testdata/algo/l2n_writer_au_2.txt | 91 ++++++------------ 5 files changed, 30 insertions(+), 65 deletions(-) create mode 100644 testdata/algo/l2n_reader_au_2r.gds diff --git a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc index 1b7bb5b4c..cf1b10997 100644 --- a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc +++ b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc @@ -317,7 +317,7 @@ TEST(2_ReaderWithGlobalNets) std::string au = tl::testsrc (); au = tl::combine_path (au, "testdata"); au = tl::combine_path (au, "algo"); - au = tl::combine_path (au, "l2n_reader_au_2.gds"); + au = tl::combine_path (au, "l2n_reader_au_2r.gds"); db::compare_layouts (_this, ly2, au); } @@ -374,7 +374,7 @@ TEST(3_ReaderAbsoluteCoordinates) std::string au = tl::testsrc (); au = tl::combine_path (au, "testdata"); au = tl::combine_path (au, "algo"); - au = tl::combine_path (au, "l2n_reader_au_2.gds"); + au = tl::combine_path (au, "l2n_reader_au_2r.gds"); db::compare_layouts (_this, ly2, au); } diff --git a/testdata/algo/l2n_reader_au_1.gds b/testdata/algo/l2n_reader_au_1.gds index 95598a9d637889cddcefc0a5fbfe8c03282c822d..2b85b42acbdaebea22df8912a3fc3ee4ec3ecf44 100644 GIT binary patch delta 2956 zcma);KWI}y9LMjyrfHkR+C-B!O`4ZHlm1!aOX&Y%k(v|{O-mFlL8*3i%4mlo4o*^( z19g&Gii3lYW|2)33vGs`yFnX>JU#Pn{fWT*J4^}E{mP_fi5-P&<}k)7J=d|;C_ynN=h(s+xW zobA5f@Uaqy-JXhOuFYL1wl+e7thP z=sgNszePL;ruebkCgOpzR;PslO}B4XDknQgRVtM?NSWkyy5wwU4mrX*)P4j~qOJQuJpn;SitJA`urn@~{2ZWBhY!W(d4|J~bHW(Z2 zpn-ORqTZYijr;XTV2L|`a0pJDghPPlhcuSLtVm&Yqy$-=7KSuEu*4leI0UCn!XdC! zb3hx+3SxG&6BP9(9dft_D z@;dz)M2!1@@GP=dF?hEUwb#4K|BE4b~7O8b+fo)6+ zVtT{`d7W9L*0}`;i}Z>~SX8@JEf#nmOpAV)9{mJGy*Z0NA6X;O1a4O(bI6TA7|oST z!YD%vevPFtI8qQnN|4oQ-mmGIL+%5@XRc%tKAFSXQ$ZWd4Z;KM1Vz0$pJF`ReY)`% zQ89O3y7hSag(CUAQ2Xbbox$5v%w9Z_{KP5Vo*9sBy}a~ZrMqdDI!x$V+UscGJtrKkR5U-a^(hIZx-#fo5l>h($ delta 1118 zcmZo#!g#HRQHg<#fr%-CL57iu{V@X*12Y3JgE)g4GJB$uvM6?ms6-qR7vix?Om<TC{8JC_3%((1fVZo)RiUpURcPz0ue44zP>djo3cAuiAq*lyG=f!^ogFa_@xGp}_Oj>mJn#4Ye&6@3ers$@rFaV=giQ<^hd%jPnYnd zZkMj;PwP7gL)vjO^L{k;W6~4TzlwR%#%#nu{=&ee{DhhxE2N?dk}(ORo)iUR3rk}&_0_hfUD^#G52wy^TZ0q=lsLzKB z2ZZ0rh*%4W*l2G-uTz2^NcR()mh?jEY0;4xwgY=`T@7Mgjo@3SUB9{wHjH-}2@evL z!w0t_Ydled<|8YRnu0jp@yn*-j2ZqRC1EFCpt8t|{uDm1E-D55o`QZ5Yyf^Rvr z0r${T2yT-XD1;Q!5DHD{p==-!LZLkrdh@lHU=j$${fPlMWowQhw*nZKkhkaND{JGYtdx z)Yl2Ts@sy|hI87x0;?lr&@N1n-KRNO^VQ16|J8=T=pGru@0Bcm9VmJ;tQ*>6**k^b zh8}xotXttJNs#&{BJ_LGJA;!w3B0fOVa3pKK9i0^QO3Nd8z*F;eth9% zz1gleTIFI1?SX~+%)_O2-R_XViM~a|cP2#6RE$=PDM?+`D(o=6It<`Kx z5ok9@265FiaJ`VjL-}n1>u_NL2SyWRpH-yi&%LutbM@nReaOI>(J|aAY!|%e7bT=o zYqpD}gT)G5?ny<<0FjtN@46&FG=>}D3~jL>309rIdyMo83?)Yy2L7#SdTB>!GnE{u zI)0<{y)Iv%;b{OHd;bJbzuH9}r%2h))IQT@Nj1h+|6^>9JTBF6Db_y@pxvQFlVNxh zAowEyM;@0=PW}vlG%1;)c8`+(*hL;EO-`oHp)KaD?_u!}q{o$pd@icRgk$fz87JaWaRHXYZSjH+H^RF2Y4oT94JluwV+lkRleG=5^5 zm`f+n$dBR2qoUUTY3z&q%lmfvV6luN*%WPajl4tmYGL}S{qZnlFxu;w=A^81{@s3@Af_&_MRkPt^>GH8Niig%~~6uk$lMeyX5E|U-Fv{ zd1{h6Ps~Uo-eu5Rm+cyTEm$D|D>OMLdbDm;-b#31W!Arkg{dRUKZ^`=AD$Mys@Fa` zhAW*^BpTnn#!&AhFx!4jP{X12goMvJL1`M-I>Q)lCoZ?c_(P}KHE}jdcey$n?hZJ; Q;|@4&NXI4g0H`WF2OTt-V*mgE diff --git a/testdata/algo/l2n_reader_au_2r.gds b/testdata/algo/l2n_reader_au_2r.gds new file mode 100644 index 0000000000000000000000000000000000000000..70dbdd3ded1c774ac0320f749e41007edbc3e4ee GIT binary patch literal 25780 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 BgVq25 literal 0 HcmV?d00001 diff --git a/testdata/algo/l2n_writer_au_2.txt b/testdata/algo/l2n_writer_au_2.txt index c232887a5..2c615dffc 100644 --- a/testdata/algo/l2n_writer_au_2.txt +++ b/testdata/algo/l2n_writer_au_2.txt @@ -264,12 +264,6 @@ circuit(INV2PAIR rect(diff_cont (-220 180) (220 220)) ) net(3 - rect(diff_cont (790 3290) (220 220)) - rect(diff_cont (-220 180) (220 220)) - rect(diff_cont (-220 -3420) (220 220)) - rect(diff_cont (-220 180) (220 220)) - ) - net(4 rect(diff_cont (4230 3290) (220 220)) rect(diff_cont (-220 180) (220 220)) rect(diff_cont (-220 -220) (220 220)) @@ -283,7 +277,7 @@ circuit(INV2PAIR rect(metal1 (-3000 -760) (360 760)) rect(metal1 (-360 -760) (360 760)) ) - net(5 + net(4 rect(diff_cont (4230 490) (220 220)) rect(diff_cont (-220 180) (220 220)) rect(diff_cont (-220 -220) (220 220)) @@ -297,47 +291,46 @@ circuit(INV2PAIR rect(metal1 (-3000 -760) (360 760)) rect(metal1 (-360 -760) (360 760)) ) - net(6 + net(5 rect(diff_cont (2390 3690) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) rect(diff_cont (-220 -620) (220 220)) ) - net(7) - net(8 + net(6) + net(7 rect(diff_cont (5030 3690) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) rect(diff_cont (-220 -620) (220 220)) ) - net(9) + net(8) # Outgoing pins and their connections to nets pin(1 name(BULK)) pin(2) + pin(3) pin(4) - pin(5) + pin(6) pin(7) pin(8) - pin(9) # Subcircuits and their connections circuit(1 INV2 location(1700 800) - pin(0 9) - pin(1 7) - pin(2 3) - pin(3 6) - pin(4 5) - pin(5 4) + pin(0 8) + pin(1 6) + pin(3 5) + pin(4 4) + pin(5 3) pin(6 1) ) circuit(2 INV2 location(4340 800) - pin(0 9) - pin(1 6) + pin(0 8) + pin(1 5) pin(2 2) - pin(3 8) - pin(4 5) - pin(5 4) + pin(3 7) + pin(4 4) + pin(5 3) pin(6 1) ) @@ -515,48 +508,24 @@ circuit(RINGO rect(metal2_lbl (-21301 -381) (2 2)) ) net(5 - rect(diff_cont (17570 2490) (220 220)) - rect(diff_cont (-220 180) (220 220)) - rect(diff_cont (-220 -3420) (220 220)) - rect(diff_cont (-220 180) (220 220)) - ) - net(6 - rect(diff_cont (12290 2490) (220 220)) - rect(diff_cont (-220 180) (220 220)) - rect(diff_cont (-220 -3420) (220 220)) - rect(diff_cont (-220 180) (220 220)) - ) - net(7 - rect(diff_cont (7010 2490) (220 220)) - rect(diff_cont (-220 180) (220 220)) - rect(diff_cont (-220 -3420) (220 220)) - rect(diff_cont (-220 180) (220 220)) - ) - net(8 - rect(diff_cont (1730 2490) (220 220)) - rect(diff_cont (-220 180) (220 220)) - rect(diff_cont (-220 -3420) (220 220)) - rect(diff_cont (-220 180) (220 220)) - ) - net(9 rect(diff_cont (3330 2890) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) rect(diff_cont (-220 -620) (220 220)) ) - net(10 + net(6 rect(diff_cont (19170 2890) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) rect(diff_cont (-220 -620) (220 220)) ) - net(11 + net(7 rect(diff_cont (13890 2890) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) rect(diff_cont (-220 -620) (220 220)) ) - net(12 + net(8 rect(diff_cont (8610 2890) (220 220)) rect(diff_cont (-220 -620) (220 220)) rect(diff_cont (-220 -2620) (220 220)) @@ -575,44 +544,40 @@ circuit(RINGO pin(1 1) pin(2 3) pin(3 4) - pin(4 10) + pin(4 6) pin(5 2) pin(6 3) ) circuit(2 INV2PAIR location(-1700 -800) pin(0 4) - pin(1 8) pin(2 3) pin(3 4) pin(4 1) - pin(5 9) + pin(5 5) pin(6 3) ) circuit(3 INV2PAIR location(3580 -800) pin(0 4) - pin(1 7) pin(2 3) pin(3 4) - pin(4 9) - pin(5 12) + pin(4 5) + pin(5 8) pin(6 3) ) circuit(4 INV2PAIR location(8860 -800) pin(0 4) - pin(1 6) pin(2 3) pin(3 4) - pin(4 12) - pin(5 11) + pin(4 8) + pin(5 7) pin(6 3) ) circuit(5 INV2PAIR location(14140 -800) pin(0 4) - pin(1 5) pin(2 3) pin(3 4) - pin(4 11) - pin(5 10) + pin(4 7) + pin(5 6) pin(6 3) )