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

make comparator fit into GroundTest interface

Browse Source
This commit is contained in:
Howard Mao 2016-06-27 16:00:24 -07:00
parent 3d63329b42
commit 7fea376f8c
1 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
groundtest/src/main/scala/comparator.scala
View File

@ -326,14 +326,11 @@ class ComparatorSink(implicit val p: Parameters) extends Module
} }
} }
class ComparatorCore(implicit val p: Parameters) extends Module class ComparatorCore(implicit p: Parameters) extends GroundTest()(p)
with HasComparatorParameters with HasComparatorParameters
with HasTileLinkParameters with HasTileLinkParameters {
{
val io = new Bundle { require (io.mem.size == nTargets)
val uncached = Vec(nTargets, new ClientUncachedTileLinkIO)
val finished = Bool(OUTPUT)
}
val source = Module(new ComparatorSource) val source = Module(new ComparatorSource)
val sink = Module(new ComparatorSink) val sink = Module(new ComparatorSink)
@ -341,35 +338,10 @@ class ComparatorCore(implicit val p: Parameters) extends Module
val client = Module(new ComparatorClient(target)) val client = Module(new ComparatorClient(target))
assert (client.io.in.ready) // must accept assert (client.io.in.ready) // must accept
client.io.in := source.io.out client.io.in := source.io.out
io.uncached(index) <> client.io.tl io.mem(index) <> client.io.tl
sink.io.in(index) <> client.io.out sink.io.in(index) <> client.io.out
client client
} }
io.finished := source.io.finished && sink.io.finished && clients.map(_.io.finished).reduce(_ && _) io.finished := source.io.finished && sink.io.finished && clients.map(_.io.finished).reduce(_ && _)
} }
class ComparatorTile(resetSignal: Bool)(implicit val p: Parameters) extends Tile(resetSignal)(p)
with HasComparatorParameters
with HasTileLinkParameters
{
// Make sure we are configured correctly
require (nCachedTileLinkPorts == 1)
require (nUncachedTileLinkPorts == nTargets)
val core = Module(new ComparatorCore)
// Connect 0..nTargets-1 to core
(io.uncached zip core.io.uncached) map { case (u, c) => u <> c }
when (core.io.finished) {
stop()
}
// Work-around cachedClients must be >= 1 issue
io.cached(0).acquire.valid := Bool(false)
io.cached(0).grant.ready := Bool(false)
io.cached(0).finish.valid := Bool(false)
io.cached(0).probe.ready := io.cached(0).release.ready
io.cached(0).release.valid := io.cached(0).probe.valid
io.cached(0).release.bits := ClientMetadata.onReset.makeRelease(io.cached(0).probe.bits)
}