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

fix(lsu): 修复amo指令问题

This commit is contained in:
Liphen 2024-01-20 17:05:03 +08:00
parent 9ac5f99e1f
commit 5e338f97a6
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
chisel/playground/src/pipeline/memory/Lsu.scala
View File

@ -91,7 +91,7 @@ class Lsu(implicit val cpuConfig: CpuConfig) extends Module {
lr := io.memoryUnit.in.lr lr := io.memoryUnit.in.lr
lrAddr := io.memoryUnit.in.lr_addr lrAddr := io.memoryUnit.in.lr_addr
val s_idle :: s_sc :: s_amo_l :: s_amo_a :: s_amo_s :: Nil = Enum(5) val s_idle :: s_sc :: s_amo_a :: s_amo_s :: Nil = Enum(4)
val state = RegInit(s_idle) val state = RegInit(s_idle)
val atomMemReg = Reg(UInt(XLEN.W)) val atomMemReg = Reg(UInt(XLEN.W))
@ -116,24 +116,13 @@ class Lsu(implicit val cpuConfig: CpuConfig) extends Module {
io.memoryUnit.out.complete_single_request := complete_single_request io.memoryUnit.out.complete_single_request := complete_single_request
switch(state) { switch(state) {
is(s_idle) { // calculate address is(s_idle) { // 0
lsExe.in.mem_en := io.memoryUnit.in.mem_en && !atomReq lsExe.in.mem_en := io.memoryUnit.in.mem_en && !atomReq
lsExe.in.mem_addr := src1 + imm lsExe.in.mem_addr := src1 + imm
lsExe.in.info.op := func lsExe.in.info.op := func
lsExe.in.wdata := src2 lsExe.in.wdata := src2
io.memoryUnit.out.ready := lsExe.out.ready || scInvalid io.memoryUnit.out.ready := lsExe.out.ready || scInvalid
when(amoReq) { state := s_amo_l } when(amoReq) {
when(lrReq) {
lsExe.in.mem_en := true.B
lsExe.in.mem_addr := src1
lsExe.in.info.op := Mux(atomWidthD, LSUOpType.ld, LSUOpType.lw)
lsExe.in.wdata := DontCare
io.memoryUnit.out.ready := lsExe.out.ready
}
when(scReq) { state := Mux(scInvalid, s_idle, s_sc) }
}
is(s_amo_l) {
lsExe.in.mem_en := true.B lsExe.in.mem_en := true.B
lsExe.in.mem_addr := src1 lsExe.in.mem_addr := src1
lsExe.in.info.op := Mux(atomWidthD, LSUOpType.ld, LSUOpType.lw) lsExe.in.info.op := Mux(atomWidthD, LSUOpType.ld, LSUOpType.lw)
@ -147,29 +136,17 @@ class Lsu(implicit val cpuConfig: CpuConfig) extends Module {
atomMemReg := lsExe.out.rdata atomMemReg := lsExe.out.rdata
atomRegReg := lsExe.out.rdata atomRegReg := lsExe.out.rdata
} }
when(lrReq) {
is(s_amo_a) {
lsExe.in.mem_en := false.B
lsExe.in.mem_addr := DontCare
lsExe.in.info.op := DontCare
lsExe.in.wdata := DontCare
io.memoryUnit.out.ready := false.B
state := s_amo_s
atomMemReg := atomAlu.out.result
}
is(s_amo_s) {
lsExe.in.mem_en := true.B lsExe.in.mem_en := true.B
lsExe.in.mem_addr := src1 lsExe.in.mem_addr := src1
lsExe.in.info.op := Mux(atomWidthD, LSUOpType.sd, LSUOpType.sw) lsExe.in.info.op := Mux(atomWidthD, LSUOpType.ld, LSUOpType.lw)
lsExe.in.wdata := atomMemReg lsExe.in.wdata := DontCare
io.memoryUnit.out.ready := lsExe.out.ready io.memoryUnit.out.ready := lsExe.out.ready
when(allow_to_go) {
state := s_idle
} }
when(scReq) { state := Mux(scInvalid, s_idle, s_sc) }
} }
is(s_sc) { is(s_sc) { // 1
lsExe.in.mem_en := true.B lsExe.in.mem_en := true.B
lsExe.in.mem_addr := src1 lsExe.in.mem_addr := src1
lsExe.in.info.op := Mux(atomWidthD, LSUOpType.sd, LSUOpType.sw) lsExe.in.info.op := Mux(atomWidthD, LSUOpType.sd, LSUOpType.sw)
@ -179,7 +156,29 @@ class Lsu(implicit val cpuConfig: CpuConfig) extends Module {
state := s_idle state := s_idle
} }
} }
is(s_amo_a) { // 2
lsExe.in.mem_en := false.B
lsExe.in.mem_addr := DontCare
lsExe.in.info.op := DontCare
lsExe.in.wdata := DontCare
io.memoryUnit.out.ready := false.B
state := s_amo_s
atomMemReg := atomAlu.out.result
} }
is(s_amo_s) { // 3
lsExe.in.mem_en := true.B
lsExe.in.mem_addr := src1
lsExe.in.info.op := Mux(atomWidthD, LSUOpType.sd, LSUOpType.sw)
lsExe.in.wdata := atomMemReg
io.memoryUnit.out.ready := lsExe.out.ready
when(allow_to_go) {
state := s_idle
}
}
}
when( when(
lsExe.out.addr_misaligned || lsExe.out.addr_misaligned ||
lsExe.out.access_fault || lsExe.out.access_fault ||