Merge branch 'main' of https://github.com/openhwgroup/cvw into dev

This commit is contained in:
David Harris 2023-02-16 13:58:03 -08:00
commit 1739114dab
3 changed files with 19 additions and 7 deletions

View File

@ -29,7 +29,6 @@ if {$tech == "sky130"} {
set TLUPLUS true set TLUPLUS true
set mw_logic1_net VDD set mw_logic1_net VDD
set mw_logic0_net VSS set mw_logic0_net VSS
set TLU_PDK /home/jstine/TLU+/
set CAPTABLE $TLU/1p8m/ set CAPTABLE $TLU/1p8m/
set MW_REFERENCE_LIBRARY /home/jstine/MW set MW_REFERENCE_LIBRARY /home/jstine/MW
set MW_TECH_FILE tcbn28hpcplusbwp30p140 set MW_TECH_FILE tcbn28hpcplusbwp30p140

View File

@ -21,6 +21,7 @@ export MAXCORES ?= 1
export MAXOPT ?= 0 export MAXOPT ?= 0
export DRIVE ?= FLOP export DRIVE ?= FLOP
export USESRAM ?= 1 export USESRAM ?= 1
export USETOPO ?= 0
time := $(shell date +%F-%H-%M) time := $(shell date +%F-%H-%M)
hash := $(shell git rev-parse --short HEAD) hash := $(shell git rev-parse --short HEAD)
@ -30,8 +31,6 @@ export SAIFPOWER ?= 0
OLDCONFIGDIR ?= ${WALLY}/config OLDCONFIGDIR ?= ${WALLY}/config
export CONFIGDIR ?= $(OUTPUTDIR)/config export CONFIGDIR ?= $(OUTPUTDIR)/config
default: default:
@echo " Basic synthesis procedure for Wally:" @echo " Basic synthesis procedure for Wally:"
@echo " Invoke with make synth" @echo " Invoke with make synth"
@ -51,6 +50,18 @@ DIRS = $(DIRS32) $(DIRS64)
configs: $(CONFIG) configs: $(CONFIG)
$(CONFIG): $(CONFIG):
ifeq ($(USETOPO), 0))
ifeq ($(TECH), tsmc28psyn))
@echo "Bad configuration: you cannot use physical synthesis without tsmc28psyn and usetopo (i.e., -topo)"
exit 1
endif
endif
ifeq ($(USETOPO), 1))
ifneq ($(TECH), tsmc28psyn))
@echo "Bad configuration: you cannot use usetopo (i.e., -topo) without tsmc28psyn"
exit 1
endif
endif
@echo $(CONFIG) @echo $(CONFIG)
cp -r $(OLDCONFIGDIR)/shared/*.vh $(CONFIGDIR) cp -r $(OLDCONFIGDIR)/shared/*.vh $(CONFIGDIR)
cp -r $(OLDCONFIGDIR)/$(CONFIG)/* $(CONFIGDIR) cp -r $(OLDCONFIGDIR)/$(CONFIG)/* $(CONFIGDIR)
@ -124,15 +135,17 @@ mkdirecs:
@mkdir -p $(OUTPUTDIR)/mapped @mkdir -p $(OUTPUTDIR)/mapped
@mkdir -p $(OUTPUTDIR)/unmapped @mkdir -p $(OUTPUTDIR)/unmapped
synth: mkdirecs configs rundc clean synth: mkdirecs configs rundc clean
rundc: rundc:
ifeq ($(USETOPO), 0)
dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
else
rundctopo:
dc_shell-xg-t -64bit -topographical_mode -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out dc_shell-xg-t -64bit -topographical_mode -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
endif
clean: clean:
rm -rf $(OUTPUTDIR)/hdl rm -rf $(OUTPUTDIR)/hdl
rm -rf $(OUTPUTDIR)/WORK rm -rf $(OUTPUTDIR)/WORK

View File

@ -40,7 +40,7 @@ if __name__ == '__main__':
tech = args.tech if args.tech else 'sky90' tech = args.tech if args.tech else 'sky90'
maxopt = int(args.maxopt) maxopt = int(args.maxopt)
usesram = int(args.usesram) usesram = int(args.usesram)
usetopo = int(args.usetopop) usetopo = int(args.usetopo)
mod = 'orig' mod = 'orig'
if args.freqsweep: if args.freqsweep: