Google Git
Sign in
foss-eda-tools/third_party/shuttle/sky130/mpw-003/slot-019/9f8a1a8cb731284c9448ed79ba4de37eb39c2e61^!/.
commit
9f8a1a8cb731284c9448ed79ba4de37eb39c2e61
[log]
author
H-S-S-11 <harry@snell.org.uk>
Fri Sep 24 14:40:51 2021 +0100
committer
H-S-S-11 <harry@snell.org.uk>
Fri Sep 24 14:40:51 2021 +0100
tree
340be0008afca20a01088777914e9984a097cbfb
parent
ce6254bcd83e260eb3c815297d83e7d4c9dcbf98 [diff]
full comparator sim

diff --git a/comparator/bsim4v5.out b/comparator/bsim4v5.out
index fa67279..647a1ae 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 = xpre.x0:sky130_fd_pr__pfet_g5v0d10v5__model.55
+Model = xcomp.x0:sky130_fd_pr__nfet_01v8__model.7

diff --git a/comparator/comparator-whole.spice b/comparator/comparator-whole.spice
new file mode 100644
index 0000000..f0751b4
--- /dev/null
+++ b/comparator/comparator-whole.spice

@@ -0,0 +1,60 @@
+
+.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
+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
+C0 decision_0/ISINK VGND 2.29fF
+C1 diffamp_0/VON VGND 3.61fF
+C2 VDD3v3 VGND 13.15fF
+C3 VDD1v8 VGND 12.14fF
+C4 diffamp_0/VONAMP VGND 2.51fF
+
+
+
+.ends
\ No newline at end of file

diff --git a/comparator/comparator.mag b/comparator/comparator.mag
new file mode 100644
index 0000000..a0041e4
--- /dev/null
+++ b/comparator/comparator.mag

@@ -0,0 +1,71 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1632490576
+<< locali >>
+rect 1760 1900 1860 1920
+rect 1760 1840 1780 1900
+rect 1840 1840 1860 1900
+rect 1760 1540 1860 1840
+rect 1760 1480 1780 1540
+rect 1840 1480 1860 1540
+rect 1760 1460 1860 1480
+<< viali >>
+rect 1780 1840 1840 1900
+rect 1780 1480 1840 1540
+<< metal1 >>
+rect -240 2420 40 2800
+rect 480 2180 1620 2800
+rect 2060 2460 2400 2800
+rect 2720 2680 4420 2800
+rect 2720 2600 3620 2680
+rect 1140 1980 1620 2180
+rect 4040 2120 4420 2680
+rect 4560 2080 4660 2800
+rect 4940 2140 5360 2800
+rect -440 1900 1860 1920
+rect -440 1840 1780 1900
+rect 1840 1840 1860 1900
+rect -440 1820 1860 1840
+rect 2900 1780 3900 1880
+rect 460 1640 2000 1740
+rect 460 1420 580 1640
+rect 1760 1540 1860 1560
+rect 1760 1480 1780 1540
+rect 1840 1480 1860 1540
+rect 1230 1380 1600 1470
+rect -440 1270 540 1350
+rect 1500 1340 1600 1380
+rect 1760 1340 1860 1480
+rect 1500 1240 1860 1340
+rect 1900 1320 2000 1640
+rect 3800 1280 3900 1780
+rect -440 1160 540 1240
+rect 460 860 580 1080
+rect 1900 860 2000 1220
+rect 460 760 2000 860
+rect 3800 720 3900 840
+rect 2880 620 3900 720
+use diffamp  diffamp_0
+timestamp 1632488633
+transform 1 0 4840 0 1 -1080
+box -940 980 620 3400
+use decision  decision_0
+timestamp 1632485541
+transform 1 0 2020 0 1 145
+box -120 -245 1711 2620
+use preamp  preamp_0
+timestamp 1632332974
+transform 1 0 -145 0 1 115
+box -255 -115 1909 2460
+<< labels >>
+rlabel metal1 -440 1270 -430 1350 1 VP
+rlabel metal1 -440 1160 -430 1240 1 VN
+rlabel metal1 480 2760 1620 2800 1 VGND
+rlabel metal1 2720 2760 4420 2800 1 VGND
+rlabel metal1 -440 1820 -420 1920 1 BIASN
+rlabel metal1 4560 2760 4660 2800 1 VOUT
+rlabel metal1 4940 2760 5360 2800 1 VDD1v8
+rlabel metal1 2060 2760 2400 2800 1 VDD3v3
+rlabel metal1 -240 2760 40 2800 1 VDD3v3
+<< end >>

diff --git a/comparator/comparator.spice b/comparator/comparator.spice
new file mode 100644
index 0000000..984bf35
--- /dev/null
+++ b/comparator/comparator.spice

@@ -0,0 +1,53 @@
+* 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
+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
+C0 decision_0/ISINK VGND 2.29fF
+C1 diffamp_0/VON VGND 3.61fF
+C2 VDD3v3 VGND 13.15fF
+C3 VDD1v8 VGND 12.14fF
+C4 diffamp_0/VONAMP VGND 2.51fF

diff --git a/comparator/diffamp.mag b/comparator/diffamp.mag
index e811deb..050ab4c 100644
--- a/comparator/diffamp.mag
+++ b/comparator/diffamp.mag

@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 4
-timestamp 1632405528
+timestamp 1632488633
 << nwell >>
 rect -880 5200 1240 6200
 rect -40 2280 1240 5200
@@ -182,16 +182,15 @@
 rect -1240 3320 -1200 3360
 rect 200 3320 400 3360
 rect -1360 3280 -1200 3320
-use sky130_fd_pr__nfet_01v8_T49HPK  sky130_fd_pr__nfet_01v8_T49HPK_0
-timestamp 1632403905
-transform 1 0 -1398 0 1 4266
-box -428 -2292 428 2292
 use sky130_fd_pr__pfet_01v8_XAY5ZQ  sky130_fd_pr__pfet_01v8_XAY5ZQ_0
 timestamp 1632400215
 transform 1 0 613 0 1 4240
 box -619 -1946 619 1946
+use sky130_fd_pr__nfet_01v8_T49HPK  sky130_fd_pr__nfet_01v8_T49HPK_0
+timestamp 1632403905
+transform 1 0 -1398 0 1 4266
+box -428 -2292 428 2292
 << labels >>
-rlabel metal1 200 6760 1040 6800 1 VPWR
 rlabel locali -1640 5080 -1560 5160 1 ISINK
 rlabel metal1 -1880 3720 -1840 3840 1 VON
 rlabel metal1 -1880 4720 -1840 4840 1 VOP
@@ -199,4 +198,5 @@
 rlabel metal1 -840 3360 -720 3480 1 VONAMP
 rlabel metal1 -1600 6760 -840 6800 1 VGND
 rlabel metal1 -560 6760 -360 6800 1 VOUT
+rlabel metal1 200 6760 1040 6800 1 VDD1v8
 << end >>

diff --git a/comparator/simulation.spice b/comparator/simulation.spice
index c03f620..5ef3087 100644
--- a/comparator/simulation.spice
+++ b/comparator/simulation.spice

@@ -4,16 +4,19 @@
 .include comparator-preamp.spice
 .include comparator-decision.spice
 .include comparator-diffamp.spice
+.include comparator-whole.spice
 
 * instantiate the comparator
-Xpre VP VN VPAMP VNAMP VI BIASN VGND VPWR comparator-preamp
-Xdec VPAMP VNAMP VOP VON VGND VPWR comparator-decision
-Xdif VOP VON VOUT VGND VDD comparator-diffamp
+*Xpre VP VN VPAMP VNAMP VI BIASN VGND VPWR comparator-preamp
+*Xdec VPAMP VNAMP VOP VON VGND VPWR comparator-decision
+*Xdif VOP VON VOUT VGND VDD comparator-diffamp
+
+Xcomp VP VN BIASN VOUT VGND VDD3v3 VDD1v8 comparator-whole
 
 * set gnd and power
 Vgnd VGND 0 0
-Vdd3v3 VPWR VGND 3
-Vdd1v8 VDD  VGND 1.8
+Vdd3v3 VDD3v3 VGND 3
+Vdd1v8 VDD1v8  VGND 1.8
 
 * set bias voltage
 Vbias BIASN VGND 0.3
@@ -33,12 +36,10 @@
 run
 set color0 = white
 set color1 = black
-plot VOUT
-plot VP VN VOUT VPWR
+plot VP VN VOUT VDD3v3 
 *plot VPAMP VNAMP VI
 *plot VOP VON
-*plot i(Vdd3v3)
-*plot i(Vdd1v8)
+plot i(Vdd3v3) i(Vdd1v8)
 .endc
 
 .end