Merge branch 'master' into qflow-1.4

RTimothyEdwards · May 5, 2024 · 58f3433 · 58f3433
2 parents 7a35edc + c270a66
commit 58f3433
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.102
+1.4.103
diff --git a/scripts/spi2xspice.py.in b/scripts/spi2xspice.py.in
@@ -552,6 +552,14 @@ def read_spice(filein, fileout, celldefs, debug, modelfile, timing):
                             print('A' + instname + ' ' + outtext + ' dzero', file=ofile)
                         else:
                             print("Cell " + cellname + " has no inputs and no constant function.")
+                    elif len(inlist) == 0 and len(outlist) != 0: #FIXME
+                    #Multiple outputs with no inputs, it is a cell that is used to tie high or tie low
+                        for idx,fcn in enumerate(cellrec['function']):
+                            if fcn == '1':
+                                print('A' + instname + str(idx) + ' ' + outlist[idx] + ' done', file=ofile)
+                            elif fcn == '0':
+                                print('A' + instname + str(idx) + ' ' + outlist[idx] + ' dzero', file=ofile)
+
                     elif len(outlist) == 1:
                         print('A' + instname + ' [' + intext + '] ' + outtext + ' d_lut_' + cellname, file=ofile)
                     elif len(outlist) != 0:

diff --git a/src/vesta.c b/src/vesta.c
@@ -3519,6 +3519,7 @@ find_clock_skews(ddataptr pathlist, char minmax)
 
     clocklist = NULL;
     clock2list = NULL;
+    srcdir = EDGE_UNKNOWN;
 
     for (testddata = pathlist; testddata; testddata = testddata->next) {
 

diff --git a/tech/Makefile.in b/tech/Makefile.in
@@ -44,6 +44,6 @@ distclean:
 	done
 
 uninstall:
-	@echo "Uninstalling built-in tech files
+	@echo "Uninstalling built-in tech files"
 	$(RM) -rf $(DESTDIR)${TECHINSTALL}
 
diff --git a/tech/osu018/osu018.sh b/tech/osu018/osu018.sh
@@ -66,7 +66,7 @@ set tielo=""		;# Cell to connect to ground, if one exists
 set tielopin_out=""	;# Output pin name of tielo cell, if it exists
 
 set separator=""		;# Separator between gate names and drive strengths
-set techfile=SCN4M_SUBM.20	;# magic techfile
+set techfile=SCN6M_SUBM.10	;# magic techfile
 set magicrc=osu018.magicrc	;# magic startup script
 set gdsfile=osu018_stdcells.gds2	;# GDS database of standard cells