From b692c913c4908bbaf7e3407727681eb216c69f0b Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Sat, 18 Nov 2023 20:56:50 -0800
Subject: [PATCH] Changed rv32gc to do IDIV in MDU and have k=2 copies of FDIV
 stages; added correct sky130 adder data; fixed feature substitution in
 synthesis makefile

---
 config/rv32gc/config.vh   | 2 +-
 synthDC/Makefile          | 4 ++--
 synthDC/extractSummary.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/rv32gc/config.vh b/config/rv32gc/config.vh
index e095e6252..52baad796 100644
--- a/config/rv32gc/config.vh
+++ b/config/rv32gc/config.vh
@@ -169,7 +169,7 @@ localparam ZMMUL_SUPPORTED = 0;
 
 // FPU division architecture
 localparam RADIX = 32'd4;
-localparam DIVCOPIES = 32'd4;
+localparam DIVCOPIES = 32'd2;
 
 // bit manipulation
 localparam ZBA_SUPPORTED = 1;
diff --git a/synthDC/Makefile b/synthDC/Makefile
index 2183cab83..7968a7b52 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -94,10 +94,10 @@ endif
 
 ifneq ($(MOD), orig)
 	# PMP 0
-	sed -i 's/PMP_ENTRIES \(64\|16\|0\)/PMP_ENTRIES = 0;/' $(CONFIGDIR)/config.vh
+	sed -i 's/PMP_ENTRIES.*\(64\|16\)/PMP_ENTRIES = 0;/' $(CONFIGDIR)/config.vh
 ifneq ($(MOD), PMP0)
 	# no priv
-	sed -i 's/ZICSR_SUPPORTED *1/ZICSR_SUPPORTED = 0;/' $(CONFIGDIR)/config.vh
+	sed -i 's/ZICSR_SUPPORTED.*1/ZICSR_SUPPORTED = 0;/' $(CONFIGDIR)/config.vh
 ifneq ($(MOD), noPriv)
 	# turn off FPU 
 	sed -i 's/1 *<< *3/0 << 3/' $(CONFIGDIR)/config.vh
diff --git a/synthDC/extractSummary.py b/synthDC/extractSummary.py
index 7a3f45ddd..d6f5933a9 100755
--- a/synthDC/extractSummary.py
+++ b/synthDC/extractSummary.py
@@ -252,7 +252,7 @@ if __name__ == '__main__':
 
     TechSpec = namedtuple("TechSpec", "color shape targfreq fo4 add32area add32lpower add32denergy")
     techdict = {}
-    techdict['sky130'] = TechSpec('green', 'o', args.sky130freq, 99.5e-3, 1440.600027, 714.057, 0.658023)
+    techdict['sky130'] = TechSpec('green', 'o', args.sky130freq, 99.5e-3, 2581, 18, 0.685)
     techdict['sky90'] = TechSpec('gray', 'o', args.sky90freq, 43.2e-3, 1440.600027, 714.057, 0.658023)
     techdict['tsmc28psyn'] = TechSpec('blue', 's', args.tsmcfreq, 12.2e-3, 209.286002, 1060.0, .081533)