Merge pull request #32 from davidharrishmc/dev

Dev

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

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

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
 

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: