1
0

no longer require caching interfaces for groundtest tiles

This commit is contained in:
Howard Mao 2016-06-27 16:02:47 -07:00
parent 2dd8d90ae4
commit d10fc84a8b
4 changed files with 41 additions and 8 deletions

@ -1 +1 @@
Subproject commit 961f3543a5a85a45da5bd36dbf9c16a34f19ecd0 Subproject commit 074d444f02d6edf8905ecc4feb20763c37f9a767

View File

@ -186,7 +186,9 @@ class Uncore(implicit val p: Parameters) extends Module
val debugBus = new DebugBusIO()(p).flip val debugBus = new DebugBusIO()(p).flip
} }
val outmemsys = Module(new OuterMemorySystem) // NoC, LLC and SerDes val outmemsys = if (nCachedTilePorts + nUncachedTilePorts > 0)
Module(new OuterMemorySystem) // NoC, LLC and SerDes
else Module(new DummyOuterMemorySystem)
outmemsys.io.incoherent foreach (_ := false) outmemsys.io.incoherent foreach (_ := false)
outmemsys.io.tiles_uncached <> io.tiles_uncached outmemsys.io.tiles_uncached <> io.tiles_uncached
outmemsys.io.tiles_cached <> io.tiles_cached outmemsys.io.tiles_cached <> io.tiles_cached
@ -254,19 +256,48 @@ class Uncore(implicit val p: Parameters) extends Module
} }
} }
/** The whole outer memory hierarchy, including a NoC, some kind of coherence abstract class AbstractOuterMemorySystem(implicit val p: Parameters)
* manager agent, and a converter from TileLink to MemIO. extends Module with HasTopLevelParameters {
*/
class OuterMemorySystem(implicit val p: Parameters) extends Module with HasTopLevelParameters {
val io = new Bundle { val io = new Bundle {
val tiles_cached = Vec(nCachedTilePorts, new ClientTileLinkIO).flip val tiles_cached = Vec(nCachedTilePorts, new ClientTileLinkIO).flip
val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip
val incoherent = Vec(nTiles, Bool()).asInput val incoherent = Vec(nCachedTilePorts, Bool()).asInput
val mem_axi = Vec(nMemAXIChannels, new NastiIO) val mem_axi = Vec(nMemAXIChannels, new NastiIO)
val mem_ahb = Vec(nMemAHBChannels, new HastiMasterIO) val mem_ahb = Vec(nMemAHBChannels, new HastiMasterIO)
val mmio = new ClientUncachedTileLinkIO()(p.alterPartial({case TLId => "L2toMMIO"})) val mmio = new ClientUncachedTileLinkIO()(p.alterPartial({case TLId => "L2toMMIO"}))
} }
}
/** Use in place of OuterMemorySystem if there are no clients to connect. */
class DummyOuterMemorySystem(implicit p: Parameters) extends AbstractOuterMemorySystem()(p) {
require(nCachedTilePorts + nUncachedTilePorts == 0)
io.mem_axi.foreach { axi =>
axi.ar.valid := Bool(false)
axi.aw.valid := Bool(false)
axi.w.valid := Bool(false)
axi.r.ready := Bool(false)
axi.b.ready := Bool(false)
}
io.mem_ahb.foreach { ahb =>
ahb.htrans := UInt(0)
ahb.hmastlock := Bool(false)
ahb.hwrite := Bool(false)
ahb.haddr := UInt(0)
ahb.hburst := UInt(0)
ahb.hsize := UInt(0)
ahb.hprot := UInt(0)
}
io.mmio.acquire.valid := Bool(false)
io.mmio.grant.ready := Bool(false)
}
/** The whole outer memory hierarchy, including a NoC, some kind of coherence
* manager agent, and a converter from TileLink to MemIO.
*/
class OuterMemorySystem(implicit p: Parameters) extends AbstractOuterMemorySystem()(p) {
// Create a simple L1toL2 NoC between the tiles and the banks of outer memory // Create a simple L1toL2 NoC between the tiles and the banks of outer memory
// Cached ports are first in client list, making sharerToClientId just an indentity function // Cached ports are first in client list, making sharerToClientId just an indentity function
// addrToBank is sed to hash physical addresses (of cache blocks) to banks (and thereby memory channels) // addrToBank is sed to hash physical addresses (of cache blocks) to banks (and thereby memory channels)

View File

@ -36,6 +36,8 @@ class WithGroundTest extends Config(
(r: Bool, p: Parameters) => (r: Bool, p: Parameters) =>
Module(new GroundTestTile(i, r)(p.alterPartial({ Module(new GroundTestTile(i, r)(p.alterPartial({
case TLId => "L1toL2" case TLId => "L1toL2"
case NCachedTileLinkPorts =>
if (p(GroundTestCachedClients) > 0) 1 else 0
case NUncachedTileLinkPorts => p(GroundTestUncachedClients) case NUncachedTileLinkPorts => p(GroundTestUncachedClients)
}))) })))
} }

2
uncore

@ -1 +1 @@
Subproject commit 85ba64a92cc8d6efefb3dcedaf1319355e3f3db1 Subproject commit 689a3373de64fd3dd6904a6b0f7a2d0d642d6f8d