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

diplomacy: BufferParams can now directly create a Queue

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-06-14 13:45:12 -07:00
parent 36562ce48e
commit 4a15d47061
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/diplomacy/Parameters.scala
View File

@ -248,6 +248,10 @@ case class BufferParams(depth: Int, flow: Boolean, pipe: Boolean)
require (depth >= 0, "Buffer depth must be >= 0") require (depth >= 0, "Buffer depth must be >= 0")
def isDefined = depth > 0 def isDefined = depth > 0
def latency = if (isDefined && !flow) 1 else 0 def latency = if (isDefined && !flow) 1 else 0
def apply[T <: Data](x: DecoupledIO[T]) =
if (isDefined) Queue(x, depth, flow=flow, pipe=pipe)
else x
} }
object BufferParams object BufferParams

18
src/main/scala/uncore/tilelink2/Buffer.scala
View File

@ -29,22 +29,14 @@ class TLBuffer(
val out = node.bundleOut val out = node.bundleOut
} }
def buffer[T <: Data](config: BufferParams, data: DecoupledIO[T]): DecoupledIO[T] = {
if (config.isDefined) {
Queue(data, config.depth, pipe=config.pipe, flow=config.flow)
} else {
data
}
}
((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)) =>
out.a <> buffer(a, in .a) out.a <> a(in .a)
in .d <> buffer(d, out.d) in .d <> d(out.d)
if (edgeOut.manager.anySupportAcquireB && edgeOut.client.anySupportProbe) { if (edgeOut.manager.anySupportAcquireB && edgeOut.client.anySupportProbe) {
in .b <> buffer(b, out.b) in .b <> b(out.b)
out.c <> buffer(c, in .c) out.c <> c(in .c)
out.e <> buffer(e, in .e) out.e <> e(in .e)
} else { } else {
in.b.valid := Bool(false) in.b.valid := Bool(false)
in.c.ready := Bool(true) in.c.ready := Bool(true)