diff --git a/synthDC/Makefile b/synthDC/Makefile index fdfc9e48..fd966794 100755 --- a/synthDC/Makefile +++ b/synthDC/Makefile @@ -29,7 +29,7 @@ export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(MOD)_$(TECH)nm_$(FREQ)_MHz_$(time export SAIFPOWER ?= 0 OLDCONFIGDIR ?= ${WALLY}/pipelined/config -export CONFIGDIR ?= $(OUTPUTDIR)/hdl/config +export CONFIGDIR ?= $(OUTPUTDIR)/config @@ -106,8 +106,8 @@ endif mkdirecs: @echo "DC Synthesis" @mkdir -p $(OUTPUTDIR) - @mkdir -p $(OUTPUTDIR)/hdl/config - @mkdir -p $(OUTPUTDIR)/hdl/config + @mkdir -p $(OUTPUTDIR)/hdl + @mkdir -p $(OUTPUTDIR)/config @mkdir -p $(OUTPUTDIR)/reports @mkdir -p $(OUTPUTDIR)/mapped @mkdir -p $(OUTPUTDIR)/unmapped @@ -120,7 +120,7 @@ rundc: clean: - rm -rf $(OUTPUTDIR)/hdl/*.sv + rm -rf $(OUTPUTDIR)/hdl rm -rf $(OUTPUTDIR)/WORK rm -rf $(OUTPUTDIR)/alib-52 rm -f default.svf diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl index d7e79256..ba6e4bb9 100755 --- a/synthDC/scripts/synth.tcl +++ b/synthDC/scripts/synth.tcl @@ -18,14 +18,13 @@ set_host_options -max_cores $::env(MAXCORES) # get outputDir and configDir from environment (Makefile) set outputDir $::env(OUTPUTDIR) -set cfg $::env(CONFIGDIR)/wally-config.vh +set cfg $::env(CONFIGDIR) set hdl_src "../pipelined/src" set saifpower $::env(SAIFPOWER) set maxopt $::env(MAXOPT) set drive $::env(DRIVE) -eval file copy -force $cfg {$outputDir/hdl/} -eval file copy -force $cfg {$outputDir/} +eval file copy -force [glob ${cfg}/*.vh] {$outputDir/hdl/} eval file copy -force [glob ${hdl_src}/*/*.sv] {$outputDir/hdl/} eval file copy -force [glob ${hdl_src}/*/*/*.sv] {$outputDir/hdl/} diff --git a/synthDC/wallySynth.py b/synthDC/wallySynth.py index 5015b8ca..3c96c38e 100755 --- a/synthDC/wallySynth.py +++ b/synthDC/wallySynth.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Madeleine Masser-Frye mmasserfrye@hmc.edu 6/22 +# Madeleine Masser-Frye mmasserfrye@hmc.edu 1/2023 import subprocess from multiprocessing import Pool @@ -32,7 +32,7 @@ if __name__ == '__main__': parser.add_argument("-t", "--targetfreq", type=int, help = "Target frequncy") parser.add_argument("-e", "--tech", choices=techs, help = "Technology") parser.add_argument("-o", "--maxopt", action='store_true', help = "Turn on MAXOPT") - parser.add_argument("-r", "--usesram", action='store_true', help = "Use SRAM (not flops)") + parser.add_argument("-r", "--usesram", action='store_true', help = "Use SRAM modules") args = parser.parse_args()