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

DM cache with assoc-aware subunits passes all asm and bmarks

Browse Source
This commit is contained in:
Henry Cook 2012-01-18 17:53:26 -08:00
parent 8623d58724
commit 97f0852b17
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rocket/src/main/scala/nbdcache.scala
View File

@ -725,10 +725,9 @@ class HellaCacheDM(lines: Int) extends Component {
val wb = new WritebackUnit val wb = new WritebackUnit
val wb_arb = (new Arbiter(2)) { new WritebackReq() } val wb_arb = (new Arbiter(2)) { new WritebackReq() }
wb_arb.io.out <> wb.io.req wb_arb.io.out <> wb.io.req
wb.io.data_req.bits.inner_req <> data_arb.io.in(3).bits wb.io.data_req.bits.inner_req <> data_arb.io.in(3).bits //TODO
wb.io.data_req.ready <> data_arb.io.in(3).ready wb.io.data_req.ready := data_arb.io.in(3).ready
wb.io.data_req.valid <> data_arb.io.in(3).valid data_arb.io.in(3).valid := wb.io.data_req.valid
wb.io.data_resp <> data.io.resp wb.io.data_resp <> data.io.resp
// cpu tag check // cpu tag check
@ -821,7 +820,9 @@ class HellaCacheDM(lines: Int) extends Component {
mshr.io.mem_resp_val := io.mem.resp_val && (~rr_count === UFix(0)) mshr.io.mem_resp_val := io.mem.resp_val && (~rr_count === UFix(0))
mshr.io.mem_resp_tag := io.mem.resp_tag mshr.io.mem_resp_tag := io.mem.resp_tag
mshr.io.mem_req <> wb.io.refill_req mshr.io.mem_req <> wb.io.refill_req
mshr.io.meta_req <> meta_arb.io.in(1) mshr.io.meta_req.bits.inner_req <> meta_arb.io.in(1).bits //TODO
mshr.io.meta_req.ready := meta_arb.io.in(1).ready
meta_arb.io.in(1).valid := mshr.io.meta_req.valid
mshr.io.replay <> replayer.io.replay mshr.io.replay <> replayer.io.replay
replayer.io.sdq_enq.valid := tag_miss && r_req_write && (!dirty || wb_rdy) && mshr.io.req_rdy replayer.io.sdq_enq.valid := tag_miss && r_req_write && (!dirty || wb_rdy) && mshr.io.req_rdy
replayer.io.sdq_enq.bits := storegen.io.dout replayer.io.sdq_enq.bits := storegen.io.dout
@ -875,7 +876,9 @@ class HellaCacheDM(lines: Int) extends Component {
flushed <== flushed && !r_cpu_req_val || r_cpu_req_val && r_req_flush && flush_rdy && flusher.io.req.ready flushed <== flushed && !r_cpu_req_val || r_cpu_req_val && r_req_flush && flush_rdy && flusher.io.req.ready
flusher.io.req.valid := r_cpu_req_val && r_req_flush && flush_rdy && !flushed flusher.io.req.valid := r_cpu_req_val && r_req_flush && flush_rdy && !flushed
flusher.io.wb_req <> wb_arb.io.in(0) flusher.io.wb_req <> wb_arb.io.in(0)
flusher.io.meta_req <> meta_arb.io.in(0) flusher.io.meta_req.bits.inner_req <> meta_arb.io.in(0).bits //TODO
flusher.io.meta_req.ready := meta_arb.io.in(0).ready
meta_arb.io.in(0).valid := flusher.io.meta_req.valid
flusher.io.meta_resp <> meta.io.resp flusher.io.meta_resp <> meta.io.resp
flusher.io.resp.ready := Bool(true) // we don't respond to flush requests flusher.io.resp.ready := Bool(true) // we don't respond to flush requests

7
rocket/src/main/scala/util.scala
View File

@ -42,11 +42,8 @@ object OHToUFix
{ {
def apply(in: Bits): UFix = def apply(in: Bits): UFix =
{ {
var out = UFix(0) val out = MuxCase( UFix(0), (0 until in.getWidth).map( i => (in(i).toBool, UFix(i))))
for(i <- 0 until in.getWidth) out.toUFix
if(in(i) == Bits(1))
out = UFix(i)
out
} }
} }