colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rvpy to match current fastest config: stage 2 mul, single BTB entry on backward branches

This commit is contained in:
Luke Wren 2022-07-06 13:49:51 +01:00
parent b7d9defcf2
commit 5dfe5cb62b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/sim/rvpy/rvpy
View File

@ -162,6 +162,9 @@ class RVCore:
self.csr = RVCSR() self.csr = RVCSR()
self.stage3_result = None self.stage3_result = None
self.btb_valid = False
self.btb_pc = 0
def step(self, instr=None, log=True, cycle_accurate=True): def step(self, instr=None, log=True, cycle_accurate=True):
if instr is None: if instr is None:
instr = self.mem.mem[self.pc >> 2] instr = self.mem.mem[self.pc >> 2]
@ -242,7 +245,6 @@ class RVCore:
if funct3 != 0b000: if funct3 != 0b000:
mul_result >>= 32 mul_result >>= 32
rd_wdata = sext(mul_result, XLEN - 1) rd_wdata = sext(mul_result, XLEN - 1)
stage3_result_next = regnum_rd
else: else:
if log: if log:
div_instr_name = {0b100: "div", 0b101: "divu", 0b110: "rem", 0b111: "remu"}[funct3] div_instr_name = {0b100: "div", 0b101: "divu", 0b110: "rem", 0b111: "remu"}[funct3]
@ -344,9 +346,17 @@ class RVCore:
instr_invalid = True instr_invalid = True
if not instr_invalid: if not instr_invalid:
stall_cycles += regnum_rs1 == self.stage3_result or regnum_rs2 == self.stage3_result stall_cycles += regnum_rs1 == self.stage3_result or regnum_rs2 == self.stage3_result
predicted_taken = self.btb_valid and self.pc == self.btb_pc
stall_cycles += taken != predicted_taken
if taken: if taken:
pc_wdata = target pc_wdata = target
stall_cycles += 1 if target < self.pc:
self.btb_valid = True
self.btb_pc = self.pc
elif predicted_taken:
self.btb_valid = False
elif opc == OPC_LOAD: elif opc == OPC_LOAD:
imm = imm_i(instr) imm = imm_i(instr)