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

perf: 缩减op信号，增加bru

This commit is contained in:
Liphen 2023-12-13 19:40:01 +08:00
parent 908fd0a377
commit 6f065a9c67
8 changed files with 60 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
chisel/playground/src/defines/isa/Instructions.scala
View File

@ -25,13 +25,13 @@ object SrcType {
} }
object FuType { object FuType {
def num = 5 def num = 6
def alu = "b000".U // arithmetic logic unit def alu = "b000".U // arithmetic logic unit
def lsu = "b001".U // load store unit def lsu = "b001".U // load store unit
def mdu = "b010".U // mul div unit def mdu = "b010".U // mul div unit
def csr = "b011".U // control status register def csr = "b011".U // control status register
def mou = "b100".U // memory order unit def mou = "b100".U // memory order unit
def bru = alu def bru = "b101".U // branch unit
def apply() = UInt(log2Up(num).W) def apply() = UInt(log2Up(num).W)
} }
@ -51,38 +51,40 @@ object BTBtype {
// ALU // ALU
object ALUOpType { object ALUOpType {
def add = "b1000000".U def add = "b100000".U
def sll = "b0000001".U def sll = "b000001".U
def slt = "b0000010".U def slt = "b000010".U
def sltu = "b0000011".U def sltu = "b000011".U
def xor = "b0000100".U def xor = "b000100".U
def srl = "b0000101".U def srl = "b000101".U
def or = "b0000110".U def or = "b000110".U
def and = "b0000111".U def and = "b000111".U
def sub = "b0001000".U def sub = "b001000".U
def sra = "b0001101".U def sra = "b001101".U
def addw = "b1100000".U def addw = "b110000".U
def subw = "b0101000".U def subw = "b011000".U
def sllw = "b0100001".U def sllw = "b010001".U
def srlw = "b0100101".U def srlw = "b010101".U
def sraw = "b0101101".U def sraw = "b011101".U
def isWordOp(func: UInt) = func(5) def isWordOp(func: UInt) = func(4)
def isAdd(func: UInt) = func(5)
}
def jal = "b1011000".U object BRUOpType {
def jalr = "b1011010".U def jal = "b1000".U
def beq = "b0010000".U def jalr = "b1010".U
def bne = "b0010001".U def beq = "b0000".U
def blt = "b0010100".U def bne = "b0001".U
def bge = "b0010101".U def blt = "b0100".U
def bltu = "b0010110".U def bge = "b0101".U
def bgeu = "b0010111".U def bltu = "b0110".U
def bgeu = "b0111".U
def isAdd(func: UInt) = func(6) def isBranch(func: UInt) = !func(3)
def isBru(func: UInt) = func(4) def isJump(func: UInt) = !isBranch(func)
def isBranch(func: UInt) = isBru(func) && !func(3) def isAdd(func: UInt) = isJump(func)
def isJump(func: UInt) = isBru(func) && !isBranch(func)
def getBranchType(func: UInt) = func(2, 1) def getBranchType(func: UInt) = func(2, 1)
def isBranchInvert(func: UInt) = func(0) def isBranchInvert(func: UInt) = func(0)
} }

16
chisel/playground/src/defines/isa/RVI.scala
View File

@ -68,14 +68,14 @@ object RV32I_BRUInstr extends HasInstrType {
def BGEU = BitPat("b???????_?????_?????_111_?????_1100011") def BGEU = BitPat("b???????_?????_?????_111_?????_1100011")
val table = Array( val table = Array(
JAL -> List(InstrJ, FuType.bru, ALUOpType.jal), JAL -> List(InstrJ, FuType.bru, BRUOpType.jal),
JALR -> List(InstrI, FuType.bru, ALUOpType.jalr), JALR -> List(InstrI, FuType.bru, BRUOpType.jalr),
BEQ -> List(InstrB, FuType.bru, ALUOpType.beq), BEQ -> List(InstrB, FuType.bru, BRUOpType.beq),
BNE -> List(InstrB, FuType.bru, ALUOpType.bne), BNE -> List(InstrB, FuType.bru, BRUOpType.bne),
BLT -> List(InstrB, FuType.bru, ALUOpType.blt), BLT -> List(InstrB, FuType.bru, BRUOpType.blt),
BGE -> List(InstrB, FuType.bru, ALUOpType.bge), BGE -> List(InstrB, FuType.bru, BRUOpType.bge),
BLTU -> List(InstrB, FuType.bru, ALUOpType.bltu), BLTU -> List(InstrB, FuType.bru, BRUOpType.bltu),
BGEU -> List(InstrB, FuType.bru, ALUOpType.bgeu) BGEU -> List(InstrB, FuType.bru, BRUOpType.bgeu)
) )
} }

4
chisel/playground/src/pipeline/decoder/Issue.scala
View File

@ -53,8 +53,8 @@ class Issue(implicit val config: CpuConfig) extends Module {
// 指令0为bru指令 // 指令0为bru指令
val is_bru = VecInit( val is_bru = VecInit(
inst0.fusel === FuType.bru && ALUOpType.isBru(io.decodeInst(0).op), inst0.fusel === FuType.bru,
inst1.fusel === FuType.bru && ALUOpType.isBru(io.decodeInst(1).op) inst1.fusel === FuType.bru
) )
// 指令1是否允许执行 // 指令1是否允许执行

4
chisel/playground/src/pipeline/decoder/JumpCtrl.scala
View File

@ -26,8 +26,8 @@ class JumpCtrl(implicit val config: CpuConfig) extends Module {
val valid = io.in.info.valid val valid = io.in.info.valid
val op = io.in.info.op val op = io.in.info.op
val fusel = io.in.info.fusel val fusel = io.in.info.fusel
val jump_inst = VecInit(ALUOpType.jal).contains(op) && fusel === FuType.bru val jump_inst = VecInit(BRUOpType.jal).contains(op) && fusel === FuType.bru
val jump_register_inst = VecInit(ALUOpType.jalr).contains(op) && fusel === FuType.bru val jump_register_inst = VecInit(BRUOpType.jalr).contains(op) && fusel === FuType.bru
io.out.jump_inst := jump_inst || jump_register_inst io.out.jump_inst := jump_inst || jump_register_inst
io.out.jump := (jump_inst || jump_register_inst && !io.out.jump_register) && valid io.out.jump := (jump_inst || jump_register_inst && !io.out.jump_register) && valid
if (config.decoderNum == 2) { if (config.decoderNum == 2) {

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

@ -22,23 +22,23 @@ class BranchCtrl extends Module {
} }
}) })
val valid = val valid =
io.in.info.fusel === FuType.bru && ALUOpType.isBranch(io.in.info.op) && io.in.info.valid io.in.info.fusel === FuType.bru && BRUOpType.isBranch(io.in.info.op) && io.in.info.valid
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
val op = io.in.info.op val op = io.in.info.op
val is_sub = !ALUOpType.isAdd(op) val is_sub = !BRUOpType.isAdd(op)
val adder = (src1 +& (src2 ^ Fill(XLEN, is_sub))) + is_sub val adder = (src1 +& (src2 ^ Fill(XLEN, is_sub))) + is_sub
val xor = src1 ^ src2 val xor = src1 ^ src2
val sltu = !adder(XLEN) val sltu = !adder(XLEN)
val slt = xor(XLEN - 1) ^ sltu val slt = xor(XLEN - 1) ^ sltu
val table = List( val table = List(
ALUOpType.getBranchType(ALUOpType.beq) -> !xor.orR, BRUOpType.getBranchType(BRUOpType.beq) -> !xor.orR,
ALUOpType.getBranchType(ALUOpType.blt) -> slt, BRUOpType.getBranchType(BRUOpType.blt) -> slt,
ALUOpType.getBranchType(ALUOpType.bltu) -> sltu BRUOpType.getBranchType(BRUOpType.bltu) -> sltu
) )
io.out.pred_fail := io.in.pred_branch =/= io.out.branch io.out.pred_fail := io.in.pred_branch =/= io.out.branch
io.out.branch := (LookupTree(ALUOpType.getBranchType(op), table) ^ io.out.branch := (LookupTree(BRUOpType.getBranchType(op), table) ^
ALUOpType.isBranchInvert(op)) & valid BRUOpType.isBranchInvert(op)) & valid
io.out.target := MuxCase( io.out.target := MuxCase(
io.in.pc + 4.U, // 默认顺序运行吧 io.in.pc + 4.U, // 默认顺序运行吧
Seq( Seq(

7
chisel/playground/src/pipeline/execute/ExecuteUnit.scala
View File

@ -119,11 +119,11 @@ class ExecuteUnit(implicit val config: CpuConfig) extends Module {
io.memoryStage.inst0.pc := io.executeStage.inst0.pc io.memoryStage.inst0.pc := io.executeStage.inst0.pc
io.memoryStage.inst0.info := io.executeStage.inst0.info io.memoryStage.inst0.info := io.executeStage.inst0.info
io.memoryStage.inst0.src_info := io.executeStage.inst0.src_info io.memoryStage.inst0.src_info := io.executeStage.inst0.src_info
io.memoryStage.inst0.rd_info.wdata := DontCare
io.memoryStage.inst0.rd_info.wdata(FuType.alu) := fu.inst(0).result.alu io.memoryStage.inst0.rd_info.wdata(FuType.alu) := fu.inst(0).result.alu
io.memoryStage.inst0.rd_info.wdata(FuType.bru) := io.executeStage.inst0.pc + 4.U
io.memoryStage.inst0.rd_info.wdata(FuType.mdu) := fu.inst(0).result.mdu io.memoryStage.inst0.rd_info.wdata(FuType.mdu) := fu.inst(0).result.mdu
io.memoryStage.inst0.rd_info.wdata(FuType.csr) := io.csr.out.rdata io.memoryStage.inst0.rd_info.wdata(FuType.csr) := io.csr.out.rdata
io.memoryStage.inst0.rd_info.wdata(FuType.lsu) := 0.U
io.memoryStage.inst0.rd_info.wdata(FuType.mou) := 0.U
val has_ex0 = val has_ex0 =
(HasExcInt(io.executeStage.inst0.ex)) && io.executeStage.inst0.info.valid (HasExcInt(io.executeStage.inst0.ex)) && io.executeStage.inst0.info.valid
io.memoryStage.inst0.ex := Mux( io.memoryStage.inst0.ex := Mux(
@ -144,11 +144,10 @@ class ExecuteUnit(implicit val config: CpuConfig) extends Module {
io.memoryStage.inst1.pc := io.executeStage.inst1.pc io.memoryStage.inst1.pc := io.executeStage.inst1.pc
io.memoryStage.inst1.info := io.executeStage.inst1.info io.memoryStage.inst1.info := io.executeStage.inst1.info
io.memoryStage.inst1.src_info := io.executeStage.inst1.src_info io.memoryStage.inst1.src_info := io.executeStage.inst1.src_info
io.memoryStage.inst1.rd_info.wdata := DontCare
io.memoryStage.inst1.rd_info.wdata(FuType.alu) := fu.inst(1).result.alu io.memoryStage.inst1.rd_info.wdata(FuType.alu) := fu.inst(1).result.alu
io.memoryStage.inst1.rd_info.wdata(FuType.mdu) := fu.inst(1).result.mdu io.memoryStage.inst1.rd_info.wdata(FuType.mdu) := fu.inst(1).result.mdu
io.memoryStage.inst1.rd_info.wdata(FuType.csr) := io.csr.out.rdata io.memoryStage.inst1.rd_info.wdata(FuType.csr) := io.csr.out.rdata
io.memoryStage.inst1.rd_info.wdata(FuType.lsu) := 0.U
io.memoryStage.inst1.rd_info.wdata(FuType.mou) := 0.U
val has_ex1 = val has_ex1 =
(HasExcInt(io.executeStage.inst1.ex)) && io.executeStage.inst1.info.valid (HasExcInt(io.executeStage.inst1.ex)) && io.executeStage.inst1.info.valid
io.memoryStage.inst1.ex := Mux( io.memoryStage.inst1.ex := Mux(

6
chisel/playground/src/pipeline/execute/Fu.scala
View File

@ -70,11 +70,7 @@ class Fu(implicit val config: CpuConfig) extends Module {
io.stall_req := io.inst.map(_.info.fusel === FuType.mdu).reduce(_ || _) && !mdu.ready io.stall_req := io.inst.map(_.info.fusel === FuType.mdu).reduce(_ || _) && !mdu.ready
io.inst(0).result.alu := Mux( io.inst(0).result.alu := alu(0).io.result
ALUOpType.isBru(io.inst(0).info.op),
io.inst(0).pc + 4.U,
alu(0).io.result
)
io.inst(0).result.mdu := mdu.result io.inst(0).result.mdu := mdu.result
io.inst(1).result.alu := alu(1).io.result io.inst(1).result.alu := alu(1).io.result

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

@ -5,7 +5,7 @@ import chisel3.util._
import cpu.defines.Const._ import cpu.defines.Const._
import cpu._ import cpu._
import cpu.pipeline.decoder.Src12Read import cpu.pipeline.decoder.Src12Read
import cpu.defines.ALUOpType import cpu.defines.BRUOpType
import cpu.defines.FuOpType import cpu.defines.FuOpType
import cpu.defines.FuType import cpu.defines.FuType
import cpu.defines.SignedExtend import cpu.defines.SignedExtend
@ -61,7 +61,7 @@ class GlobalBranchPredictor(
val imm = io.decoder.info.imm val imm = io.decoder.info.imm
io.decoder.branch_inst := io.decoder.info.valid && io.decoder.branch_inst := io.decoder.info.valid &&
FuType.bru === io.decoder.info.fusel && ALUOpType.isBranch(io.decoder.info.op) FuType.bru === io.decoder.info.fusel && BRUOpType.isBranch(io.decoder.info.op)
io.decoder.branch_target := io.decoder.pc + imm io.decoder.branch_target := io.decoder.pc + imm
// 局部预测模式 // 局部预测模式
@ -110,7 +110,7 @@ class AdaptiveTwoLevelPredictor(
val imm = io.decoder.info.imm val imm = io.decoder.info.imm
io.decoder.branch_inst := io.decoder.info.valid && io.decoder.branch_inst := io.decoder.info.valid &&
FuType.bru === io.decoder.info.fusel && ALUOpType.isBranch(io.decoder.info.op) FuType.bru === io.decoder.info.fusel && BRUOpType.isBranch(io.decoder.info.op)
io.decoder.branch_target := io.decoder.pc + imm io.decoder.branch_target := io.decoder.pc + imm
val bht = RegInit(VecInit(Seq.fill(1 << BHT_DEPTH)(0.U(PHT_DEPTH.W)))) val bht = RegInit(VecInit(Seq.fill(1 << BHT_DEPTH)(0.U(PHT_DEPTH.W))))