[qflow] 07/11: Made a couple of corrections that allows the use of a null string ("") as variable "separator". This was supported by blifFanout but was being bungled by the script calling blifFanout. Because the OSU standard cell sets are more appropriately compatible with the null separator than with the "X" separator (due to a few cells that don't use the "X", like CLKBUF), the standard cell script has been changed to specify a null separator character.

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to tag upstream/1.0.93
in repository qflow.

commit 8931e2d09e2cb2f0fda3f58e3f92b852306aab16
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Mon Mar 30 16:40:31 2015 -0400

    Made a couple of corrections that allows the use of a null string
    ("") as variable "separator".  This was supported by blifFanout but
    was being bungled by the script calling blifFanout.  Because the
    OSU standard cell sets are more appropriately compatible with the
    null separator than with the "X" separator (due to a few cells that
    don't use the "X", like CLKBUF), the standard cell script has been
    changed to specify a null separator character.
---
 scripts/resynthesize.sh     | 7 ++++++-
 scripts/synthesize_yosys.sh | 7 ++++++-
 src/blifFanout.c            | 2 +-
 tech/osu035/osu035.sh       | 2 +-
 tech/osu050/osu050.sh       | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/resynthesize.sh b/scripts/resynthesize.sh
index 4701334..30ed503 100755
--- a/scripts/resynthesize.sh
+++ b/scripts/resynthesize.sh
@@ -134,8 +134,13 @@ if (-f ${techdir}/gate.cfg && -f ${bindir}/blifFanout ) then
    set nchanged=1000
    while ($nchanged > 0)
       mv ${rootname}.blif tmp.blif
+      if ("x${separator}" == "x") then
+	 set sepoption=""
+      else
+	 set sepoption="-s ${separator}"
+      endif
       ${bindir}/blifFanout ${fanout_options} -f ${rootname}_nofanout \
-		-p ${techdir}/gate.cfg -s ${separator} \
+		-p ${techdir}/gate.cfg ${sepoption} \
 		-b ${bufcell} -i ${bufpin_in} -o ${bufpin_out} \
 		tmp.blif ${rootname}.blif >>& ${synthlog}
       set nchanged=$status
diff --git a/scripts/synthesize_yosys.sh b/scripts/synthesize_yosys.sh
index 898926e..f49d39f 100755
--- a/scripts/synthesize_yosys.sh
+++ b/scripts/synthesize_yosys.sh
@@ -398,8 +398,13 @@ if (-f ${techdir}/gate.cfg && -f ${bindir}/blifFanout ) then
    set nchanged=1000
    while ($nchanged > 0)
       mv ${rootname}.blif tmp.blif
+      if ("x${separator}" == "x") then
+	 set sepoption=""
+      else
+	 set sepoption="-s ${separator}"
+      endif
       ${bindir}/blifFanout ${fanout_options} -f ${rootname}_nofanout \
-		-p ${techdir}/gate.cfg -s ${separator} \
+		-p ${techdir}/gate.cfg ${sepoption} \
 		-b ${bufcell} -i ${bufpin_in} -o ${bufpin_out} \
 		tmp.blif ${rootname}.blif >>& ${synthlog}
       set nchanged=$status
diff --git a/src/blifFanout.c b/src/blifFanout.c
index 596ab8e..9810bd9 100644
--- a/src/blifFanout.c
+++ b/src/blifFanout.c
@@ -153,7 +153,7 @@ char *find_suffix(char *gatename)
    char *tsuf, *gptr;
    char *suffix = NULL;
 
-   if (Separator == NULL) {
+   if (Separator == NULL || (*Separator == '\0')) {
       suffix = gatename + strlen(gatename) - 1;
       while (isdigit(*suffix)) suffix--;
       suffix++;
diff --git a/tech/osu035/osu035.sh b/tech/osu035/osu035.sh
index 34bc9f0..76d40db 100644
--- a/tech/osu035/osu035.sh
+++ b/tech/osu035/osu035.sh
@@ -62,7 +62,7 @@ set tielopin_out=""	;# Output pin name of tielo cell, if it exists
 set gndnet=gnd		;# Name used for ground pins in standard cells
 set vddnet=vdd		;# Name used for power pins in standard cells
 
-set separator=X		;# Separator between gate names and drive strengths
+set separator=""		;# Separator between gate names and drive strengths
 set techfile=SCN4M_SUBM.20	;# magic techfile
 set magicrc=osu035.magicrc	;# magic startup script
 set gdsfile=osu035_stdcells.gds	;# GDS database of standard cells
diff --git a/tech/osu050/osu050.sh b/tech/osu050/osu050.sh
index d03252d..1bb536b 100755
--- a/tech/osu050/osu050.sh
+++ b/tech/osu050/osu050.sh
@@ -62,7 +62,7 @@ set tielopin_out=""	;# Output pin name of tielo cell, if it exists
 set gndnet=gnd		;# Name used for ground pins in standard cells
 set vddnet=vdd		;# Name used for power pins in standard cells
 
-set separator=X		;# Separator between gate names and drive strengths
+set separator=""		;# Separator between gate names and drive strengths
 set techfile=SCN3ME_SUBM.30	;# magic techfile
 set magicrc=osu050.magicrc	;# magic startup script
 set gdsfile=osu05_stdcells.gds	;# GDS database of standard cells

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git