Updated configs for local branch history `defines.

config/buildroot/wally-config.vh

@@ -132,6 +132,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 

config/fpga/wally-config.vh

@@ -141,6 +141,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 12
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 

config/rv32e/wally-config.vh

@@ -136,6 +136,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 0

config/rv32gc/wally-config.vh

@@ -133,8 +133,9 @@
 `define PLIC_UART_ID 10
 
 `define BPRED_SUPPORTED 1
-`define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
+`define BPRED_TYPE "BP_LOCAL_BASIC" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 16
+`define BPRED_NUM_LHR 8
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 1

config/rv32i/wally-config.vh

@@ -136,6 +136,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 0

config/rv32imc/wally-config.vh

@@ -135,6 +135,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 0

config/rv64fpquad/wally-config.vh

@@ -138,6 +138,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 0

config/rv64gc/wally-config.vh

@@ -136,8 +136,10 @@
 `define PLIC_UART_ID 10
 
 `define BPRED_SUPPORTED 1
-`define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
+//`define BPRED_TYPE "BP_GLOBAL_BASIC" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
+`define BPRED_TYPE "BP_LOCAL_BASIC" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 1

config/rv64i/wally-config.vh

@@ -138,6 +138,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BP_GSHARE" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 10
+`define BPRED_NUM_LHR 6
 `define BTB_SIZE 10
 
 `define SVADU_SUPPORTED 0

src/ifu/bpred/bpred.sv

@@ -127,8 +127,8 @@ module bpred (
       .PCNextF, .PCM, .BPDirPredF, .BPDirPredWrongE,
       .BranchE, .BranchM, .PCSrcE);
   
-  end else if (`BPRED_TYPE == "BP_LOCAL") begin:Predictor
-    localHistoryPredictor #(`BPRED_NUM_LHR, `BPRED_SIZE)
+  end else if (`BPRED_TYPE == "BP_LOCAL_BASIC") begin:Predictor
+    localbpbasic #(`BPRED_NUM_LHR, `BPRED_SIZE)
 DirPredictor(.clk, .reset, .StallF, .StallD, .StallE, .StallM, .StallW, .FlushD, .FlushE, .FlushM, .FlushW,
       .PCNextF, .PCM, .BPDirPredF, .BPDirPredWrongE,
       .BranchE, .BranchM, .PCSrcE);

src/ifu/bpred/localbpbasic.sv

@@ -29,8 +29,8 @@
 
 `include "wally-config.vh"
 
-module localHistoryPredictor #(parameter m = 6, // 2^m = number of local history branches 
-                               parameter k = 10) ( // number of past branches stored
+module localbpbasic #(parameter m = 6, // 2^m = number of local history branches 
+                      parameter k = 10) ( // number of past branches stored
   input logic             clk,
   input logic             reset,
   input logic             StallF, StallD, StallE, StallM, StallW,