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

axi4: Deinterleaver need not make a Q for an unused AXI id

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-06-23 16:01:31 -07:00
parent 9bea7c1c58
commit feecfb53ed
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/scala/uncore/axi4/Deinterleaver.scala
View File

@ -28,7 +28,7 @@ class AXI4Deinterleaver(maxReadBytes: Int)(implicit p: Parameters) extends LazyM
} }
((io.in zip io.out) zip (node.edgesIn zip node.edgesOut)) foreach { case ((in, out), (edgeIn, edgeOut)) => ((io.in zip io.out) zip (node.edgesIn zip node.edgesOut)) foreach { case ((in, out), (edgeIn, edgeOut)) =>
val queues = edgeOut.master.endId val endId = edgeOut.master.endId
val beatBytes = edgeOut.slave.beatBytes val beatBytes = edgeOut.slave.beatBytes
val beats = (maxReadBytes+beatBytes-1) / beatBytes val beats = (maxReadBytes+beatBytes-1) / beatBytes
@ -42,31 +42,43 @@ class AXI4Deinterleaver(maxReadBytes: Int)(implicit p: Parameters) extends LazyM
// Nothing to do if only single-beat R // Nothing to do if only single-beat R
in.r <> out.r in.r <> out.r
} else { } else {
// Buffer R response // Queues to buffer R responses
val count = RegInit(Vec.fill(queues) { UInt(0, width=log2Ceil(beats+1)) }) val qs = Seq.tabulate(endId) { i =>
val qs = Seq.fill(queues) { Module(new Queue(out.r.bits, beats)) } val depth = edgeOut.master.masters.find(_.id.contains(i)).flatMap(_.maxFlight).getOrElse(0)
if (depth > 0) {
Module(new Queue(out.r.bits, beats)).io
} else {
Wire(new QueueIO(out.r.bits, beats))
}
}
// Which ID is being enqueued and dequeued? // Which ID is being enqueued and dequeued?
val locked = RegInit(Bool(false)) val locked = RegInit(Bool(false))
val deq_id = Reg(UInt(width=log2Up(queues))) val deq_id = Reg(UInt(width=log2Up(endId)))
val enq_id = out.r.bits.id val enq_id = out.r.bits.id
val deq_OH = UIntToOH(deq_id, queues) val deq_OH = UIntToOH(deq_id, endId)
val enq_OH = UIntToOH(enq_id, queues) val enq_OH = UIntToOH(enq_id, endId)
// Track the number of completely received bursts per FIFO id // Track the number of completely received bursts per FIFO id
val next_count = Wire(count) val pending = Cat(Seq.tabulate(endId) { i =>
((count zip next_count) zip (enq_OH.toBools zip deq_OH.toBools)) foreach { case ((p, n), (i, d)) => val depth = edgeOut.master.masters.find(_.id.contains(i)).flatMap(_.maxFlight).getOrElse(0)
val inc = i && out.r.fire() && out.r.bits.last if (depth == 0) {
val dec = d && in.r.fire() && in.r.bits.last Bool(false)
n := p + inc.asUInt - dec.asUInt } else {
// Bounds checking val count = RegInit(UInt(0, width=log2Ceil(beats+1)))
assert (!dec || p =/= UInt(0)) val next = Wire(count)
assert (!inc || p =/= UInt(beats)) val inc = enq_OH(i) && out.r.fire() && out.r.bits.last
} val dec = deq_OH(i) && in.r.fire() && in.r.bits.last
count := next_count next := count + inc.asUInt - dec.asUInt
count := next
// Bounds checking
assert (!dec || count =/= UInt(0))
assert (!inc || count =/= UInt(beats))
next =/= UInt(0)
}
}.reverse)
// Select which Q will we start sending next cycle // Select which Q will we start sending next cycle
val pending = Cat(next_count.map(_ =/= UInt(0)).reverse)
val winner = pending & ~(leftOR(pending) << 1) val winner = pending & ~(leftOR(pending) << 1)
when (!locked || (in.r.fire() && in.r.bits.last)) { when (!locked || (in.r.fire() && in.r.bits.last)) {
locked := pending.orR locked := pending.orR
@ -75,16 +87,16 @@ class AXI4Deinterleaver(maxReadBytes: Int)(implicit p: Parameters) extends LazyM
// Transmit the selected burst to inner // Transmit the selected burst to inner
in.r.valid := locked in.r.valid := locked
in.r.bits := Vec(qs.map(_.io.deq.bits))(deq_id) in.r.bits := Vec(qs.map(_.deq.bits))(deq_id)
(deq_OH.toBools zip qs) foreach { case (s, q) => (deq_OH.toBools zip qs) foreach { case (s, q) =>
q.io.deq.ready := s && in.r.fire() q.deq.ready := s && in.r.fire()
} }
// Feed response into matching Q // Feed response into matching Q
out.r.ready := Vec(qs.map(_.io.enq.ready))(enq_id) out.r.ready := Vec(qs.map(_.enq.ready))(enq_id)
(enq_OH.toBools zip qs) foreach { case (s, q) => (enq_OH.toBools zip qs) foreach { case (s, q) =>
q.io.enq.valid := s && out.r.valid q.enq.valid := s && out.r.valid
q.io.enq.bits := out.r.bits q.enq.bits := out.r.bits
} }
} }
} }