From e682b8d0d40590d6c4047a28eea030201c41b21c Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 05:55:31 -0800 Subject: [PATCH 1/6] renamed brpred to bpred --- pipelined/src/ifu/{brpred => bpred}/RAsPredictor.sv | 0 pipelined/src/ifu/{brpred => bpred}/bpred.sv | 0 pipelined/src/ifu/{brpred => bpred}/btb.sv | 0 pipelined/src/ifu/{brpred => bpred}/foldedgshare.sv | 0 pipelined/src/ifu/{brpred => bpred}/globalhistory.sv | 0 pipelined/src/ifu/{brpred => bpred}/gshare.sv | 0 pipelined/src/ifu/{brpred => bpred}/localHistoryPredictor.sv | 0 pipelined/src/ifu/{brpred => bpred}/optgshare.sv | 0 pipelined/src/ifu/{brpred => bpred}/satCounter2.sv | 0 pipelined/src/ifu/{brpred => bpred}/speculativeglobalhistory.sv | 0 pipelined/src/ifu/{brpred => bpred}/speculativegshare.sv | 0 pipelined/src/ifu/{brpred => bpred}/twoBitPredictor.sv | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename pipelined/src/ifu/{brpred => bpred}/RAsPredictor.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/bpred.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/btb.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/foldedgshare.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/globalhistory.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/gshare.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/localHistoryPredictor.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/optgshare.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/satCounter2.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/speculativeglobalhistory.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/speculativegshare.sv (100%) rename pipelined/src/ifu/{brpred => bpred}/twoBitPredictor.sv (100%) diff --git a/pipelined/src/ifu/brpred/RAsPredictor.sv b/pipelined/src/ifu/bpred/RAsPredictor.sv similarity index 100% rename from pipelined/src/ifu/brpred/RAsPredictor.sv rename to pipelined/src/ifu/bpred/RAsPredictor.sv diff --git a/pipelined/src/ifu/brpred/bpred.sv b/pipelined/src/ifu/bpred/bpred.sv similarity index 100% rename from pipelined/src/ifu/brpred/bpred.sv rename to pipelined/src/ifu/bpred/bpred.sv diff --git a/pipelined/src/ifu/brpred/btb.sv b/pipelined/src/ifu/bpred/btb.sv similarity index 100% rename from pipelined/src/ifu/brpred/btb.sv rename to pipelined/src/ifu/bpred/btb.sv diff --git a/pipelined/src/ifu/brpred/foldedgshare.sv b/pipelined/src/ifu/bpred/foldedgshare.sv similarity index 100% rename from pipelined/src/ifu/brpred/foldedgshare.sv rename to pipelined/src/ifu/bpred/foldedgshare.sv diff --git a/pipelined/src/ifu/brpred/globalhistory.sv b/pipelined/src/ifu/bpred/globalhistory.sv similarity index 100% rename from pipelined/src/ifu/brpred/globalhistory.sv rename to pipelined/src/ifu/bpred/globalhistory.sv diff --git a/pipelined/src/ifu/brpred/gshare.sv b/pipelined/src/ifu/bpred/gshare.sv similarity index 100% rename from pipelined/src/ifu/brpred/gshare.sv rename to pipelined/src/ifu/bpred/gshare.sv diff --git a/pipelined/src/ifu/brpred/localHistoryPredictor.sv b/pipelined/src/ifu/bpred/localHistoryPredictor.sv similarity index 100% rename from pipelined/src/ifu/brpred/localHistoryPredictor.sv rename to pipelined/src/ifu/bpred/localHistoryPredictor.sv diff --git a/pipelined/src/ifu/brpred/optgshare.sv b/pipelined/src/ifu/bpred/optgshare.sv similarity index 100% rename from pipelined/src/ifu/brpred/optgshare.sv rename to pipelined/src/ifu/bpred/optgshare.sv diff --git a/pipelined/src/ifu/brpred/satCounter2.sv b/pipelined/src/ifu/bpred/satCounter2.sv similarity index 100% rename from pipelined/src/ifu/brpred/satCounter2.sv rename to pipelined/src/ifu/bpred/satCounter2.sv diff --git a/pipelined/src/ifu/brpred/speculativeglobalhistory.sv b/pipelined/src/ifu/bpred/speculativeglobalhistory.sv similarity index 100% rename from pipelined/src/ifu/brpred/speculativeglobalhistory.sv rename to pipelined/src/ifu/bpred/speculativeglobalhistory.sv diff --git a/pipelined/src/ifu/brpred/speculativegshare.sv b/pipelined/src/ifu/bpred/speculativegshare.sv similarity index 100% rename from pipelined/src/ifu/brpred/speculativegshare.sv rename to pipelined/src/ifu/bpred/speculativegshare.sv diff --git a/pipelined/src/ifu/brpred/twoBitPredictor.sv b/pipelined/src/ifu/bpred/twoBitPredictor.sv similarity index 100% rename from pipelined/src/ifu/brpred/twoBitPredictor.sv rename to pipelined/src/ifu/bpred/twoBitPredictor.sv From 4f7e1b942348fa4bdb2afe2c207af9382eb3d6fe Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 05:55:53 -0800 Subject: [PATCH 2/6] Fixed typo in bpred preventing compiling --- pipelined/src/ifu/bpred/bpred.sv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelined/src/ifu/bpred/bpred.sv b/pipelined/src/ifu/bpred/bpred.sv index 4e1ada3c1..0319d3a08 100644 --- a/pipelined/src/ifu/bpred/bpred.sv +++ b/pipelined/src/ifu/bpred/bpred.sv @@ -49,7 +49,7 @@ module bpred ( // Branch and jump outcome input logic PCSrcE, // Executation stage branch is taken input logic [`XLEN-1:0] IEUAdrE, // The branch/jump target address - input logic [`XLEN-1:0] dPCLinkE, // The address following the branch instruction. (AKA Fall through address) + input logic [`XLEN-1:0] PCLinkE, // The address following the branch instruction. (AKA Fall through address) output logic [3:0] InstrClassM, // The valid instruction class. 1-hot encoded as jalr, ret, jr (not ret), j, br // Report branch prediction status From b81b5781e18237f684853644d707a67bbf5a1a2b Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 05:56:49 -0800 Subject: [PATCH 3/6] Renamed spike_rv32imc_isa.yaml to rv32gc to reflect cases tested --- .../spike/{spike_rv32imc_isa.yaml => spike_rv32gc_isa.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/riscof/spike/{spike_rv32imc_isa.yaml => spike_rv32gc_isa.yaml} (100%) diff --git a/tests/riscof/spike/spike_rv32imc_isa.yaml b/tests/riscof/spike/spike_rv32gc_isa.yaml similarity index 100% rename from tests/riscof/spike/spike_rv32imc_isa.yaml rename to tests/riscof/spike/spike_rv32gc_isa.yaml From 4744996282f2e9272f28b2a69430df56384dec6e Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 05:57:05 -0800 Subject: [PATCH 4/6] Removed suggestion about make allclean --- pipelined/regression/regression-wally | 3 --- 1 file changed, 3 deletions(-) diff --git a/pipelined/regression/regression-wally b/pipelined/regression/regression-wally index 6bbaa04b9..7398d7cec 100755 --- a/pipelined/regression/regression-wally +++ b/pipelined/regression/regression-wally @@ -204,9 +204,6 @@ def main(): # Count the number of failures if num_fail: print(f"{bcolors.FAIL}Regression failed with %s failed configurations{bcolors.ENDC}" % num_fail) - # Remind the user to try `make allclean`, since it may be needed if test - # cases have changed - print("Reminder: have you run `make allclean`?") else: print(f"{bcolors.OKGREEN}SUCCESS! All tests ran without failures{bcolors.ENDC}") return num_fail From 7fbbed7927de65ff3135e7bfce63e19210f91ccf Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 05:57:58 -0800 Subject: [PATCH 5/6] Update riscof makefile to use rv32gc config --- tests/riscof/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile index 2918494dd..d963e4f0d 100644 --- a/tests/riscof/Makefile +++ b/tests/riscof/Makefile @@ -16,7 +16,7 @@ root: mkdir -p $(work) mkdir -p $(arch_workdir) mkdir -p $(wally_workdir) - sed 's,{0},$(current_dir),g;s,{1},32imc,g' config.ini > config32.ini + sed 's,{0},$(current_dir),g;s,{1},32gc,g' config.ini > config32.ini sed 's,{0},$(current_dir),g;s,{1},64gc,g' config.ini > config64.ini sed 's,{0},$(current_dir),g;s,{1},32e,g' config.ini > config32e.ini From 37ba3d0fcde99f79072496173b9a31b172ce175b Mon Sep 17 00:00:00 2001 From: David Harris Date: Fri, 27 Jan 2023 06:15:20 -0800 Subject: [PATCH 6/6] Removed f tests from rv32e --- tests/riscof/spike/spike_rv32e_isa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/riscof/spike/spike_rv32e_isa.yaml b/tests/riscof/spike/spike_rv32e_isa.yaml index 7ae54347a..9e9775a9b 100644 --- a/tests/riscof/spike/spike_rv32e_isa.yaml +++ b/tests/riscof/spike/spike_rv32e_isa.yaml @@ -1,11 +1,11 @@ hart_ids: [0] hart0: - ISA: RV32EMFCZicsr_Zifencei + ISA: RV32EMCZicsr_Zifencei physical_addr_sz: 32 User_Spec_Version: '2.3' supported_xlen: [32] misa: - reset-val: 0x40001034 + reset-val: 0x40001014 rv32: accessible: true mxl: