fixed bugs in global history to read latest GHRE

Cherry pick Shreya's commits into main branch.
This commit is contained in:
Shreya Sanghai 2021-03-31 21:56:14 -04:00 committed by Ross Thompson
parent ccff1e6c99
commit 3696bf4f2c
2 changed files with 8 additions and 6 deletions

View File

@ -99,6 +99,7 @@
/* verilator lint_off ASSIGNDLY */ /* verilator lint_off ASSIGNDLY */
/* verilator lint_off PINCONNECTEMPTY */ /* verilator lint_off PINCONNECTEMPTY */
`define TWO_BIT_PRELOAD "../config/rv64ic/twoBitPredictor.txt" `define TWO_BIT_PRELOAD "../config/rv64imc/twoBitPredictor.txt"
`define BTB_PRELOAD "../config/rv64ic/BTBPredictor.txt" `define BTB_PRELOAD "../config/rv64imc/BTBPredictor.txt"
`define BPTYPE "BPGSHARE" // BPGLOBAL or BPTWOBIT or BPGSHARE `define BPTYPE "BPGSHARE" // BPGLOBAL or BPTWOBIT or BPGSHARE
`define TESTSBP 0

View File

@ -41,12 +41,13 @@ module globalHistoryPredictor
input logic [1:0] UpdatePrediction input logic [1:0] UpdatePrediction
); );
logic [k-1:0] GHRF, GHRD, GHRE; logic [k-1:0] GHRF, GHRD, GHRE, GHRENext;
assign GHRENext = {PCSrcE, GHRE[k-1:1]};
flopenr #(k) GlobalHistoryRegister(.clk(clk), flopenr #(k) GlobalHistoryRegister(.clk(clk),
.reset(reset), .reset(reset),
.en(UpdateEN), .en(UpdateEN),
.d({PCSrcE, GHRF[k-1:1] }), .d(GHRENext),
.q(GHRF)); .q(GHRF));
@ -66,8 +67,8 @@ module globalHistoryPredictor
.reset(reset), .reset(reset),
.RA1(GHRF), .RA1(GHRF),
.RD1(PredictionMemory), .RD1(PredictionMemory),
.REN1(1'b1), .REN1(~StallF),
.WA1(GHRE), .WA1(GHRENext),
.WD1(UpdatePrediction), .WD1(UpdatePrediction),
.WEN1(UpdateEN), .WEN1(UpdateEN),
.BitWEN1(2'b11)); .BitWEN1(2'b11));