Corrected the qflow setup scripts so that the voltage range string
in the liberty file name is a variable that can be processed by the
preproc.py script, so that the string can be properly specified for
the HVL library. Also: Removed a wayward $ from one of the makefile
recipe entries, which was causing a qflow file to be saved with the
wrong filename.
diff --git a/VERSION b/VERSION
index 556d562..55e93cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.221
+1.0.222
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 2fbaf1b..2cf2dfc 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -653,20 +653,20 @@
rm -f ${QFLOW_STAGING_A}/sky130_fd_sc_ms.par
rm -f ${QFLOW_STAGING_A}/sky130_osu_sc_t18.sh
rm -f ${QFLOW_STAGING_A}/sky130_osu_sc_t18.par
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hd qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_hd.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hdll qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_hdll.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hvl qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_hvl.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hs qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_hs.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_lp qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_lp.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ls qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_ls.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ms qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/sky130_fd_sc_ms.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hd -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_hd.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hdll -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_hdll.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hvl -DVOLTAGE=4v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_hvl.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hs -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_hs.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_lp -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_lp.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ls -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_ls.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ms -DVOLTAGE=1v95 \
+ qflow/${TECH}.sh ${QFLOW_STAGING_A}/sky130_fd_sc_ms.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_osu_sc_t18 qflow/sky130osu.sh \
${QFLOW_STAGING_A}/sky130_osu_sc_t18.sh
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_hd.par
@@ -674,7 +674,7 @@
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_hvl.par
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_hs.par
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_ms.par
- ${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/$sky130_fd_sc_lp.par
+ ${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_lp.par
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_fd_sc_ls.par
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/sky130_osu_sc_t18.par
diff --git a/sky130/qflow/sky130.sh b/sky130/qflow/sky130.sh
index 2f6cd9c..31a1fc9 100644
--- a/sky130/qflow/sky130.sh
+++ b/sky130/qflow/sky130.sh
@@ -21,9 +21,9 @@
# The liberty format file containing standard cell timing and function information
#ifdef EF_FORMAT
-set libertyfile=STAGING_PATH/TECHNAME/libs.ref/lib/LIBRARY/LIBRARY__ff_n40C_1v95.lib
+set libertyfile=STAGING_PATH/TECHNAME/libs.ref/lib/LIBRARY/LIBRARY__ff_n40C_VOLTAGE.lib
#else (!EF_FORMAT)
-set libertyfile=STAGING_PATH/TECHNAME/libs.ref/LIBRARY/lib/LIBRARY__ff_n40C_1v95.lib
+set libertyfile=STAGING_PATH/TECHNAME/libs.ref/LIBRARY/lib/LIBRARY__ff_n40C_VOLTAGE.lib
#endif (!EF_FORMAT)
# If there is another LEF file containing technology information
