From b78ce62748f80a870bf11ec079c9d6037e3923a5 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Sat, 4 Feb 2023 09:50:36 +0000
Subject: [PATCH] added use sram parameter, cleaned up config writing, added
 single synth functionality to wallySynth

---
 synthDC/Makefile          | 79 +++++++++++++++++----------------------
 synthDC/scripts/synth.tcl |  3 +-
 synthDC/wallySynth.py     | 17 ++++++---
 3 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 81d37e9d2..fdfc9e488 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -12,7 +12,7 @@ export MOD ?= orig
 # title to add a note in the synth's directory name
 TITLE = 
 # tsmc28, sky130, and sky90 presently supported
-export TECH ?= sky90
+export TECH ?= tsmc28
 # MAXCORES allows parallel compilation, which is faster but less CPU-efficient
 # Avoid when doing sweeps of many optimization points in parallel
 export MAXCORES ?= 1
@@ -20,6 +20,7 @@ export MAXCORES ?= 1
 # The output netlist is hard to interpret, but significantly better PPA
 export MAXOPT ?= 0
 export DRIVE ?= FLOP
+export USESRAM ?= 0
 
 time := $(shell date +%F-%H-%M)
 hash := $(shell git rev-parse --short HEAD)
@@ -29,13 +30,7 @@ export SAIFPOWER ?= 0
 
 OLDCONFIGDIR ?= ${WALLY}/pipelined/config
 export CONFIGDIR ?= $(OUTPUTDIR)/hdl/config
-CONFIGFILES	?= $(shell find $(CONFIGDIR) -name rv*_*)
-CONFIGFILESTRIM = $(notdir $(CONFIGFILES))
 
-print:
-	@echo $(FREQS)
-	@echo $(CONFIG)
-	@echo $(CONFIGFILESTRIM)
 
 
 default:
@@ -46,8 +41,6 @@ default:
 
 DIRS32 = rv32e rv32gc rv32imc rv32i
 DIRS64 = rv64i rv64gc
-DIRS32 = rv32e rv32gc rv32ic rv32i
-DIRS64 = rv64i rv64gc
 DIRS = $(DIRS32) $(DIRS64)
 
 # k = 3 6 
@@ -60,57 +53,55 @@ DIRS = $(DIRS32) $(DIRS64)
 configs: $(CONFIG)
 $(CONFIG):
 	@echo $(CONFIG)
-	cp -r $(OLDCONFIGDIR)/$(CONFIG) $(CONFIGDIR)/$(CONFIG)_orig
-	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 5/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+	cp -r $(OLDCONFIGDIR)/shared/*.vh $(CONFIGDIR)
+	cp -r $(OLDCONFIGDIR)/$(CONFIG)/* $(CONFIGDIR)
 
-ifneq ($(filter $ $(CONFIG), $(DIRS32)),)
-	sed -i "s/DTIM_RANGE.*/DTIM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/IROM_RANGE.*/IROM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-else ifneq ($(filter $ $(CONFIG), $(DIRS64)),)
-	sed -i "s/DTIM_RANGE.*/DTIM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/IROM_RANGE.*/IROM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
-	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+ifeq ($(USESRAM), 1)
+	sed -i 's/USE_SRAM.*/USE_SRAM 1/g' $(CONFIGDIR)/wally-shared.vh
+
+else
+	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/wally-config.vh
+	sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/wally-config.vh
+	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 5/g' $(CONFIGDIR)/wally-config.vh
+
+ifneq ($(filter $(CONFIG), $(DIRS32)),)
+	sed -i "s/DTIM_RANGE.*/DTIM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/IROM_RANGE.*/IROM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+else ifneq ($(filter $(CONFIG), $(DIRS64)),)
+	sed -i "s/DTIM_RANGE.*/DTIM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/IROM_RANGE.*/IROM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/wally-config.vh
+	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/wally-config.vh
 else 
 	$(info $(CONFIG) does not exist in $(DIRS32) or $(DIRS64))
 	@echo "Config not in list, RAM_RANGE will be unmodified"
 endif
+endif
 	
+ifeq ($(MOD), FPUoff)
 	# turn off FPU 
-	cp -r $(CONFIGDIR)/$@_orig $(CONFIGDIR)/$@_FPUoff
-	sed -i 's/1 *<< *3/0 << 3/' $(CONFIGDIR)/$@_FPUoff/wally-config.vh
-	sed -i 's/1 *<< *5/0 << 5/' $(CONFIGDIR)/$@_FPUoff/wally-config.vh
-
+	sed -i 's/1 *<< *3/0 << 3/' $(CONFIGDIR)/wally-config.vh
+	sed -i 's/1 *<< *5/0 << 5/' $(CONFIGDIR)/wally-config.vh
+else ifeq ($(MOD), PMP16)
 	# PMP 16 
-	cp -r $(CONFIGDIR)/$@_FPUoff $(CONFIGDIR)/$@_PMP16
-	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 16/' $(CONFIGDIR)/$@_PMP16/wally-config.vh
-	
+	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 16/' $(CONFIGDIR)/wally-config.vh
+else ifeq ($(MOD), PMP0)
 	# PMP 0
-	cp -r $(CONFIGDIR)/$@_FPUoff $(CONFIGDIR)/$@_PMP0
-	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 0/' $(CONFIGDIR)/$@_PMP0/wally-config.vh
-	
+	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 0/' $(CONFIGDIR)/wally-config.vh
+else ifeq ($(MOD), noMulDiv)
 	# no muldiv
-	cp -r $(CONFIGDIR)/$@_PMP0 $(CONFIGDIR)/$@_noMulDiv
-	sed -i 's/1 *<< *12/0 << 12/' $(CONFIGDIR)/$@_noMulDiv/wally-config.vh
-
+	sed -i 's/1 *<< *12/0 << 12/' $(CONFIGDIR)/wally-config.vh
+else ifeq ($(MOD), noPriv)
 	# no priv
-	cp -r $(CONFIGDIR)/$@_noMulDiv $(CONFIGDIR)/$@_noPriv
-	sed -i 's/ZICSR_SUPPORTED *1/ZICSR_SUPPORTED 0/' $(CONFIGDIR)/$@_noPriv/wally-config.vh
-
-ifeq ($(SAIFPOWER), 1)
-	cp -f ../pipelined/regression/power.saif .
+	sed -i 's/ZICSR_SUPPORTED *1/ZICSR_SUPPORTED 0/' $(CONFIGDIR)/wally-config.vh
 endif
 
 ifeq ($(SAIFPOWER), 1)
 	cp -f ../pipelined/regression/power.saif .
 endif
 
-freqs: 
-	@$(foreach freq, $(FREQS), make synth DESIGN=wallypipelinedcore CONFIG=rv32e FREQ=$(freq) MAXCORES=1;)
 
 mkdirecs:
 	@echo "DC Synthesis"
@@ -129,7 +120,7 @@ rundc:
 	
 	
 clean:
-	rm -rf $(OUTPUTDIR)/hdl
+	rm -rf $(OUTPUTDIR)/hdl/*.sv
 	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 9fd86eccc..d7e792569 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -18,7 +18,7 @@ set_host_options -max_cores $::env(MAXCORES)
 
 # get outputDir and configDir from environment (Makefile)
 set outputDir $::env(OUTPUTDIR)
-set cfg $::env(CONFIGDIR)/$::env(CONFIG)_$::env(MOD)/wally-config.vh
+set cfg $::env(CONFIGDIR)/wally-config.vh
 set hdl_src "../pipelined/src"
 set saifpower $::env(SAIFPOWER)
 set maxopt $::env(MAXOPT)
@@ -26,7 +26,6 @@ set drive $::env(DRIVE)
 
 eval file copy -force $cfg {$outputDir/hdl/}
 eval file copy -force $cfg {$outputDir/}
-eval file copy -force [glob ${hdl_src}/../config/shared/*.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 9ac3a995d..5015b8ca7 100755
--- a/synthDC/wallySynth.py
+++ b/synthDC/wallySynth.py
@@ -5,9 +5,9 @@ import subprocess
 from multiprocessing import Pool
 import argparse
 
-def runSynth(config, mod, tech, freq, maxopt):
+def runSynth(config, mod, tech, freq, maxopt, usesram):
     global pool
-    command = "make synth DESIGN=wallypipelinedcore CONFIG={} MOD={} TECH={} DRIVE=FLOP FREQ={} MAXOPT={} MAXCORES=1".format(config, mod, tech, freq, maxopt)
+    command = "make synth DESIGN=wallypipelinedcore CONFIG={} MOD={} TECH={} DRIVE=FLOP FREQ={} MAXOPT={} USESRAM={} MAXCORES=1".format(config, mod, tech, freq, maxopt, usesram)
     pool.map(mask, [command])
 
 def mask(command):
@@ -32,6 +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)")
 
     args = parser.parse_args()
 
@@ -39,17 +40,21 @@ if __name__ == '__main__':
     defaultfreq = 3000 if tech == 'sky90' else 10000
     freq = args.targetfreq if args.targetfreq else defaultfreq
     maxopt = int(args.maxopt)
-    mod = 'orig' # until memory integrated
+    usesram = int(args.usesram)
+    mod = 'orig'
 
     if args.freqsweep:
         sc = args.freqsweep
         config = args.version if args.version else 'rv32e'
         for freq in [round(sc+sc*x/100) for x in freqVaryPct]: # rv32e freq sweep
-            runSynth(config, mod, tech, freq, maxopt)
+            runSynth(config, mod, tech, freq, maxopt, usesram)
     if args.configsweep:
         for config in ['rv32i', 'rv64gc', 'rv64i', 'rv32gc', 'rv32imc', 'rv32e']: #configs
-            runSynth(config, mod, tech, freq, maxopt)
+            runSynth(config, mod, tech, freq, maxopt, usesram)
     if args.featuresweep:
         config = args.version if args.version else 'rv64gc'
         for mod in ['FPUoff', 'noMulDiv', 'noPriv', 'PMP0', 'PMP16']: # rv64gc path variations 'orig', 
-            runSynth(config, mod, tech, freq, maxopt)
+            runSynth(config, mod, tech, freq, maxopt, usesram)
+    else:
+        config = args.version if args.version else 'rv64gc'
+        runSynth(config, mod, tech, freq, maxopt, usesram)
\ No newline at end of file