From 3249cbe42e002ca7c3a7f06315140de253b71e01 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Thu, 26 Jan 2023 04:50:14 +0000
Subject: [PATCH 1/8] Fixed writing config files for synth sweeps

---
 .gitignore                |  2 +-
 synthDC/Makefile          | 72 ++++++++++++++++++++-------------------
 synthDC/extractSummary.py | 54 ++++++++++++++---------------
 synthDC/wallySynth.py     | 31 ++++++-----------
 4 files changed, 76 insertions(+), 83 deletions(-)

diff --git a/.gitignore b/.gitignore
index c4c71a623..609ef1487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,7 @@ synthDC/runs/
 synthDC/newRuns
 synthDC/ppa/PPAruns
 synthDC/ppa/plots
-synthDC/plots/
+synthDC/wallyplots/
 synthDC/runArchive
 synthDC/hdl
 /pipelined/regression/power.saif
diff --git a/synthDC/Makefile b/synthDC/Makefile
index 98b719428..5551e252f 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -8,6 +8,7 @@ NAME := synth
 export DESIGN ?= wallypipelinedcore
 export FREQ ?= 3000
 export CONFIG ?= rv32e
+export MOD ?= orig
 # title to add a note in the synth's directory name
 TITLE = 
 # tsmc28, sky130, and sky90 presently supported
@@ -22,13 +23,15 @@ export DRIVE ?= FLOP
 
 time := $(shell date +%F-%H-%M)
 hash := $(shell git rev-parse --short HEAD)
-export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(TECH)nm_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
+export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(MOD)_$(TECH)nm_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
 export SAIFPOWER ?= 0
 
-CONFIGDIR ?= ${WALLY}/pipelined/config
+configAsList := $(subst _, ,$(CONFIG))
+BASECONFIG := $(word 1, $(configAsList))
+OLDCONFIGDIR ?= ${WALLY}/pipelined/config
+CONFIGDIR ?= $(OUTPUTDIR)/hdl/config
 CONFIGFILES	?= $(shell find $(CONFIGDIR) -name rv*_*)
 CONFIGFILESTRIM = $(notdir $(CONFIGFILES))
-# FREQS = 25 50 100 150 200 250 300 350 400
 # k = 3 6 
 
 print:
@@ -42,8 +45,8 @@ default:
 	@echo "Use wallySynth.py to run a concurrent sweep "
 
 
-DIRS32 = rv32e rv32gc rv32ic 
-DIRS64 = rv64ic rv64gc
+DIRS32 = rv32e rv32gc rv32ic rv32i # added 32i
+DIRS64 = rv64i rv64gc # use just 64i, lose ic
 DIRS = $(DIRS32) $(DIRS64)
 
 # bpred:
@@ -51,73 +54,72 @@ DIRS = $(DIRS32) $(DIRS64)
 # 	@$(foreach kval, $(k), cp -r $(CONFIGDIR)/rv64gc $(CONFIGDIR)/rv64gc_bpred_$(kval);)
 # 	@$(foreach kval, $(k), sed -i 's/BPRED_SIZE.*/BPRED_SIZE $(kval)/g' $(CONFIGDIR)/rv64gc_bpred_$(kval)/wally-config.vh;)
 # 	@$(foreach kval, $(k), make synth DESIGN=wallypipelinedcore CONFIG=rv64gc_bpred_$(kval) TECH=sky90 FREQ=500 MAXCORES=4 --jobs;)
-copy: 
-	# remove old config files
-	rm -rf $(CONFIGDIR)/*_*
 
-	@$(foreach dir, $(DIRS), rm -rf $(CONFIGDIR)/$(dir)_orig;)
-	@$(foreach dir, $(DIRS), cp -r $(CONFIGDIR)/$(dir) $(CONFIGDIR)/$(dir)_orig;)
-	@$(foreach dir, $(DIRS), sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/$(dir)_orig/wally-config.vh;)
-	@$(foreach dir, $(DIRS), sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/$(dir)_orig/wally-config.vh;)
-	@$(foreach dir, $(DIRS), sed -i 's/BPRED_SIZE.*/BPRED_SIZE 4/g' $(CONFIGDIR)/$(dir)_orig/wally-config.vh;)
+configs: $(BASECONFIG)
+$(BASECONFIG):
+	@echo $(BASECONFIG)
+	cp -r $(OLDCONFIGDIR)/$(BASECONFIG) $(CONFIGDIR)/$(BASECONFIG)_orig
+	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+	sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 4/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
 
-	@$(foreach dir, $(DIRS32), sed -i "s/RAM_RANGE.*/RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(dir)_orig/wally-config.vh ;)
-	@$(foreach dir, $(DIRS64), sed -i "s/RAM_RANGE.*/RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(dir)_orig/wally-config.vh ;)
-
-configs: $(DIRS)
-$(DIRS):
+ifneq ($(filter $ $(BASECONFIG), $(DIRS32)),)
+	sed -i "s/RAM_RANGE.*/RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+else ifneq ($(filter $ $(BASECONFIG), $(DIRS64)),)
+	sed -i "s/RAM_RANGE.*/RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+else 
+	$(info $(BASECONFIG) does not exist in $(DIRS32) or $(DIRS64))
+	@echo "Config not in list, RAM_RANGE will be unmodified"
+endif
 	
 	# turn off FPU 
-	rm -rf $(CONFIGDIR)/$@_FPUoff
 	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
 
 	# PMP 16 
-	rm -rf $(CONFIGDIR)/$@_PMP16
 	cp -r $(CONFIGDIR)/$@_FPUoff $(CONFIGDIR)/$@_PMP16
 	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 16/' $(CONFIGDIR)/$@_PMP16/wally-config.vh
 	
 	# PMP 0
-	rm -rf $(CONFIGDIR)/$@_PMP0
 	cp -r $(CONFIGDIR)/$@_FPUoff $(CONFIGDIR)/$@_PMP0
 	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES 0/' $(CONFIGDIR)/$@_PMP0/wally-config.vh
 	
 	# no muldiv
-	rm -rf $(CONFIGDIR)/$@_noMulDiv
 	cp -r $(CONFIGDIR)/$@_PMP0 $(CONFIGDIR)/$@_noMulDiv
 	sed -i 's/1 *<< *12/0 << 12/' $(CONFIGDIR)/$@_noMulDiv/wally-config.vh
 
 	# no priv
-	rm -rf $(CONFIGDIR)/$@_noPriv
 	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 .
+endif
+
 freqs: 
 	@$(foreach freq, $(FREQS), make synth DESIGN=wallypipelinedcore CONFIG=rv32e FREQ=$(freq) MAXCORES=1;)
 
-synth:
+mkdirecs:
 	@echo "DC Synthesis"
 	@mkdir -p $(OUTPUTDIR)
-	@mkdir -p $(OUTPUTDIR)/hdl
+	@mkdir -p $(OUTPUTDIR)/hdl/config
 	@mkdir -p $(OUTPUTDIR)/reports
 	@mkdir -p $(OUTPUTDIR)/mapped
 	@mkdir -p $(OUTPUTDIR)/unmapped
-ifeq ($(SAIFPOWER), 1)
-	cp -f ../pipelined/regression/power.saif .
-endif
+
+synth: mkdirecs configs rundc clean
+
+rundc:
 	dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
-#	rm -rf $(OUTPUTDIR)/hdl
+	
+clean:
+	rm -rf $(OUTPUTDIR)/hdl
 	rm -rf $(OUTPUTDIR)/WORK
 	rm -rf $(OUTPUTDIR)/alib-52
-
-clean:
 	rm -f default.svf
 	rm -f command.log
 	rm -f filenames*.log
 	rm -f power.saif
 	rm -f Synopsys_stack_trace_*.txt
-	rm -f crte_*.txt
-
-fresh: clean copy configs
-	@echo "synth directory cleaned and fresh config files written"
+	rm -f crte_*.txt
\ No newline at end of file
diff --git a/synthDC/extractSummary.py b/synthDC/extractSummary.py
index 978365b16..430f86178 100755
--- a/synthDC/extractSummary.py
+++ b/synthDC/extractSummary.py
@@ -28,16 +28,16 @@ def synthsintocsv():
 
     file = open("Summary.csv", "w")
     writer = csv.writer(file)
-    writer.writerow(['Width', 'Config', 'Special', 'Tech', 'Target Freq', 'Delay', 'Area'])
+    writer.writerow(['Width', 'Config', 'Mod', 'Tech', 'Target Freq', 'Delay', 'Area'])
 
     for oneSynth in allSynths:
         descrip = specReg.findall(oneSynth)
         width = descrip[2][:4]
         config = descrip[2][4:]
         if descrip[3][-2:] == 'nm':
-            special = ''
+            mod = ''
         else:
-            special = descrip[3]
+            mod = descrip[3]
             descrip = descrip[1:]
         tech = descrip[3][:-2]
         freq = descrip[4]
@@ -57,12 +57,12 @@ def synthsintocsv():
         else:
             delay = 1000/int(freq) - metrics[0]
             area = metrics[1]
-            writer.writerow([width, config, special, tech, freq, delay, area])
+            writer.writerow([width, config, mod, tech, freq, delay, area])
     file.close()
 
 	
 def synthsfromcsv(filename):
-    Synth = namedtuple("Synth", "width config special tech freq delay area")
+    Synth = namedtuple("Synth", "width config mod tech freq delay area")
     with open(filename, newline='') as csvfile:
         csvreader = csv.reader(csvfile)
         global allSynths
@@ -81,14 +81,9 @@ def freqPlot(tech, width, config):
     ''' plots delay, area for syntheses with specified tech, module, width
     '''
 
-    current_directory = os.getcwd()
-    final_directory = os.path.join(current_directory, 'plots/wally')
-    if not os.path.exists(final_directory):
-        os.makedirs(final_directory)
-
     freqsL, delaysL, areasL = ([[], []] for i in range(3))
     for oneSynth in allSynths:
-        if (width == oneSynth.width) & (config == oneSynth.config) & (tech == oneSynth.tech) & ('' == oneSynth.special):
+        if (width == oneSynth.width) & (config == oneSynth.config) & (tech == oneSynth.tech) & ('orig' == oneSynth.mod):
             ind = (1000/oneSynth.delay < oneSynth.freq) # when delay is within target clock period
             freqsL[ind] += [oneSynth.freq]
             delaysL[ind] += [oneSynth.delay]
@@ -130,7 +125,7 @@ def freqPlot(tech, width, config):
     ax2.yaxis.set_major_formatter(ticker.StrMethodFormatter('{x:,.0f}'))
     addFO4axis(fig, ax1, tech)
 
-    plt.savefig('./plots/wally/freqSweep_' + tech + '_' + width + config + '.png')
+    plt.savefig(final_directory + '/freqSweep_' + tech + '_' + width + config + '.png')
 
 
 def areaDelay(tech, delays, areas, labels, fig, ax, norm=False):
@@ -168,7 +163,7 @@ def plotFeatures(tech, width, config):
             if (oneSynth.config == config) & (width == oneSynth.width):
                 delays += [oneSynth.delay]
                 areas += [oneSynth.area]
-                labels += [oneSynth.special]
+                labels += [oneSynth.mod]
 
     fig, (ax) = plt.subplots(1, 1)
 
@@ -176,28 +171,28 @@ def plotFeatures(tech, width, config):
 
     titlestr = tech+'_'+width+config
     plt.title(titlestr)
-    plt.savefig('./plots/wally/features_'+titlestr+'.png')
+    plt.savefig(final_directory + '/features_'+titlestr+'.png')
 
 	
-def plotConfigs(tech, special=''):
+def plotConfigs(tech, mod=''):
     delays, areas, labels = ([] for i in range(3))
     freq = techdict[tech].targfreq
     for oneSynth in allSynths:
-        if (tech == oneSynth.tech) & (freq == oneSynth.freq) & (oneSynth.special == special):
-                delays += [oneSynth.delay]
-                areas += [oneSynth.area]
-                labels += [oneSynth.width + oneSynth.config]
+        if (tech == oneSynth.tech) & (freq == oneSynth.freq) & (oneSynth.mod == mod):
+            delays += [oneSynth.delay]
+            areas += [oneSynth.area]
+            labels += [oneSynth.width + oneSynth.config]
 
     fig, (ax) = plt.subplots(1, 1)
 
     fig = areaDelay(tech, delays, areas, labels, fig, ax)
 
-    titleStr = tech+'_'+special
+    titleStr = tech+'_'+mod
     plt.title(titleStr)
-    plt.savefig('./plots/wally/configs_' + titleStr + '.png')
+    plt.savefig(final_directory + '/configs_' + titleStr + '.png')
 
 
-def normAreaDelay(special=''):
+def normAreaDelay(mod=''):
     fig, (ax) = plt.subplots(1, 1)
     fullLeg = []
     for tech in list(techdict.keys()):
@@ -205,7 +200,7 @@ def normAreaDelay(special=''):
         spec = techdict[tech]
         freq = spec.targfreq
         for oneSynth in allSynths:
-            if (tech == oneSynth.tech) & (freq == oneSynth.freq) & (oneSynth.special == special):
+            if (tech == oneSynth.tech) & (freq == oneSynth.freq) & (oneSynth.mod == mod):
                     delays += [oneSynth.delay]
                     areas += [oneSynth.area]
                     labels += [oneSynth.width + oneSynth.config]
@@ -216,7 +211,7 @@ def normAreaDelay(special=''):
     ax.set_xlabel('Cycle Time (FO4)')
     ax.set_ylabel('Area (add32)')        
     ax.legend(handles = fullLeg, loc='upper left')
-    plt.savefig('./plots/wally/normAreaDelay.png')
+    plt.savefig(final_directory + '/normAreaDelay.png')
 
 	
 def addFO4axis(fig, ax, tech):
@@ -254,12 +249,17 @@ if __name__ == '__main__':
     techdict['sky90'] = TechSpec('green', 'o', args.skyfreq, 43.2e-3, 1440.600027, 714.057, 0.658023)
     techdict['tsmc28'] = TechSpec('blue', 's', args.tsmcfreq, 12.2e-3, 209.286002, 1060.0, .081533)
 
+    current_directory = os.getcwd()
+    final_directory = os.path.join(current_directory, 'wallyplots')
+    if not os.path.exists(final_directory):
+        os.makedirs(final_directory)
+
     synthsintocsv()
     synthsfromcsv('Summary.csv')
     freqPlot('tsmc28', 'rv32', 'e')
     freqPlot('sky90', 'rv32', 'e')
     plotFeatures('sky90', 'rv64', 'gc')
     plotFeatures('tsmc28', 'rv64', 'gc')
-    plotConfigs('sky90', special='orig')
-    plotConfigs('tsmc28', special='orig')
-    normAreaDelay(special='orig')
+    plotConfigs('sky90', mod='orig')
+    plotConfigs('tsmc28', mod='orig')
+    normAreaDelay(mod='orig')
diff --git a/synthDC/wallySynth.py b/synthDC/wallySynth.py
index 0c1579813..6b10f2e8b 100755
--- a/synthDC/wallySynth.py
+++ b/synthDC/wallySynth.py
@@ -5,20 +5,14 @@ import subprocess
 from multiprocessing import Pool
 import argparse
 
-def runSynth(config, tech, freq, maxopt):
+def runSynth(config, mod, tech, freq, maxopt):
     global pool
-    command = "make synth DESIGN=wallypipelinedcore CONFIG={} TECH={} DRIVE=FLOP FREQ={} MAXOPT={} MAXCORES=1".format(config, tech, freq, maxopt)
+    command = "make synth DESIGN=wallypipelinedcore CONFIG={} MOD={} TECH={} DRIVE=FLOP FREQ={} MAXOPT={} MAXCORES=1".format(config, mod, tech, freq, maxopt)
     pool.map(mask, [command])
 
 def mask(command):
     subprocess.Popen(command, shell=True)
 
-def freshStart():
-    out = subprocess.check_output(['bash','-c', 'make fresh'])
-    for x in out.decode("utf-8").split('\n')[:-1]:
-        print(x)
-    return
-
 
 if __name__ == '__main__':
     
@@ -41,24 +35,21 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    freq = args.targetfreq if args.targetfreq else 3000
     tech = args.tech if args.tech else 'sky90'
+    defaultfreq = 3000 if tech == 'sky90' else 10000
+    freq = args.targetfreq if args.targetfreq else defaultfreq
     maxopt = int(args.maxopt)
+    mod = 'orig' # until memory integrated
 
     if args.freqsweep:
         sc = args.freqsweep
         config = args.version if args.version else 'rv32e'
-        freshStart()
         for freq in [round(sc+sc*x/100) for x in freqVaryPct]: # rv32e freq sweep
-            runSynth(config, tech, freq, maxopt)
+            runSynth(config, mod, tech, freq, maxopt)
     if args.configsweep:
-        freshStart()
-        for config in ['rv32gc', 'rv32ic', 'rv64gc', 'rv64ic', 'rv32e']: # configs
-            config = config + '_orig' # until memory integrated
-            runSynth(config, tech, freq, maxopt)
+        for config in ['rv32i', 'rv64gc', 'rv64i', 'rv32gc', 'rv32ic', 'rv32e']: #configs
+            runSynth(config, mod, tech, freq, maxopt)
     if args.featuresweep:
-        freshStart()
-        v = args.version if args.version else 'rv64gc'
-        for mod in ['FPUoff', 'noMulDiv', 'noPriv', 'PMP0', 'PMP16']: # rv64gc path variations
-            config = v + '_' + mod
-            runSynth(config, tech, freq, maxopt)
+        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)

From eda3d4c6675f4f38132bf8a5a2abdd0dd95307e3 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Thu, 26 Jan 2023 04:53:43 +0000
Subject: [PATCH 2/8] cleaned up comments

---
 synthDC/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 5551e252f..81d982251 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -45,8 +45,8 @@ default:
 	@echo "Use wallySynth.py to run a concurrent sweep "
 
 
-DIRS32 = rv32e rv32gc rv32ic rv32i # added 32i
-DIRS64 = rv64i rv64gc # use just 64i, lose ic
+DIRS32 = rv32e rv32gc rv32ic rv32i
+DIRS64 = rv64i rv64gc
 DIRS = $(DIRS32) $(DIRS64)
 
 # bpred:

From c2f888d5da48b0cf140181419a37b73812c3bc38 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Sat, 28 Jan 2023 01:00:29 +0000
Subject: [PATCH 3/8] Fixed copying hdl subdirectories and referencing the
 correct config files for modified features

---
 synthDC/Makefile          | 12 +++++++-----
 synthDC/scripts/synth.tcl |  9 ++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 81d982251..eeb3de889 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -6,13 +6,14 @@ NAME := synth
 
 # defaults
 export DESIGN ?= wallypipelinedcore
-export FREQ ?= 3000
-export CONFIG ?= rv32e
+export FREQ ?= 1000
+export CONFIG ?= rv64gc
 export MOD ?= orig
+export CONFIGMOD ?= $(CONFIG)_$(MOD)
 # 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
@@ -29,13 +30,14 @@ export SAIFPOWER ?= 0
 configAsList := $(subst _, ,$(CONFIG))
 BASECONFIG := $(word 1, $(configAsList))
 OLDCONFIGDIR ?= ${WALLY}/pipelined/config
-CONFIGDIR ?= $(OUTPUTDIR)/hdl/config
+export CONFIGDIR ?= $(OUTPUTDIR)/hdl/config
 CONFIGFILES	?= $(shell find $(CONFIGDIR) -name rv*_*)
 CONFIGFILESTRIM = $(notdir $(CONFIGFILES))
 # k = 3 6 
 
 print:
 	@echo $(FREQS)
+	@echo $(BASECONFIG)
 	@echo $(CONFIGFILESTRIM)
 
 
@@ -108,7 +110,7 @@ mkdirecs:
 	@mkdir -p $(OUTPUTDIR)/mapped
 	@mkdir -p $(OUTPUTDIR)/unmapped
 
-synth: mkdirecs configs rundc clean
+synth: mkdirecs configs rundc #clean TODO
 
 rundc:
 	dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl
index ed43a1ab3..8c5d57988 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -18,19 +18,18 @@ set_host_options -max_cores $::env(MAXCORES)
 
 # get outputDir from environment (Makefile)
 set outputDir $::env(OUTPUTDIR)
-set cfgName $::env(CONFIG)
+set cfgName $::env(CONFIGMOD)
 # Config
 set hdl_src "../pipelined/src"
-set cfg "${hdl_src}/../config/${cfgName}/wally-config.vh"
 set saifpower $::env(SAIFPOWER)
 set maxopt $::env(MAXOPT)
 set drive $::env(DRIVE)
+set cfg $::env(CONFIGDIR)/${cfgName}/wally-config.vh
 
-eval file copy -force ${cfg} {$outputDir/hdl/}
-#eval file copy -force ${cfg} $outputDir
+eval file copy -force $cfg {$outputDir/hdl/}
 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}/*/flop/*.sv] {$outputDir/hdl/}
+eval file copy -force [glob ${hdl_src}/*/*/*.sv] {$outputDir/hdl/}
 
 # Only for FMA class project; comment out when done
 # eval file copy -force [glob ${hdl_src}/fma/fma16.v] {hdl/}

From e92ccad94fc15cfb52f9e8a748c81d39c0bed141 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Sat, 28 Jan 2023 01:51:34 +0000
Subject: [PATCH 4/8] improved readability for synth scripts

---
 synthDC/Makefile          | 39 ++++++++++++++++++---------------------
 synthDC/scripts/synth.tcl |  6 ++----
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index eeb3de889..06898fa33 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -1,19 +1,18 @@
 #  
 # Makefile for synthesis
 # Shreya Sanghai (ssanghai@hmc.edu) 2/28/2022
-# Madeleine Masser-Frye (mmasserfrye@hmc.edu) 7/8/2022
+# Madeleine Masser-Frye (mmasserfrye@hmc.edu) 1/27/2023
 NAME := synth
 
 # defaults
 export DESIGN ?= wallypipelinedcore
-export FREQ ?= 1000
-export CONFIG ?= rv64gc
+export FREQ ?= 3000
+export CONFIG ?= rv32e
 export MOD ?= orig
-export CONFIGMOD ?= $(CONFIG)_$(MOD)
 # title to add a note in the synth's directory name
 TITLE = 
 # tsmc28, sky130, and sky90 presently supported
-export TECH ?= tsmc28
+export TECH ?= sky90
 # MAXCORES allows parallel compilation, which is faster but less CPU-efficient
 # Avoid when doing sweeps of many optimization points in parallel
 export MAXCORES ?= 1
@@ -27,17 +26,14 @@ hash := $(shell git rev-parse --short HEAD)
 export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(MOD)_$(TECH)nm_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
 export SAIFPOWER ?= 0
 
-configAsList := $(subst _, ,$(CONFIG))
-BASECONFIG := $(word 1, $(configAsList))
 OLDCONFIGDIR ?= ${WALLY}/pipelined/config
 export CONFIGDIR ?= $(OUTPUTDIR)/hdl/config
 CONFIGFILES	?= $(shell find $(CONFIGDIR) -name rv*_*)
 CONFIGFILESTRIM = $(notdir $(CONFIGFILES))
-# k = 3 6 
 
 print:
 	@echo $(FREQS)
-	@echo $(BASECONFIG)
+	@echo $(CONFIG)
 	@echo $(CONFIGFILESTRIM)
 
 
@@ -51,26 +47,27 @@ DIRS32 = rv32e rv32gc rv32ic rv32i
 DIRS64 = rv64i rv64gc
 DIRS = $(DIRS32) $(DIRS64)
 
+# k = 3 6 
 # bpred:
 # 	@$(foreach kval, $(k), rm -rf $(CONFIGDIR)/rv64gc_bpred_$(kval);)
 # 	@$(foreach kval, $(k), cp -r $(CONFIGDIR)/rv64gc $(CONFIGDIR)/rv64gc_bpred_$(kval);)
 # 	@$(foreach kval, $(k), sed -i 's/BPRED_SIZE.*/BPRED_SIZE $(kval)/g' $(CONFIGDIR)/rv64gc_bpred_$(kval)/wally-config.vh;)
 # 	@$(foreach kval, $(k), make synth DESIGN=wallypipelinedcore CONFIG=rv64gc_bpred_$(kval) TECH=sky90 FREQ=500 MAXCORES=4 --jobs;)
 
-configs: $(BASECONFIG)
-$(BASECONFIG):
-	@echo $(BASECONFIG)
-	cp -r $(OLDCONFIGDIR)/$(BASECONFIG) $(CONFIGDIR)/$(BASECONFIG)_orig
-	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
-	sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
-	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 4/g' $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+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 4/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
 
-ifneq ($(filter $ $(BASECONFIG), $(DIRS32)),)
-	sed -i "s/RAM_RANGE.*/RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
-else ifneq ($(filter $ $(BASECONFIG), $(DIRS64)),)
-	sed -i "s/RAM_RANGE.*/RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(BASECONFIG)_orig/wally-config.vh
+ifneq ($(filter $ $(CONFIG), $(DIRS32)),)
+	sed -i "s/RAM_RANGE.*/RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+else ifneq ($(filter $ $(CONFIG), $(DIRS64)),)
+	sed -i "s/RAM_RANGE.*/RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
 else 
-	$(info $(BASECONFIG) does not exist in $(DIRS32) or $(DIRS64))
+	$(info $(CONFIG) does not exist in $(DIRS32) or $(DIRS64))
 	@echo "Config not in list, RAM_RANGE will be unmodified"
 endif
 	
diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl
index 8c5d57988..4cd80e50c 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -16,15 +16,13 @@ suppress_message {VER-173}
 # Enable Multicore
 set_host_options -max_cores $::env(MAXCORES)
 
-# get outputDir from environment (Makefile)
+# get outputDir and configDir from environment (Makefile)
 set outputDir $::env(OUTPUTDIR)
-set cfgName $::env(CONFIGMOD)
-# Config
+set cfg $::env(CONFIGDIR)/$::env(CONFIG)_$::env(MOD)/wally-config.vh
 set hdl_src "../pipelined/src"
 set saifpower $::env(SAIFPOWER)
 set maxopt $::env(MAXOPT)
 set drive $::env(DRIVE)
-set cfg $::env(CONFIGDIR)/${cfgName}/wally-config.vh
 
 eval file copy -force $cfg {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/../config/shared/*.vh] {$outputDir/hdl/}

From 331ae6fffbd9aadeaf3507e5acbfc0f9b82a429c Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Sat, 28 Jan 2023 01:59:08 +0000
Subject: [PATCH 5/8] cleans run directory post run and leaves copy of
 wally-config

---
 synthDC/Makefile          | 2 +-
 synthDC/scripts/synth.tcl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 06898fa33..52f3cc90c 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -107,7 +107,7 @@ mkdirecs:
 	@mkdir -p $(OUTPUTDIR)/mapped
 	@mkdir -p $(OUTPUTDIR)/unmapped
 
-synth: mkdirecs configs rundc #clean TODO
+synth: mkdirecs configs rundc clean
 
 rundc:
 	dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl
index 4cd80e50c..1d7281fcb 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -25,6 +25,7 @@ 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 ${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/}

From d734f7af92cd0ba54560c56032b7edded9a0022e Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Wed, 1 Feb 2023 05:40:35 +0000
Subject: [PATCH 6/8] updated synth makefile to change all relevant ram ranges
 to 1FF

---
 synthDC/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index ec024984e..0f791feae 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -66,9 +66,15 @@ $(CONFIG):
 	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 4/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
 
 ifneq ($(filter $ $(CONFIG), $(DIRS32)),)
-	sed -i "s/RAM_RANGE.*/RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+	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/RAM_RANGE.*/RAM_RANGE	 56\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+	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
 else 
 	$(info $(CONFIG) does not exist in $(DIRS32) or $(DIRS64))
 	@echo "Config not in list, RAM_RANGE will be unmodified"
@@ -106,7 +112,6 @@ endif
 freqs: 
 	@$(foreach freq, $(FREQS), make synth DESIGN=wallypipelinedcore CONFIG=rv32e FREQ=$(freq) MAXCORES=1;)
 
-mkdirecs:
 mkdirecs:
 	@echo "DC Synthesis"
 	@mkdir -p $(OUTPUTDIR)
@@ -116,17 +121,12 @@ mkdirecs:
 	@mkdir -p $(OUTPUTDIR)/mapped
 	@mkdir -p $(OUTPUTDIR)/unmapped
 
-synth: mkdirecs configs rundc clean
-
-rundc:
 
 synth: mkdirecs configs rundc clean
 
 rundc:
 	dc_shell-xg-t -64bit -f scripts/$(NAME).tcl | tee $(OUTPUTDIR)/$(NAME).out
 	
-clean:
-	rm -rf $(OUTPUTDIR)/hdl
 	
 clean:
 	rm -rf $(OUTPUTDIR)/hdl

From a81d569e1a103b1a09da7c4170cecc2b424599a0 Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Wed, 1 Feb 2023 05:51:31 +0000
Subject: [PATCH 7/8] increased bpred size to (2^) 5

---
 synthDC/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 0f791feae..0f64f0966 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -63,7 +63,7 @@ $(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 4/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
+	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 5/g' $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh
 
 ifneq ($(filter $ $(CONFIG), $(DIRS32)),)
 	sed -i "s/DTIM_RANGE.*/DTIM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/$(CONFIG)_orig/wally-config.vh

From 57b35c293d609678af8e5e0a843d210dd2a8d47e Mon Sep 17 00:00:00 2001
From: Madeleine Masser-Frye <51804758+mmasserfrye@users.noreply.github.com>
Date: Wed, 1 Feb 2023 06:08:27 +0000
Subject: [PATCH 8/8] added memories (not tested)

---
 pipelined/config/shared/wally-shared.vh | 2 +-
 pipelined/src/generic/mem/ram1p1rwbe.sv | 2 +-
 synthDC/.synopsys_dc.setup              | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pipelined/config/shared/wally-shared.vh b/pipelined/config/shared/wally-shared.vh
index 4e43c7217..c8f1a667d 100644
--- a/pipelined/config/shared/wally-shared.vh
+++ b/pipelined/config/shared/wally-shared.vh
@@ -34,7 +34,7 @@
 `define ZBS_SUPPORTED 0
 
 // Memory synthesis configuration
-`define USE_SRAM 0
+`define USE_SRAM 1
 
 // shared constants
 `include "wally-constants.vh"
diff --git a/pipelined/src/generic/mem/ram1p1rwbe.sv b/pipelined/src/generic/mem/ram1p1rwbe.sv
index 47b3f1fe7..0dffb2a70 100644
--- a/pipelined/src/generic/mem/ram1p1rwbe.sv
+++ b/pipelined/src/generic/mem/ram1p1rwbe.sv
@@ -55,7 +55,7 @@ module ram1p1rwbe #(parameter DEPTH=128, WIDTH=256) (
      logic [WIDTH-1:0] BitWriteMask;
      for (index=0; index < WIDTH; index++) 
        assign BitWriteMask[index] = bwe[index/8];
-    ram1p1rwbe_64x128 sram1A (.CLK(clk), .CEB(~ce), .WEB(~we),
+    TS1N28HPCPSVTB64X128M4SW sram1A (.CLK(clk), .CEB(~ce), .WEB(~we),
 			      .A(addr), .D(din), 
 			      .BWEB(~BitWriteMask), .Q(dout));
      
diff --git a/synthDC/.synopsys_dc.setup b/synthDC/.synopsys_dc.setup
index ddb62533e..8b0ba0309 100755
--- a/synthDC/.synopsys_dc.setup
+++ b/synthDC/.synopsys_dc.setup
@@ -48,6 +48,10 @@ set cache_read   $cache_write
 lappend search_path ./scripts
 lappend search_path ./hdl
 lappend search_path ./mapped
+set memory /home/jstine/WallyMem/rv64gc/
+lappend target_library $memory/ts3n28hpcpa128x64m8m_130a/NLDM/ts3n28hpcpa128x64m8m_tt0p9v25c.db
+lappend target_library $memory/ts1n28hpcpsvtb64x128m4sw_180a/NLDM/ts1n28hpcpsvtb64x128m4sw_tt0p9v25c.db
+lappend target_library $memory/ts1n28hpcpsvtb64x44m4sw_180a/NLDM/ts1n28hpcpsvtb64x44m4sw_tt0p9v25c.db
 
 # Set up User Information
 set company "Oklahoma State University"