Merge pull request #853 from jordancarlin/derivgen_fix

Fix derivgen
This commit is contained in:
David Harris 2024-06-26 08:31:22 -07:00 committed by GitHub
commit a013c7083f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 11 deletions

View File

@ -96,7 +96,7 @@ foreach my $key (@derivnames) {
my @ent = @{$entry}; my @ent = @{$entry};
my $param = $ent[0]; my $param = $ent[0];
my $value = $ent[1]; my $value = $ent[1];
if ($line =~ s/$param\s*=\s*.*;/$param = $value;/) { if ($line =~ s/\b$param\s*=\s*.*;/$param = $value;/) {
$hit{$param} = 1; $hit{$param} = 1;
# print("Hit: new line in $config for $param is $line"); # print("Hit: new line in $config for $param is $line");
} }

View File

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