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

Make L2 data array use a single Mem

Browse Source
This commit is contained in:
Henry Cook 2015-01-25 15:37:04 -08:00
parent 9ef00d187f
commit f58f8bf385
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
uncore/src/main/scala/cache.scala
View File

@ -214,24 +214,22 @@ class L2DataRWIO extends L2HellaCacheBundle with HasL2DataReadIO with HasL2DataW
class L2DataArray extends L2HellaCacheModule { class L2DataArray extends L2HellaCacheModule {
val io = new L2DataRWIO().flip val io = new L2DataRWIO().flip
val waddr = io.write.bits.addr
val raddr = io.read.bits.addr
val wmask = FillInterleaved(8, io.write.bits.wmask) val wmask = FillInterleaved(8, io.write.bits.wmask)
val resp = (0 until nWays).map { w => val reg_raddr = Reg(UInt())
val array = Mem(Bits(width=rowBits), nSets*refillCycles, seqRead = true) val array = Mem(Bits(width=rowBits), nWays*nSets*refillCycles, seqRead = true)
val reg_raddr = Reg(UInt()) val waddr = Cat(OHToUInt(io.write.bits.way_en), io.write.bits.addr)
when (io.write.bits.way_en(w) && io.write.valid) { val raddr = Cat(OHToUInt(io.read.bits.way_en), io.read.bits.addr)
array.write(waddr, io.write.bits.data, wmask)
}.elsewhen (io.read.bits.way_en(w) && io.read.valid) { when (io.write.bits.way_en.orR && io.write.valid) {
reg_raddr := raddr array.write(waddr, io.write.bits.data, wmask)
} }.elsewhen (io.read.bits.way_en.orR && io.read.valid) {
array(reg_raddr) reg_raddr := raddr
} }
io.resp.valid := ShiftRegister(io.read.fire(), 1) io.resp.valid := ShiftRegister(io.read.fire(), 1)
io.resp.bits.id := ShiftRegister(io.read.bits.id, 1) io.resp.bits.id := ShiftRegister(io.read.bits.id, 1)
io.resp.bits.data := Mux1H(ShiftRegister(io.read.bits.way_en, 1), resp) io.resp.bits.data := array(reg_raddr)
io.read.ready := !io.write.valid
io.read.ready := !io.write.valid // TODO 1R/W vs 1R1W?
io.write.ready := Bool(true) io.write.ready := Bool(true)
} }