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

Optimize ShiftQueue for late-arriving deq.ready

Browse Source
This commit is contained in:
Andrew Waterman 2017-08-04 22:06:37 -07:00
parent 6112adfbb0
commit bc298bf146
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/scala/util/ShiftQueue.scala
View File

@ -20,20 +20,20 @@ class ShiftQueue[T <: Data](gen: T,
private val valid = RegInit(Vec.fill(entries) { Bool(false) }) private val valid = RegInit(Vec.fill(entries) { Bool(false) })
private val elts = Reg(Vec(entries, gen)) private val elts = Reg(Vec(entries, gen))
private val do_enq = io.enq.fire()
private val do_deq = io.deq.fire()
for (i <- 0 until entries) { for (i <- 0 until entries) {
def paddedValid(i: Int) = if (i == -1) true.B else if (i == entries) false.B else valid(i)
val wdata = if (i == entries-1) io.enq.bits else Mux(valid(i+1), elts(i+1), io.enq.bits) val wdata = if (i == entries-1) io.enq.bits else Mux(valid(i+1), elts(i+1), io.enq.bits)
val shiftDown = if (i == entries-1) false.B else io.deq.ready && valid(i+1) val wen =
val enqNew = io.enq.fire() && Mux(io.deq.ready, valid(i), !valid(i) && (if (i == 0) true.B else valid(i-1))) Mux(io.deq.ready,
when (shiftDown || enqNew) { elts(i) := wdata } paddedValid(i+1) || io.enq.fire() && valid(i),
} io.enq.fire() && paddedValid(i-1) && !valid(i))
when (wen) { elts(i) := wdata }
val padded = Seq(true.B) ++ valid ++ Seq(false.B) valid(i) :=
for (i <- 0 until entries) { Mux(io.deq.ready,
when ( do_enq && !do_deq && padded(i+0)) { valid(i) := true.B } paddedValid(i+1) || io.enq.fire() && (Bool(i == 0 && !flow) || valid(i)),
when (!do_enq && do_deq && !padded(i+2)) { valid(i) := false.B } io.enq.fire() && paddedValid(i-1) || valid(i))
} }
io.enq.ready := !valid(entries-1) io.enq.ready := !valid(entries-1)