new layout working in extracted sim

comparator/bsim4v5.out

diff --git a/comparator/bsim4v5.out b/comparator/bsim4v5.out
index fdfb3a3..a16e39c 100644
--- a/comparator/bsim4v5.out
+++ b/comparator/bsim4v5.out
@@ -2,4 +2,4 @@
 Developed by Xuemei (Jane) Xi, Mohan Dunga, Prof. Ali Niknejad and Prof. Chenming Hu in 2003.
 
 ++++++++++ BSIM4v5 PARAMETER CHECKING BELOW ++++++++++
-Model = xcomp.x1:sky130_fd_pr__pfet_01v8__model.59
+Model = xcomp.x0:sky130_fd_pr__nfet_g5v0d10v5__model.62

comparator/comparator.mag

diff --git a/comparator/comparator.mag b/comparator/comparator.mag
index e307e78..70d89f6 100644
--- a/comparator/comparator.mag
+++ b/comparator/comparator.mag
@@ -1,13 +1,22 @@
 magic
 tech sky130A
-timestamp 1632875854
+timestamp 1632880394
 << nwell >>
-rect 230 -310 730 220
+rect 210 -330 730 240
 rect 920 -770 1320 -140
 << pwell >>
 rect -250 -440 140 230
 rect -250 -1060 510 -440
 << nmos >>
+rect 280 -810 298 -710
+rect 350 -810 368 -710
+rect 60 -960 78 -860
+rect 190 -1030 205 -930
+<< pmos >>
+rect 980 -460 998 -160
+rect 1050 -460 1068 -160
+rect 980 -750 995 -550
+<< mvnmos >>
 rect 20 110 120 170
 rect 20 0 120 60
 rect 20 -190 120 -130
@@ -17,19 +26,62 @@
 rect 280 -560 340 -460
 rect 390 -560 450 -460
 rect 60 -760 120 -660
-rect 280 -810 298 -710
-rect 350 -810 368 -710
-rect 60 -960 78 -860
-rect 190 -1030 205 -930
-<< pmos >>
+<< mvpmos >>
 rect 250 110 400 160
 rect 250 10 400 60
 rect 250 -150 400 -100
 rect 250 -250 400 -200
-rect 980 -460 995 -160
-rect 1050 -460 1065 -160
-rect 980 -750 995 -550
 << ndiff >>
+rect 240 -720 280 -710
+rect 240 -800 250 -720
+rect 270 -800 280 -720
+rect 240 -810 280 -800
+rect 298 -720 350 -710
+rect 298 -800 310 -720
+rect 340 -800 350 -720
+rect 298 -810 350 -800
+rect 368 -720 410 -710
+rect 368 -800 380 -720
+rect 400 -800 410 -720
+rect 368 -810 410 -800
+rect 20 -870 60 -860
+rect 20 -950 30 -870
+rect 50 -950 60 -870
+rect 20 -960 60 -950
+rect 78 -870 120 -860
+rect 78 -950 90 -870
+rect 110 -950 120 -870
+rect 78 -960 120 -950
+rect 150 -940 190 -930
+rect 150 -1020 160 -940
+rect 180 -1020 190 -940
+rect 150 -1030 190 -1020
+rect 205 -940 250 -930
+rect 205 -1020 220 -940
+rect 240 -1020 250 -940
+rect 205 -1030 250 -1020
+<< pdiff >>
+rect 940 -170 980 -160
+rect 940 -450 950 -170
+rect 970 -450 980 -170
+rect 940 -460 980 -450
+rect 998 -170 1050 -160
+rect 998 -450 1010 -170
+rect 1040 -450 1050 -170
+rect 998 -460 1050 -450
+rect 1068 -170 1110 -160
+rect 1068 -450 1080 -170
+rect 1100 -450 1110 -170
+rect 1068 -460 1110 -450
+rect 940 -560 980 -550
+rect 940 -740 950 -560
+rect 970 -740 980 -560
+rect 940 -750 980 -740
+rect 995 -560 1040 -550
+rect 995 -740 1010 -560
+rect 1030 -740 1040 -560
+rect 995 -750 1040 -740
+<< mvndiff >>
 rect 20 200 120 210
 rect 20 180 30 200
 rect 110 180 120 200
@@ -82,35 +134,7 @@
 rect 120 -750 130 -670
 rect 150 -750 160 -670
 rect 120 -760 160 -750
-rect 240 -720 280 -710
-rect 240 -800 250 -720
-rect 270 -800 280 -720
-rect 240 -810 280 -800
-rect 298 -720 350 -710
-rect 298 -800 310 -720
-rect 340 -800 350 -720
-rect 298 -810 350 -800
-rect 368 -720 410 -710
-rect 368 -800 380 -720
-rect 400 -800 410 -720
-rect 368 -810 410 -800
-rect 20 -870 60 -860
-rect 20 -950 30 -870
-rect 50 -950 60 -870
-rect 20 -960 60 -950
-rect 78 -870 120 -860
-rect 78 -950 90 -870
-rect 110 -950 120 -870
-rect 78 -960 120 -950
-rect 150 -940 190 -930
-rect 150 -1020 160 -940
-rect 180 -1020 190 -940
-rect 150 -1030 190 -1020
-rect 205 -940 250 -930
-rect 205 -1020 220 -940
-rect 240 -1020 250 -940
-rect 205 -1030 250 -1020
-<< pdiff >>
+<< mvpdiff >>
 rect 250 190 400 200
 rect 250 170 260 190
 rect 390 170 400 190
@@ -135,27 +159,21 @@
 rect 250 -280 260 -260
 rect 390 -280 400 -260
 rect 250 -290 400 -280
-rect 940 -170 980 -160
-rect 940 -450 950 -170
-rect 970 -450 980 -170
-rect 940 -460 980 -450
-rect 995 -170 1050 -160
-rect 995 -450 1010 -170
-rect 1040 -450 1050 -170
-rect 995 -460 1050 -450
-rect 1065 -170 1110 -160
-rect 1065 -450 1080 -170
-rect 1100 -450 1110 -170
-rect 1065 -460 1110 -450
-rect 940 -560 980 -550
-rect 940 -740 950 -560
-rect 970 -740 980 -560
-rect 940 -750 980 -740
-rect 995 -560 1040 -550
-rect 995 -740 1010 -560
-rect 1030 -740 1040 -560
-rect 995 -750 1040 -740
 << ndiffc >>
+rect 250 -800 270 -720
+rect 310 -800 340 -720
+rect 380 -800 400 -720
+rect 30 -950 50 -870
+rect 90 -950 110 -870
+rect 160 -1020 180 -940
+rect 220 -1020 240 -940
+<< pdiffc >>
+rect 950 -450 970 -170
+rect 1010 -450 1040 -170
+rect 1080 -450 1100 -170
+rect 950 -740 970 -560
+rect 1010 -740 1030 -560
+<< mvndiffc >>
 rect 30 180 110 200
 rect 30 70 110 100
 rect 30 -30 110 -10
@@ -169,25 +187,13 @@
 rect 460 -550 480 -470
 rect 30 -750 50 -670
 rect 130 -750 150 -670
-rect 250 -800 270 -720
-rect 310 -800 340 -720
-rect 380 -800 400 -720
-rect 30 -950 50 -870
-rect 90 -950 110 -870
-rect 160 -1020 180 -940
-rect 220 -1020 240 -940
-<< pdiffc >>
+<< mvpdiffc >>
 rect 260 170 390 190
 rect 260 70 390 100
 rect 260 -20 390 0
 rect 260 -90 390 -70
 rect 260 -190 390 -160
 rect 260 -280 390 -260
-rect 950 -450 970 -170
-rect 1010 -450 1040 -170
-rect 1080 -450 1100 -170
-rect 950 -740 970 -560
-rect 1010 -740 1030 -560
 << psubdiff >>
 rect -230 195 -100 210
 rect -230 -1025 -215 195
@@ -235,10 +241,10 @@
 rect 400 -250 550 -200
 rect 980 -110 1020 -100
 rect 980 -130 990 -110
-rect 1010 -130 1065 -110
-rect 980 -140 1065 -130
-rect 980 -160 995 -140
-rect 1050 -160 1065 -140
+rect 1010 -130 1068 -110
+rect 980 -140 1068 -130
+rect 980 -160 998 -140
+rect 1050 -160 1068 -140
 rect 160 -360 210 -350
 rect 160 -370 170 -360
 rect 60 -390 170 -370
@@ -249,18 +255,23 @@
 rect 170 -460 230 -430
 rect 280 -460 340 -430
 rect 390 -460 450 -400
-rect 980 -490 995 -460
-rect 1050 -490 1065 -460
+rect 980 -490 998 -460
+rect 1050 -490 1068 -460
 rect 980 -550 995 -520
 rect 60 -590 120 -560
 rect 170 -590 230 -560
 rect 280 -580 340 -560
 rect 280 -590 300 -580
+rect -10 -610 30 -600
+rect -10 -630 0 -610
+rect 20 -620 30 -610
 rect 170 -610 300 -590
 rect 330 -610 340 -580
 rect 390 -590 450 -560
 rect 170 -620 340 -610
-rect 60 -660 120 -630
+rect 20 -630 120 -620
+rect -10 -640 120 -630
+rect 60 -660 120 -640
 rect 250 -660 310 -650
 rect 250 -680 260 -660
 rect 280 -680 310 -660
@@ -298,6 +309,7 @@
 rect 440 20 460 40
 rect 990 -130 1010 -110
 rect 170 -390 200 -360
+rect 0 -630 20 -610
 rect 300 -610 330 -580
 rect 260 -680 280 -660
 rect 365 -680 385 -660
@@ -349,7 +361,11 @@
 rect 130 -400 210 -390
 rect 310 -370 340 -290
 rect 310 -400 380 -370
+rect -10 -560 20 -460
 rect 130 -470 160 -400
+rect -10 -610 30 -560
+rect -10 -630 0 -610
+rect 20 -630 30 -610
 rect 130 -590 160 -550
 rect 350 -470 380 -400
 rect 940 -420 950 -170
@@ -361,6 +377,7 @@
 rect 130 -620 230 -590
 rect 280 -610 300 -580
 rect 330 -610 440 -580
+rect -10 -640 30 -630
 rect 200 -660 230 -620
 rect 400 -660 440 -610
 rect 200 -680 260 -660
@@ -535,14 +552,13 @@
 rect -110 -860 60 -850
 rect -110 -960 20 -860
 rect 50 -960 60 -860
-rect -110 -970 60 -960
+rect -110 -990 60 -960
 rect 80 -860 350 -850
 rect 80 -960 90 -860
 rect 120 -900 350 -860
 rect 120 -960 130 -900
 rect 80 -970 130 -960
 rect 210 -930 260 -920
-rect -110 -990 -100 -970
 rect -110 -1000 190 -990
 rect -110 -1040 150 -1000
 rect -400 -1050 150 -1040
@@ -571,6 +587,7 @@
 rect 1200 -1100 1400 -760
 << labels >>
 rlabel poly -30 -220 -10 -190 1 BIASN
+port 5 n
 rlabel metal1 -400 -1100 -100 -1080 1 VGND
 port 1 n
 rlabel metal1 600 -1100 800 -1080 1 VDD3v3
@@ -578,4 +595,18 @@
 rlabel metal1 1200 -1100 1400 -1080 1 VDD1v8
 port 3 n
 rlabel locali 1040 -990 1110 -940 1 VOUT
+port 4 n
+rlabel poly -10 110 0 170 1 VP
+port 7 n
+rlabel poly -10 0 0 60 1 VN
+port 6 n
+rlabel locali 540 -800 560 -780 1 VOPAMP
+rlabel locali 400 -650 420 -630 1 VOP
+rlabel locali 170 190 190 210 1 VPAMP
+rlabel locali 160 -30 180 -20 1 VNAMP
+rlabel locali 180 -260 190 -240 1 VON
+rlabel metal1 50 -70 80 -50 1 ISINK
+rlabel metal1 140 -650 150 -640 1 DECISINK
+rlabel locali 540 -900 570 -880 1 VONAMP
+rlabel metal1 140 -890 170 -860 1 DIFFSINK
 << end >>

comparator/comparator.spice

diff --git a/comparator/comparator.spice b/comparator/comparator.spice
index 6dadc5e..586c10a 100644
--- a/comparator/comparator.spice
+++ b/comparator/comparator.spice
@@ -1,28 +1,26 @@
 * SPICE3 file created from comparator.ext - technology: sky130A
 
-.subckt comparator VGND VDD3v3 VDD1v8
-X0 VGND BIASN a_20_n240# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X1 a_190_n1060# a_170_n620# a_78_n960# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X2 a_20_170# a_n10_110# a_20_n240# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X3 a_60_n590# a_20_n40# VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X4 VDD1v8 a_60_n990# a_60_n990# VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=150000u
-X5 a_20_n560# a_60_n590# a_170_n620# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X6 a_78_n960# a_60_n990# VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X7 a_20_170# a_20_170# VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X8 a_20_n240# a_n10_0# a_20_n40# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X9 a_20_n560# a_170_n620# a_60_n590# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X10 a_78_n960# a_60_n590# a_60_n990# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X11 a_20_n240# BIASN VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X12 a_60_n590# a_60_n590# a_20_n560# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X13 VOUT a_190_n1060# VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
-X14 VDD1v8 a_190_n1060# VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
-X15 VDD3v3 a_20_n40# a_20_n40# VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X16 a_170_n620# a_170_n620# a_20_n560# VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X17 a_190_n1060# a_60_n990# VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=150000u
-X18 VDD3v3 a_20_170# a_170_n620# VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X19 a_20_n560# a_60_n790# VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-C0 VOUT VGND 2.12fF
-C1 a_190_n1060# VGND 2.64fF
-C2 a_60_n990# VGND 2.45fF
-C3 a_60_n590# VGND 2.03fF
+.subckt comparator VGND VDD3v3 VDD1v8 VOUT BIASN VN VP
+X0 VPAMP VP ISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X1 VGND BIASN ISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X2 VOPAMP VOP DIFFSINK VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
+X3 VON VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X4 VDD1v8 VONAMP VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
+X5 DECISINK VON VOP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X6 ISINK VN VNAMP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X7 DECISINK VOP VON VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X8 DIFFSINK VONAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
+X9 VPAMP VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X10 ISINK BIASN VGND VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X11 DIFFSINK VON VONAMP VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
+X12 VON VON DECISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X13 VOUT VOPAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
+X14 VDD1v8 VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
+X15 VDD3v3 VNAMP VNAMP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X16 VOP VOP DECISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X17 VOPAMP VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
+X18 DECISINK DECISINK VGND VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X19 VDD3v3 VPAMP VOP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+C0 VOPAMP VGND 2.64fF
+C1 VON VGND 2.03fF
 .ends

comparator/simulation.spice

diff --git a/comparator/simulation.spice b/comparator/simulation.spice
index f958a92..70c3e1d 100644
--- a/comparator/simulation.spice
+++ b/comparator/simulation.spice
@@ -5,7 +5,7 @@
 
 
 * instantiate the comparator
-Xcomp VP VN BIASN VOUT VGND VDD3v3 VDD1v8 comparator
+Xcomp VGND VDD3v3 VDD1v8 VOUT BIASN VN VP comparator
 
 * set gnd and power
 Vgnd VGND 0 0
@@ -30,8 +30,7 @@
 run
 set color0 = white
 set color1 = black
-plot VOUT VDD3v3
-plot VDD3v3
+plot VOUT VP VN VDD3v3
 *plot VPAMP VNAMP VI
 *plot VOP VON
 plot i(Vdd3v3) i(Vdd1v8)

old-comparator/comparator-whole.spice

diff --git a/old-comparator/comparator-whole.spice b/old-comparator/comparator-whole.spice
index f0751b4..0ae19c9 100644
--- a/old-comparator/comparator-whole.spice
+++ b/old-comparator/comparator-whole.spice
@@ -1,54 +1,46 @@
-
 .subckt comparator-whole VP VN BIASN VOUT VGND VDD3v3 VDD1v8
-
 * SPICE3 file created from comparator.ext - technology: sky130A
 
-X0 VGND VGND VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X1 diffamp_0/VOPAMP diffamp_0/VOP diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X2 VGND VGND VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X3 diffamp_0/VONAMP diffamp_0/VON diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X4 VGND diffamp_0/VONAMP diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X5 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X6 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X7 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=-0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X8 VDD1v8 diffamp_0/VONAMP diffamp_0/VOPAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X9 VDD1v8 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X10 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X11 diffamp_0/VOPAMP diffamp_0/VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=-0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X12 VDD1v8 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X13 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X14 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X15 VDD1v8 diffamp_0/VONAMP diffamp_0/VOPAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
-X16 VDD1v8 VDD1v8 VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X17 VDD1v8 diffamp_0/VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
-X18 VGND diffamp_0/VOPAMP VOUT VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
-X19 VDD3v3 VDD3v3 VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X20 VDD3v3 VDD3v3 VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X32 preamp_0/VI VP preamp_0/VPAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+X31 preamp_0/VI VN preamp_0/VNAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+
+X23 VGND BIASN preamp_0/VI VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+X25 preamp_0/VI BIASN VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+
 X21 preamp_0/VPAMP preamp_0/VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
 X22 preamp_0/VNAMP preamp_0/VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X23 VGND BIASN preamp_0/VI VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X24 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X25 preamp_0/VI BIASN VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X26 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X27 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X28 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X29 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X30 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X31 preamp_0/VI VN preamp_0/VNAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X32 preamp_0/VI VP preamp_0/VPAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X33 VDD3v3 VDD3v3 VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X34 VDD3v3 VDD3v3 VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+
 X35 diffamp_0/VOP preamp_0/VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
 X36 diffamp_0/VON preamp_0/VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+
 X37 decision_0/ISINK diffamp_0/VOP diffamp_0/VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X38 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
 X39 decision_0/ISINK diffamp_0/VON diffamp_0/VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X40 decision_0/ISINK diffamp_0/VOP diffamp_0/VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X41 decision_0/ISINK diffamp_0/VON diffamp_0/VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X42 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+
 X43 VGND decision_0/ISINK decision_0/ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X44 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
-X45 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=600000u
+
+
+X1 diffamp_0/VOPAMP diffamp_0/VOP diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+X3 diffamp_0/VONAMP diffamp_0/VON diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+
+X4 VGND diffamp_0/VONAMP diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+
+
+
+X7 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=-0p pd=0u as=0p ps=0u w=1e+06u l=180000u
+X9 VDD1v8 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+X12 VDD1v8 diffamp_0/VONAMP diffamp_0/VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+X8 VDD1v8 diffamp_0/VONAMP diffamp_0/VOPAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+X11 diffamp_0/VOPAMP diffamp_0/VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=-0p pd=0u as=0p ps=0u w=1e+06u l=180000u
+X15 VDD1v8 diffamp_0/VONAMP diffamp_0/VOPAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
+
+X17 VDD1v8 diffamp_0/VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
+X18 VGND diffamp_0/VOPAMP VOUT VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
+
+
+
+
 C0 decision_0/ISINK VGND 2.29fF
 C1 diffamp_0/VON VGND 3.61fF
 C2 VDD3v3 VGND 13.15fF