riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

refine FP bugfixes

Browse Source
This commit is contained in:
Andrew Waterman 2012-04-01 14:52:33 -07:00
parent c7c35322c2
commit 7f254d9670
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rocket/src/main/scala/ctrl.scala
View File

@ -640,7 +640,6 @@ class rocketCtrl extends Component
fp_sboard.io.w(0).en := wb_reg_dcache_miss && wb_reg_fp_wen || wb_reg_fp_sboard_set fp_sboard.io.w(0).en := wb_reg_dcache_miss && wb_reg_fp_wen || wb_reg_fp_sboard_set
fp_sboard.io.w(0).data := Bool(true) fp_sboard.io.w(0).data := Bool(true)
//fp_sboard.io.w(0).addr := io.dpath.wb_waddr
fp_sboard.io.w(0).addr := io.dpath.fp_sboard_wb_waddr fp_sboard.io.w(0).addr := io.dpath.fp_sboard_wb_waddr
fp_sboard.io.w(1).en := io.dpath.fp_sboard_clr fp_sboard.io.w(1).en := io.dpath.fp_sboard_clr
@ -709,8 +708,7 @@ class rocketCtrl extends Component
val replay_ex = wb_reg_dcache_miss && ex_reg_load_use || mem_reg_flush_inst || val replay_ex = wb_reg_dcache_miss && ex_reg_load_use || mem_reg_flush_inst ||
ex_reg_replay || ex_reg_mem_val && !(io.dmem.req_rdy && io.dtlb_rdy) || ex_reg_replay || ex_reg_mem_val && !(io.dmem.req_rdy && io.dtlb_rdy) ||
ex_reg_div_val && !io.dpath.div_rdy || ex_reg_div_val && !io.dpath.div_rdy ||
ex_reg_mul_val && !io.dpath.mul_rdy || ex_reg_mul_val && !io.dpath.mul_rdy
ex_reg_fp_val && io.fpu.nack
val kill_ex = take_pc_wb || replay_ex val kill_ex = take_pc_wb || replay_ex
mem_reg_replay := replay_ex && !take_pc_wb; mem_reg_replay := replay_ex && !take_pc_wb;

5
rocket/src/main/scala/dpath.scala
View File

@ -422,10 +422,7 @@ class rocketDpath extends Component
io.ctrl.sboard_clra := mem_ll_waddr io.ctrl.sboard_clra := mem_ll_waddr
io.ctrl.fp_sboard_clr := r_dmem_fp_replay io.ctrl.fp_sboard_clr := r_dmem_fp_replay
io.ctrl.fp_sboard_clra := r_dmem_resp_waddr io.ctrl.fp_sboard_clra := r_dmem_resp_waddr
io.ctrl.fp_sboard_wb_waddr := Reg(mem_reg_waddr)
val r_mem_reg_waddr = Reg(){UFix(width = 5)}
r_mem_reg_waddr := mem_reg_waddr
io.ctrl.fp_sboard_wb_waddr := r_mem_reg_waddr
// processor control regfile write // processor control regfile write
pcr.io.w.addr := wb_reg_raddr1 pcr.io.w.addr := wb_reg_raddr1

16
rocket/src/main/scala/fpu.scala
View File

@ -170,7 +170,6 @@ class ioDpathFPU extends Bundle {
class ioCtrlFPU extends Bundle { class ioCtrlFPU extends Bundle {
val valid = Bool(OUTPUT) val valid = Bool(OUTPUT)
val nack = Bool(INPUT)
val nack_mem = Bool(INPUT) val nack_mem = Bool(INPUT)
val illegal_rm = Bool(INPUT) val illegal_rm = Bool(INPUT)
val killx = Bool(OUTPUT) val killx = Bool(OUTPUT)
@ -441,7 +440,7 @@ class rocketFPUDFMAPipe(latency: Int) extends Component
val fma = new hardfloat.mulAddSubRecodedFloat64_1 val fma = new hardfloat.mulAddSubRecodedFloat64_1
fma.io.op := cmd fma.io.op := cmd
fma.io.roundingMode := rm fma.io.roundingMode := rm
fma.io.a := in1 fma.io.a := in1
fma.io.b := in2 fma.io.b := in2
fma.io.c := in3 fma.io.c := in3
@ -590,9 +589,9 @@ class rocketFPU(sfma_latency: Int, dfma_latency: Int) extends Component
Mux(ctrl.single, UFix(sfma_latency-1), Mux(ctrl.single, UFix(sfma_latency-1),
UFix(dfma_latency-1))) UFix(dfma_latency-1)))
val mem_fu_latency = Reg(ex_stage_fu_latency - UFix(1)) val mem_fu_latency = Reg(ex_stage_fu_latency - UFix(1))
val write_port_busy = ctrl.fastpipe && wen(fastpipe_latency) || val write_port_busy = Reg(ctrl.fastpipe && wen(fastpipe_latency) ||
Bool(sfma_latency < dfma_latency) && ctrl.fma && ctrl.single && wen(sfma_latency) || Bool(sfma_latency < dfma_latency) && ctrl.fma && ctrl.single && wen(sfma_latency) ||
mem_wen && mem_fu_latency === ex_stage_fu_latency mem_wen && mem_fu_latency === ex_stage_fu_latency)
mem_wen := ex_reg_valid && !io.ctrl.killx && (ctrl.fma || ctrl.fastpipe) mem_wen := ex_reg_valid && !io.ctrl.killx && (ctrl.fma || ctrl.fastpipe)
val ex_stage_wsrc = Cat(ctrl.fastpipe, ctrl.single) val ex_stage_wsrc = Cat(ctrl.fastpipe, ctrl.single)
val mem_winfo = Reg(Cat(ex_reg_inst(31,27), ex_stage_wsrc)) val mem_winfo = Reg(Cat(ex_reg_inst(31,27), ex_stage_wsrc))
@ -606,7 +605,7 @@ class rocketFPU(sfma_latency: Int, dfma_latency: Int) extends Component
wen := (wen >> UFix(1)) | (UFix(1) << mem_fu_latency) wen := (wen >> UFix(1)) | (UFix(1) << mem_fu_latency)
} }
for (i <- 0 until dfma_latency-1) { for (i <- 0 until dfma_latency-1) {
when (UFix(i) === mem_fu_latency) { when (!write_port_busy && UFix(i) === mem_fu_latency) {
winfo(i) := mem_winfo winfo(i) := mem_winfo
} }
} }
@ -634,11 +633,10 @@ class rocketFPU(sfma_latency: Int, dfma_latency: Int) extends Component
fsr_rm := fastpipe.io.out_s(7,5) fsr_rm := fastpipe.io.out_s(7,5)
} }
val fp_inflight = mem_reg_valid && mem_ctrl.toint || wb_reg_valid && wb_ctrl.toint || mem_wen || wen.orR val fp_inflight = wb_reg_valid && wb_ctrl.toint || wen.orR
val fsr_busy = ctrl.rdfsr && fp_inflight || mem_reg_valid && mem_ctrl.wrfsr || wb_reg_valid && wb_ctrl.wrfsr val fsr_busy = mem_ctrl.rdfsr && fp_inflight || wb_reg_valid && wb_ctrl.wrfsr
val units_busy = mem_reg_valid && mem_ctrl.fma && (io.sfma.valid && mem_ctrl.single || io.dfma.valid && !mem_ctrl.single) val units_busy = mem_reg_valid && mem_ctrl.fma && (io.sfma.valid && mem_ctrl.single || io.dfma.valid && !mem_ctrl.single)
io.ctrl.nack := fsr_busy || units_busy || write_port_busy io.ctrl.nack_mem := fsr_busy || units_busy || write_port_busy
io.ctrl.nack_mem := units_busy
io.ctrl.dec <> fp_decoder.io.sigs io.ctrl.dec <> fp_decoder.io.sigs
// we don't currently support round-max-magnitude (rm=4) // we don't currently support round-max-magnitude (rm=4)
io.ctrl.illegal_rm := ex_rm(2) io.ctrl.illegal_rm := ex_rm(2)