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

fix up ReorderQueue CAM

Browse Source
This commit is contained in:
Howard Mao 2016-07-13 12:11:43 -07:00
parent c0dc09b3a1
commit 37fd11870c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
junctions/src/main/scala/util.scala
View File

@ -186,17 +186,17 @@ class ReorderQueue[T <: Data](dType: T, tagWidth: Int, size: Option[Int] = None)
val actualSize = size.getOrElse(tagSpaceSize) val actualSize = size.getOrElse(tagSpaceSize)
if (tagSpaceSize > actualSize) { if (tagSpaceSize > actualSize) {
val roq_data = Mem(actualSize, dType) val roq_data = Reg(Vec(actualSize, dType))
val roq_tags = Reg(Vec(actualSize, UInt(width = tagWidth))) val roq_tags = Reg(Vec(actualSize, UInt(width = tagWidth)))
val roq_free = Reg(init = Vec.fill(actualSize)(Bool(true))) val roq_free = Reg(init = Vec.fill(actualSize)(Bool(true)))
val roq_enq_addr = PriorityEncoder(roq_free) val roq_enq_addr = PriorityEncoder(roq_free)
val roq_matches = roq_tags.zip(roq_free) val roq_matches = roq_tags.zip(roq_free)
.map { case (tag, free) => tag === io.deq.tag && !free } .map { case (tag, free) => tag === io.deq.tag && !free }
val roq_deq_addr = PriorityEncoder(roq_matches) val roq_deq_onehot = PriorityEncoderOH(roq_matches)
io.enq.ready := roq_free.reduce(_ || _) io.enq.ready := roq_free.reduce(_ || _)
io.deq.data := roq_data(roq_deq_addr) io.deq.data := Mux1H(roq_deq_onehot, roq_data)
io.deq.matches := roq_matches.reduce(_ || _) io.deq.matches := roq_matches.reduce(_ || _)
when (io.enq.valid && io.enq.ready) { when (io.enq.valid && io.enq.ready) {
@ -206,10 +206,10 @@ class ReorderQueue[T <: Data](dType: T, tagWidth: Int, size: Option[Int] = None)
} }
when (io.deq.valid) { when (io.deq.valid) {
roq_free(roq_deq_addr) := Bool(true) roq_free(OHToUInt(roq_deq_onehot)) := Bool(true)
} }
println("Warning: inferring a CAM for ReorderQueue") println(s"Warning - using a CAM for ReorderQueue, tagBits: ${tagWidth} size: ${actualSize}")
} else { } else {
val roq_data = Mem(tagSpaceSize, dType) val roq_data = Mem(tagSpaceSize, dType)
val roq_free = Reg(init = Vec.fill(tagSpaceSize)(Bool(true))) val roq_free = Reg(init = Vec.fill(tagSpaceSize)(Bool(true)))