yystopf
/
riscv-lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改branch ctrl

This commit is contained in:
Liphen 2023-11-20 15:16:48 +08:00
parent d74e4da0ae
commit 6d165c916c
3 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
chisel/playground/src/pipeline/execute/BranchCtrl.scala
View File

@ -1,35 +1,35 @@
// package cpu.pipeline.execute package cpu.pipeline.execute
// import chisel3._ import chisel3._
// import chisel3.util._ import chisel3.util._
// import cpu.defines._ import cpu.defines._
// import cpu.defines.Const._ import cpu.defines.Const._
// class BranchCtrl extends Module { class BranchCtrl extends Module {
// val io = IO(new Bundle { val io = IO(new Bundle {
// val in = new Bundle { val in = new Bundle {
// val inst_info = Input(new InstInfo()) val inst_info = Input(new InstInfo())
// val src_info = Input(new SrcInfo()) val src_info = Input(new SrcInfo())
// val pred_branch = Input(Bool()) val pred_branch = Input(Bool())
// } }
// val out = new Bundle { val out = new Bundle {
// val branch = Output(Bool()) val branch = Output(Bool())
// val pred_fail = Output(Bool()) val pred_fail = Output(Bool())
// } }
// }) })
// val src1 = io.in.src_info.src1_data val src1 = io.in.src_info.src1_data
// val src2 = io.in.src_info.src2_data val src2 = io.in.src_info.src2_data
// io.out.pred_fail := io.in.pred_branch =/= io.out.branch val op = io.in.inst_info.op
// io.out.branch := MuxLookup(io.in.inst_info.op, false.B)( val is_sub = !ALUOpType.isAdd(op)
// Seq( val adder = (src1 +& (src2 ^ Fill(XLEN, is_sub))) + is_sub
// EXE_BEQ -> (src1 === src2), val xor = src1 ^ src2
// EXE_BNE -> (src1 =/= src2), val sltu = !adder(XLEN)
// EXE_BGTZ -> (!src1(31) && (src1 =/= 0.U)), val slt = xor(XLEN - 1) ^ sltu
// EXE_BLEZ -> (src1(31) || src1 === 0.U), val table = List(
// EXE_BGEZ -> (!src1(31)), ALUOpType.getBranchType(ALUOpType.beq) -> !xor.orR,
// EXE_BGEZAL -> (!src1(31)), ALUOpType.getBranchType(ALUOpType.blt) -> slt,
// EXE_BLTZ -> (src1(31)), ALUOpType.getBranchType(ALUOpType.bltu) -> sltu
// EXE_BLTZAL -> (src1(31)) )
// ) io.out.pred_fail := io.in.pred_branch =/= io.out.branch
// ) io.out.branch := Util.LookupTree(ALUOpType.getBranchType(op), table) ^ ALUOpType.isBranchInvert(op)
// } }

6
chisel/playground/src/pipeline/fetch/BranchPredictorUnit.scala
View File

@ -7,6 +7,7 @@ import cpu._
import cpu.pipeline.decoder.Src12Read import cpu.pipeline.decoder.Src12Read
import cpu.defines.ALUOpType import cpu.defines.ALUOpType
import cpu.defines.FuOpType import cpu.defines.FuOpType
import cpu.defines.FuType
class ExecuteUnitBranchPredictor extends Bundle { class ExecuteUnitBranchPredictor extends Bundle {
val bpuConfig = new BranchPredictorConfig() val bpuConfig = new BranchPredictorConfig()
@ -21,6 +22,7 @@ class BranchPredictorIO(implicit config: CpuConfig) extends Bundle {
val decoder = new Bundle { val decoder = new Bundle {
val inst = Input(UInt(INST_WID.W)) val inst = Input(UInt(INST_WID.W))
val op = Input(FuOpType()) val op = Input(FuOpType())
val fusel = Input(FuType())
val ena = Input(Bool()) val ena = Input(Bool())
val pc = Input(UInt(PC_WID.W)) val pc = Input(UInt(PC_WID.W))
val pc_plus4 = Input(UInt(PC_WID.W)) val pc_plus4 = Input(UInt(PC_WID.W))
@ -70,7 +72,7 @@ class GlobalBranchPredictor(
val strongly_not_taken :: weakly_not_taken :: weakly_taken :: strongly_taken :: Nil = Enum(4) val strongly_not_taken :: weakly_not_taken :: weakly_taken :: strongly_taken :: Nil = Enum(4)
io.decoder.branch_inst := ALUOpType.isBru(io.decoder.op) && ALUOpType.isBranch(io.decoder.op) io.decoder.branch_inst := FuType.bru === io.decoder.fusel && ALUOpType.isBranch(io.decoder.op)
io.decoder.branch_target := io.decoder.pc_plus4 + Cat( io.decoder.branch_target := io.decoder.pc_plus4 + Cat(
Fill(14, io.decoder.inst(15)), Fill(14, io.decoder.inst(15)),
io.decoder.inst(15, 0), io.decoder.inst(15, 0),
@ -120,7 +122,7 @@ class AdaptiveTwoLevelPredictor(
val strongly_not_taken :: weakly_not_taken :: weakly_taken :: strongly_taken :: Nil = Enum(4) val strongly_not_taken :: weakly_not_taken :: weakly_taken :: strongly_taken :: Nil = Enum(4)
io.decoder.branch_inst := ALUOpType.isBru(io.decoder.op) && ALUOpType.isBranch(io.decoder.op) io.decoder.branch_inst := FuType.bru === io.decoder.fusel && ALUOpType.isBranch(io.decoder.op)
io.decoder.branch_target := io.decoder.pc_plus4 + Cat( io.decoder.branch_target := io.decoder.pc_plus4 + Cat(
Fill(14, io.decoder.inst(15)), Fill(14, io.decoder.inst(15)),
io.decoder.inst(15, 0), io.decoder.inst(15, 0),

3
chisel/playground/test/src/TestMain.scala
View File

@ -6,10 +6,11 @@ import cpu.pipeline.decoder.DecoderUnit
import cache.ICache import cache.ICache
import cpu.pipeline.fetch.BranchPredictorUnit import cpu.pipeline.fetch.BranchPredictorUnit
import cpu.pipeline.execute.Alu import cpu.pipeline.execute.Alu
import cpu.pipeline.execute.BranchCtrl
object TestMain extends App { object TestMain extends App {
implicit val config = new CpuConfig() implicit val config = new CpuConfig()
def top = new Alu() def top = new BranchCtrl()
val useMFC = false // use MLIR-based firrtl compiler val useMFC = false // use MLIR-based firrtl compiler
val generator = Seq(chisel3.stage.ChiselGeneratorAnnotation(() => top)) val generator = Seq(chisel3.stage.ChiselGeneratorAnnotation(() => top))
if (useMFC) { if (useMFC) {