Revised the IRSIM parameter file header to include the subcircuit
device information that was added in the latest commit of IRSIM
(9.7.113), which makes IRSIM compatible with .sim file output
generated from magic that uses the 'x' notation for subcircuits.
Reworked the Makefile to concatenate the header and device parameter
files in the irsim/ directory on the fly when building the PDK, and
removed the existing concatenated files, which are not needed because
they can be regenerated easily.
diff --git a/VERSION b/VERSION
index 4418310..fbd4dd6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.280
+1.0.281
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 2bb53bc..a5a7b84 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -781,7 +781,7 @@
mkdir -p ${IRSIM_STAGING_$*}
rm -f ${IRSIM_STAGING_$*}/${SKY130$*}_*.prm
for corner in ${IRSIM_CORNERS} ; do \
- cp irsim/sky130A_$$corner.prm \
+ cat irsim/header.txt irsim/sky130_$$corner.prm > \
${IRSIM_STAGING_$*}/${SKY130$*}_$$corner.prm ; \
done
diff --git a/sky130/irsim/README b/sky130/irsim/README
index f527873..43d24c1 100644
--- a/sky130/irsim/README
+++ b/sky130/irsim/README
@@ -59,3 +59,7 @@
Cox = Eox / Tox = 8.854E-12 F/m * 3.9 / 4.15E-9 = 8.32E-3 F/m^2 = pF/um^2
The other cap values need to be looked up and corrected. . .
+
+NOTE: 2/7/2022: Added "device" lines to header.txt for compability between the
+subcircuit devices used by the sky130 process, and IRSIM version 9.7.113, which
+adds the parsing for the new "device" syntax in the parameter file.
diff --git a/sky130/irsim/header.txt b/sky130/irsim/header.txt
index 03e1494..73cccce 100644
--- a/sky130/irsim/header.txt
+++ b/sky130/irsim/header.txt
@@ -19,3 +19,28 @@
subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
diffext 0 ; diffusion extension for each transistor
+device nfet sky130_fd_pr__nfet_01v8
+device nfet sky130_fd_pr__nfet_01v8_lvt
+device nfet sky130_fd_pr__nfet_g5v0d10v5
+device pfet sky130_fd_pr__pfet_01v8
+device pfet sky130_fd_pr__pfet_01v8_lvt
+device pfet sky130_fd_pr__pfet_01v8_mvt
+device pfet sky130_fd_pr__pfet_01v8_hvt
+device pfet sky130_fd_pr__pfet_g5v0d10v5
+; Capacitor values are in pF/centimicron^2
+device capacitor sky130_fd_pr__cap_mim_m3_1 2.0E-7
+device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
+; Resistor values are in ohms/square
+device resistor sky130_res_high_po_0p35 320
+device resistor sky130_res_high_po_0p69 320
+device resistor sky130_res_high_po_1p41 320
+device resistor sky130_res_high_po_2p85 320
+device resistor sky130_res_high_po_5p73 320
+device resistor sky130_res_xhigh_po_0p35 2000
+device resistor sky130_res_xhigh_po_0p69 2000
+device resistor sky130_res_xhigh_po_1p41 2000
+device resistor sky130_res_xhigh_po_2p85 2000
+device resistor sky130_res_xhigh_po_5p73 2000
+device resistor sky130_res_generic_nd 120
+device resistor sky130_res_generic_pd 197
+
diff --git a/sky130/irsim/sky130A_1v62_27.prm b/sky130/irsim/sky130A_1v62_27.prm
deleted file mode 100644
index c2907a5..0000000
--- a/sky130/irsim/sky130A_1v62_27.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 40227.0
-resistance n-channel dynamic-low 0.8 0.2 3549.0
-resistance n-channel static 0.8 0.2 4518.0
-
-resistance p-channel dynamic-high 1.0 0.2 8694.0
-resistance p-channel dynamic-low 1.0 0.2 662526.0
-resistance p-channel static 1.0 0.2 5762.0
diff --git a/sky130/irsim/sky130A_1v62_n40.prm b/sky130/irsim/sky130A_1v62_n40.prm
deleted file mode 100644
index 6fe1485..0000000
--- a/sky130/irsim/sky130A_1v62_n40.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 108132.0
-resistance n-channel dynamic-low 0.8 0.2 6704.0
-resistance n-channel static 0.8 0.2 2838.0
-
-resistance p-channel dynamic-high 1.0 0.2 14294.0
-resistance p-channel dynamic-low 1.0 0.2 5584975.0
-resistance p-channel static 1.0 0.2 -8337.0
diff --git a/sky130/irsim/sky130A_1v62_n5.prm b/sky130/irsim/sky130A_1v62_n5.prm
deleted file mode 100644
index 90cd9bc..0000000
--- a/sky130/irsim/sky130A_1v62_n5.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 65335.0
-resistance n-channel dynamic-low 0.8 0.2 6857.0
-resistance n-channel static 0.8 0.2 2987.0
-
-resistance p-channel dynamic-high 1.0 0.2 14543.0
-resistance p-channel dynamic-low 1.0 0.2 1684744.0
-resistance p-channel static 1.0 0.2 -7823.0
diff --git a/sky130/irsim/sky130A_1v80_125.prm b/sky130/irsim/sky130A_1v80_125.prm
deleted file mode 100644
index 4462782..0000000
--- a/sky130/irsim/sky130A_1v80_125.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 14005.0
-resistance n-channel dynamic-low 0.8 0.2 3516.0
-resistance n-channel static 0.8 0.2 3719.0
-
-resistance p-channel dynamic-high 1.0 0.2 7852.0
-resistance p-channel dynamic-low 1.0 0.2 73111.0
-resistance p-channel static 1.0 0.2 5295.0
diff --git a/sky130/irsim/sky130A_1v80_27.prm b/sky130/irsim/sky130A_1v80_27.prm
deleted file mode 100644
index 0505c58..0000000
--- a/sky130/irsim/sky130A_1v80_27.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 18174.0
-resistance n-channel dynamic-low 0.8 0.2 3195.0
-resistance n-channel static 0.8 0.2 3335.0
-
-resistance p-channel dynamic-high 1.0 0.2 7482.0
-resistance p-channel dynamic-low 1.0 0.2 204714.0
-resistance p-channel static 1.0 0.2 4204.0
diff --git a/sky130/irsim/sky130A_1v80_n40.prm b/sky130/irsim/sky130A_1v80_n40.prm
deleted file mode 100644
index 0d67be8..0000000
--- a/sky130/irsim/sky130A_1v80_n40.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 27589.0
-resistance n-channel dynamic-low 0.8 0.2 3019.0
-resistance n-channel static 0.8 0.2 3101.0
-
-resistance p-channel dynamic-high 1.0 0.2 7192.0
-resistance p-channel dynamic-low 1.0 0.2 913408.0
-resistance p-channel static 1.0 0.2 3520.0
diff --git a/sky130/irsim/sky130A_1v80_n5.prm b/sky130/irsim/sky130A_1v80_n5.prm
deleted file mode 100644
index 0260997..0000000
--- a/sky130/irsim/sky130A_1v80_n5.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 21254.0
-resistance n-channel dynamic-low 0.8 0.2 3106.0
-resistance n-channel static 0.8 0.2 3220.0
-
-resistance p-channel dynamic-high 1.0 0.2 7350.0
-resistance p-channel dynamic-low 1.0 0.2 371015.0
-resistance p-channel static 1.0 0.2 3867.0
diff --git a/sky130/irsim/sky130A_1v98_125.prm b/sky130/irsim/sky130A_1v98_125.prm
deleted file mode 100644
index a6992c6..0000000
--- a/sky130/irsim/sky130A_1v98_125.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 10002.0
-resistance n-channel dynamic-low 0.8 0.2 3230.0
-resistance n-channel static 0.8 0.2 2957.0
-
-resistance p-channel dynamic-high 1.0 0.2 7027.0
-resistance p-channel dynamic-low 1.0 0.2 44348.0
-resistance p-channel static 1.0 0.2 4191.0
diff --git a/sky130/irsim/sky130A_1v98_27.prm b/sky130/irsim/sky130A_1v98_27.prm
deleted file mode 100644
index 635cd07..0000000
--- a/sky130/irsim/sky130A_1v98_27.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 10925.0
-resistance n-channel dynamic-low 0.8 0.2 2949.0
-resistance n-channel static 0.8 0.2 2583.0
-
-resistance p-channel dynamic-high 1.0 0.2 6683.0
-resistance p-channel dynamic-low 1.0 0.2 82493.0
-resistance p-channel static 1.0 0.2 3232.0
diff --git a/sky130/irsim/sky130A_1v98_n40.prm b/sky130/irsim/sky130A_1v98_n40.prm
deleted file mode 100644
index 3047588..0000000
--- a/sky130/irsim/sky130A_1v98_n40.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 12455.0
-resistance n-channel dynamic-low 0.8 0.2 2795.0
-resistance n-channel static 0.8 0.2 2364.0
-
-resistance p-channel dynamic-high 1.0 0.2 6425.0
-resistance p-channel dynamic-low 1.0 0.2 216474.0
-resistance p-channel static 1.0 0.2 2648.0
diff --git a/sky130/irsim/sky130A_1v98_n5.prm b/sky130/irsim/sky130A_1v98_n5.prm
deleted file mode 100644
index b3b05c9..0000000
--- a/sky130/irsim/sky130A_1v98_n5.prm
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; configuration file for sky130 (0.13um process)
-;
-
-lambda 0.005 ; length scaling, microns (1 lambda = 1 centimicron)
-
-capga .00832 ; gate capacitance, pF/micron^2
-
-capda 0.0012
-capdp 0.0013
-cappda 0.00260
-cappdp 0.00090
-
-lowthresh 0.5 ; logic low threshold as a normalized voltage
-highthresh 0.5 ; logic high threshold as a normalized voltage
-
-cntpullup 0 ; irrelevant, cmos technology; no depletion transistors
-diffperim 0 ; don't include diffusion perimeters for sidewall cap.
-subparea 0 ; poly over transistor won't count as part pf bulk-poly cap.
-diffext 0 ; diffusion extension for each transistor
-
-resistance n-channel dynamic-high 0.8 0.2 11492.0
-resistance n-channel dynamic-low 0.8 0.2 2872.0
-resistance n-channel static 0.8 0.2 2474.0
-
-resistance p-channel dynamic-high 1.0 0.2 6564.0
-resistance p-channel dynamic-low 1.0 0.2 119412.0
-resistance p-channel static 1.0 0.2 2943.0
