From 0da6e359880cce4fb98cdf4fcd747ce1a5894b2c Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 26 Jun 2024 07:45:04 -0700
Subject: [PATCH 1/2] Fix derivgen.pl to find exact keys

---
 bin/derivgen.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/derivgen.pl b/bin/derivgen.pl
index 21ffc7019..dbb856781 100755
--- a/bin/derivgen.pl
+++ b/bin/derivgen.pl
@@ -96,7 +96,7 @@ foreach my $key (@derivnames) {
             my @ent = @{$entry};
             my $param = $ent[0];
             my $value = $ent[1]; 
-            if ($line =~ s/$param\s*=\s*.*;/$param = $value;/) {
+            if ($line =~ s/\b$param\s*=\s*.*;/$param = $value;/) {
                 $hit{$param} = 1;
 #               print("Hit: new line in $config for $param is $line");
             }
@@ -130,4 +130,4 @@ sub printref {
         print join('_', @{$entry}), ', ';
     }
     print("\n");
-}
\ No newline at end of file
+}

From 1a1da9b2c4fc2f57e35a19d4191a627baf22edc7 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 26 Jun 2024 07:49:27 -0700
Subject: [PATCH 2/2] Update derivlist.txt based on exact matching

---
 config/derivlist.txt | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/derivlist.txt b/config/derivlist.txt
index 04f02a181..6e28710bc 100644
--- a/config/derivlist.txt
+++ b/config/derivlist.txt
@@ -58,15 +58,17 @@ PLIC_SDC_ID         32'd20
 BPRED_SIZE          32'd12
 
 # The syn configurations are trimmed down for faster synthesis.  
-deriv   syn_rv32e   rv32e
-DTIM_RANGE          64'h1FF
-IROM_RANGE          64'h1FF
-BOOTROM_RANGE       64'h1FF
-UNCORE_RAM_RANGE    64'h1FF
-WAYSIZEINBYTES      32'd512
-NUMWAYS             32'd1
-BPRED_SIZE          32'd5
-BTB_SIZE            32'd5 
+deriv   syn_rv32e       rv32e
+DTIM_RANGE              64'h1FF
+IROM_RANGE              64'h1FF
+BOOTROM_RANGE           64'h1FF
+UNCORE_RAM_RANGE        64'h1FF
+DCACHE_WAYSIZEINBYTES   32'd512
+ICACHE_WAYSIZEINBYTES   32'd512
+DCACHE_NUMWAYS          32'd1
+ICACHE_NUMWAYS          32'd1
+BPRED_SIZE              32'd5
+BTB_SIZE                32'd5 
 
 # The other syn configurations have the same trimming
 deriv syn_rv32i rv32i syn_rv32e
@@ -101,10 +103,14 @@ ZICSR_SUPPORTED     0
 
 deriv syn_rv64gc_noFPU syn_rv64gc_noPriv
 F_SUPPORTED         0
+ZCF_SUPPORTED       0
 D_SUPPORTED         0
+ZCD_SUPPORTED       0
 deriv syn_sram_rv64gc_noFPU syn_sram_rv64gc_noPriv
 F_SUPPORTED         0
+ZCF_SUPPORTED       0
 D_SUPPORTED         0
+ZCD_SUPPORTED       0
 
 deriv syn_rv64gc_noMulDiv syn_rv64gc_noFPU
 M_SUPPORTED         0