@@ -182,15 +182,15 @@ def test_2_ShapesFromNet
182182end;
183183circuit RINGO ();
184184 subcircuit INV2 $1 (OUT='FB,OSC',$2=VSS,$3=VDD);
185- subcircuit INV2 $2 (OUT=$I20 ,$2=VSS,$3=VDD);
186- subcircuit INV2 $3 (OUT=$I19 ,$2=VSS,$3=VDD);
187- subcircuit INV2 $4 (OUT=$I21 ,$2=VSS,$3=VDD);
188- subcircuit INV2 $5 (OUT=$I22 ,$2=VSS,$3=VDD);
185+ subcircuit INV2 $2 (OUT=$I27 ,$2=VSS,$3=VDD);
186+ subcircuit INV2 $3 (OUT=$I26 ,$2=VSS,$3=VDD);
187+ subcircuit INV2 $4 (OUT=$I25 ,$2=VSS,$3=VDD);
188+ subcircuit INV2 $5 (OUT=$I24 ,$2=VSS,$3=VDD);
189189 subcircuit INV2 $6 (OUT=$I23,$2=VSS,$3=VDD);
190- subcircuit INV2 $7 (OUT=$I24 ,$2=VSS,$3=VDD);
191- subcircuit INV2 $8 (OUT=$I25 ,$2=VSS,$3=VDD);
192- subcircuit INV2 $9 (OUT=$I26 ,$2=VSS,$3=VDD);
193- subcircuit INV2 $10 (OUT=$I27 ,$2=VSS,$3=VDD);
190+ subcircuit INV2 $7 (OUT=$I22 ,$2=VSS,$3=VDD);
191+ subcircuit INV2 $8 (OUT=$I21 ,$2=VSS,$3=VDD);
192+ subcircuit INV2 $9 (OUT=$I20 ,$2=VSS,$3=VDD);
193+ subcircuit INV2 $10 (OUT=$I19 ,$2=VSS,$3=VDD);
194194end;
195195END
196196
@@ -206,7 +206,7 @@ def test_2_ShapesFromNet
206206 n = l2n . probe_net ( rmetal1 , RBA ::Point ::new ( 2600 , 1000 ) , sc_path )
207207 assert_equal ( n . to_s , "INV2:$2" )
208208 assert_equal ( sc_path . size , 1 )
209- assert_equal ( sc_path . collect ( &:expanded_name ) . join ( "," ) , "$2 " )
209+ assert_equal ( sc_path . collect ( &:expanded_name ) . join ( "," ) , "$9 " )
210210 assert_equal ( sc_path . collect ( &:trans ) . inject ( &:* ) . to_s , "r0 *1 2.64,0" )
211211
212212 assert_equal ( l2n . shapes_of_net ( n , rmetal1 , true ) . to_s ,
@@ -287,16 +287,16 @@ def test_10_LayoutToNetlistExtractionWithoutDevices
287287 subcircuit TRANS $4 ($1=$4,$2=OUT,$3=$2);
288288end;
289289circuit RINGO ();
290- subcircuit INV2 $1 (IN=$I8 ,$2=FB,OUT=OSC,$4=VSS,$5=VDD);
290+ subcircuit INV2 $1 (IN=$I18 ,$2=FB,OUT=OSC,$4=VSS,$5=VDD);
291291 subcircuit INV2 $2 (IN=FB,$2=$I38,OUT=$I19,$4=VSS,$5=VDD);
292- subcircuit INV2 $3 (IN=$I19 ,$2=$I39 ,OUT=$I1 ,$4=VSS,$5=VDD);
293- subcircuit INV2 $4 (IN=$I1 ,$2=$I40 ,OUT=$I2 ,$4=VSS,$5=VDD);
294- subcircuit INV2 $5 (IN=$I2 ,$2=$I41 ,OUT=$I3 ,$4=VSS,$5=VDD);
295- subcircuit INV2 $6 (IN=$I3 ,$2=$I42 ,OUT=$I4 ,$4=VSS,$5=VDD);
296- subcircuit INV2 $7 (IN=$I4 ,$2=$I43 ,OUT=$I5 ,$4=VSS,$5=VDD);
297- subcircuit INV2 $8 (IN=$I5 ,$2=$I44 ,OUT=$I6 ,$4=VSS,$5=VDD);
298- subcircuit INV2 $9 (IN=$I6 ,$2=$I45 ,OUT=$I7 ,$4=VSS,$5=VDD);
299- subcircuit INV2 $10 (IN=$I7 ,$2=$I46 ,OUT=$I8 ,$4=VSS,$5=VDD);
292+ subcircuit INV2 $3 (IN=$I17 ,$2=$I46 ,OUT=$I18 ,$4=VSS,$5=VDD);
293+ subcircuit INV2 $4 (IN=$I16 ,$2=$I45 ,OUT=$I17 ,$4=VSS,$5=VDD);
294+ subcircuit INV2 $5 (IN=$I15 ,$2=$I44 ,OUT=$I16 ,$4=VSS,$5=VDD);
295+ subcircuit INV2 $6 (IN=$I14 ,$2=$I43 ,OUT=$I15 ,$4=VSS,$5=VDD);
296+ subcircuit INV2 $7 (IN=$I13 ,$2=$I42 ,OUT=$I14 ,$4=VSS,$5=VDD);
297+ subcircuit INV2 $8 (IN=$I12 ,$2=$I41 ,OUT=$I13 ,$4=VSS,$5=VDD);
298+ subcircuit INV2 $9 (IN=$I11 ,$2=$I40 ,OUT=$I12 ,$4=VSS,$5=VDD);
299+ subcircuit INV2 $10 (IN=$I19 ,$2=$I39 ,OUT=$I11 ,$4=VSS,$5=VDD);
300300end;
301301END
302302
@@ -369,16 +369,16 @@ def test_11_LayoutToNetlistExtractionWithDevices
369369
370370 assert_equal ( l2n . netlist . to_s , <<END )
371371circuit RINGO ();
372- subcircuit INV2 $1 (IN=$I8 ,$2=FB,OUT=OSC,$4=VSS,$5=VDD);
372+ subcircuit INV2 $1 (IN=$I18 ,$2=FB,OUT=OSC,$4=VSS,$5=VDD);
373373 subcircuit INV2 $2 (IN=FB,$2=$I38,OUT=$I19,$4=VSS,$5=VDD);
374- subcircuit INV2 $3 (IN=$I19 ,$2=$I39 ,OUT=$I1 ,$4=VSS,$5=VDD);
375- subcircuit INV2 $4 (IN=$I1 ,$2=$I40 ,OUT=$I2 ,$4=VSS,$5=VDD);
376- subcircuit INV2 $5 (IN=$I2 ,$2=$I41 ,OUT=$I3 ,$4=VSS,$5=VDD);
377- subcircuit INV2 $6 (IN=$I3 ,$2=$I42 ,OUT=$I4 ,$4=VSS,$5=VDD);
378- subcircuit INV2 $7 (IN=$I4 ,$2=$I43 ,OUT=$I5 ,$4=VSS,$5=VDD);
379- subcircuit INV2 $8 (IN=$I5 ,$2=$I44 ,OUT=$I6 ,$4=VSS,$5=VDD);
380- subcircuit INV2 $9 (IN=$I6 ,$2=$I45 ,OUT=$I7 ,$4=VSS,$5=VDD);
381- subcircuit INV2 $10 (IN=$I7 ,$2=$I46 ,OUT=$I8 ,$4=VSS,$5=VDD);
374+ subcircuit INV2 $3 (IN=$I17 ,$2=$I46 ,OUT=$I18 ,$4=VSS,$5=VDD);
375+ subcircuit INV2 $4 (IN=$I16 ,$2=$I45 ,OUT=$I17 ,$4=VSS,$5=VDD);
376+ subcircuit INV2 $5 (IN=$I15 ,$2=$I44 ,OUT=$I16 ,$4=VSS,$5=VDD);
377+ subcircuit INV2 $6 (IN=$I14 ,$2=$I43 ,OUT=$I15 ,$4=VSS,$5=VDD);
378+ subcircuit INV2 $7 (IN=$I13 ,$2=$I42 ,OUT=$I14 ,$4=VSS,$5=VDD);
379+ subcircuit INV2 $8 (IN=$I12 ,$2=$I41 ,OUT=$I13 ,$4=VSS,$5=VDD);
380+ subcircuit INV2 $9 (IN=$I11 ,$2=$I40 ,OUT=$I12 ,$4=VSS,$5=VDD);
381+ subcircuit INV2 $10 (IN=$I19 ,$2=$I39 ,OUT=$I11 ,$4=VSS,$5=VDD);
382382end;
383383circuit INV2 (IN=IN,$2=$2,OUT=OUT,$4=$4,$5=$5);
384384 device PMOS $1 (S=$2,G=IN,D=$5) (L=0.25,W=0.95,AS=0.49875,AD=0.26125,PS=2.95,PD=1.5);
@@ -485,11 +485,11 @@ def test_12_LayoutToNetlistExtractionWithDevicesAndGlobalNets
485485
486486 assert_equal ( l2n . netlist . to_s , <<END )
487487circuit RINGO ();
488- subcircuit INV2PAIR $1 (BULK=VSS,$2=FB,$3=VDD,$4=VSS,$5=$I11 ,$6=OSC,$7=VDD);
488+ subcircuit INV2PAIR $1 (BULK=VSS,$2=FB,$3=VDD,$4=VSS,$5=$I16 ,$6=OSC,$7=VDD);
489489 subcircuit INV2PAIR $2 (BULK=VSS,$2=$I22,$3=VDD,$4=VSS,$5=FB,$6=$I17,$7=VDD);
490- subcircuit INV2PAIR $3 (BULK=VSS,$2=$I23 ,$3=VDD,$4=VSS,$5=$I17 ,$6=$I9 ,$7=VDD);
491- subcircuit INV2PAIR $4 (BULK=VSS,$2=$I24,$3=VDD,$4=VSS,$5=$I9 ,$6=$I10 ,$7=VDD);
492- subcircuit INV2PAIR $5 (BULK=VSS,$2=$I25 ,$3=VDD,$4=VSS,$5=$I10 ,$6=$I11 ,$7=VDD);
490+ subcircuit INV2PAIR $3 (BULK=VSS,$2=$I25 ,$3=VDD,$4=VSS,$5=$I15 ,$6=$I16 ,$7=VDD);
491+ subcircuit INV2PAIR $4 (BULK=VSS,$2=$I24,$3=VDD,$4=VSS,$5=$I14 ,$6=$I15 ,$7=VDD);
492+ subcircuit INV2PAIR $5 (BULK=VSS,$2=$I23 ,$3=VDD,$4=VSS,$5=$I17 ,$6=$I14 ,$7=VDD);
493493end;
494494circuit INV2PAIR (BULK=BULK,$2=$I8,$3=$I6,$4=$I5,$5=$I3,$6=$I2,$7=$I1);
495495 subcircuit INV2 $1 ($1=$I1,IN=$I3,$3=$I7,OUT=$I4,VSS=$I5,VDD=$I6,BULK=BULK);
@@ -515,11 +515,11 @@ def test_12_LayoutToNetlistExtractionWithDevicesAndGlobalNets
515515
516516 assert_equal ( l2n . netlist . to_s , <<END )
517517circuit RINGO (FB=FB,OSC=OSC,VDD=VDD,VSS=VSS);
518- subcircuit INV2PAIR $1 (BULK=VSS,$2=FB,$3=VDD,$4=VSS,$5=$I11 ,$6=OSC,$7=VDD);
518+ subcircuit INV2PAIR $1 (BULK=VSS,$2=FB,$3=VDD,$4=VSS,$5=$I16 ,$6=OSC,$7=VDD);
519519 subcircuit INV2PAIR $2 (BULK=VSS,$2=$I22,$3=VDD,$4=VSS,$5=FB,$6=$I17,$7=VDD);
520- subcircuit INV2PAIR $3 (BULK=VSS,$2=$I23 ,$3=VDD,$4=VSS,$5=$I17 ,$6=$I9 ,$7=VDD);
521- subcircuit INV2PAIR $4 (BULK=VSS,$2=$I24,$3=VDD,$4=VSS,$5=$I9 ,$6=$I10 ,$7=VDD);
522- subcircuit INV2PAIR $5 (BULK=VSS,$2=$I25 ,$3=VDD,$4=VSS,$5=$I10 ,$6=$I11 ,$7=VDD);
520+ subcircuit INV2PAIR $3 (BULK=VSS,$2=$I25 ,$3=VDD,$4=VSS,$5=$I15 ,$6=$I16 ,$7=VDD);
521+ subcircuit INV2PAIR $4 (BULK=VSS,$2=$I24,$3=VDD,$4=VSS,$5=$I14 ,$6=$I15 ,$7=VDD);
522+ subcircuit INV2PAIR $5 (BULK=VSS,$2=$I23 ,$3=VDD,$4=VSS,$5=$I17 ,$6=$I14 ,$7=VDD);
523523end;
524524circuit INV2PAIR (BULK=BULK,$2=$I8,$3=$I6,$4=$I5,$5=$I3,$6=$I2,$7=$I1);
525525 subcircuit INV2 $1 ($1=$I1,IN=$I3,$3=$I7,OUT=$I4,VSS=$I5,VDD=$I6,BULK=BULK);
0 commit comments