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

fix seqRead inference

Browse Source
This commit is contained in:
Yunsup Lee 2013-03-19 00:41:09 -07:00
parent 944f56a766
commit 717a78f964
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
uncore/src/llc.scala
View File

@ -40,7 +40,7 @@ class BigMem[T <: Data](n: Int, preLatency: Int, postLatency: Int, leaf: Mem[Bit
for (j <- 0 until nWide) { for (j <- 0 until nWide) {
val mem = leaf.clone val mem = leaf.clone
var dout: Bits = null var dout: Bits = null
val dout1 = if (postLatency > 0) Reg() { Bits() } else null val ridx = if (postLatency > 0) Reg() { Bits() } else null
var wmask0 = Fill(colMux, wmask(math.min(wmask.getWidth, leaf.data.width*(j+1))-1, leaf.data.width*j)) var wmask0 = Fill(colMux, wmask(math.min(wmask.getWidth, leaf.data.width*(j+1))-1, leaf.data.width*j))
if (colMux > 1) if (colMux > 1)
@ -48,15 +48,15 @@ class BigMem[T <: Data](n: Int, preLatency: Int, postLatency: Int, leaf: Mem[Bit
val wdata0 = Fill(colMux, wdata(math.min(wdata.getWidth, leaf.data.width*(j+1))-1, leaf.data.width*j)) val wdata0 = Fill(colMux, wdata(math.min(wdata.getWidth, leaf.data.width*(j+1))-1, leaf.data.width*j))
when (in.valid) { when (in.valid) {
when (in.bits.rw) { mem.write(idx, wdata0, wmask0) } when (in.bits.rw) { mem.write(idx, wdata0, wmask0) }
.otherwise { if (postLatency > 0) dout1 := mem(idx) } .otherwise { if (postLatency > 0) ridx := idx }
} }
if (postLatency == 0) { if (postLatency == 0) {
dout = mem(idx) dout = mem(idx)
} else if (postLatency == 1) { } else if (postLatency == 1) {
dout = dout1 dout = mem(ridx)
} else } else
dout = Pipe(reg_ren, dout1, postLatency-1).bits dout = Pipe(reg_ren, mem(ridx), postLatency-1).bits
rdata(j) := dout rdata(j) := dout
} }