1
0

using new network and l2 controller

This commit is contained in:
Henry Cook 2013-01-28 16:57:54 -08:00
parent def11e44b8
commit a0dc8d52d6
3 changed files with 10 additions and 10 deletions

@ -1 +1 @@
Subproject commit 76cb0d00d540d5336dd9871bb7556fc1b42a4d85 Subproject commit 8b3c51e6e8203b507c8782ab660d96ee91da9280

View File

@ -223,21 +223,21 @@ class OuterMemorySystem(htif_width: Int, tileEndpoints: Seq[ClientCoherenceAgent
//val llc = new DRAMSideLLCNull(NGLOBAL_XACTS, REFILL_CYCLES) //val llc = new DRAMSideLLCNull(NGLOBAL_XACTS, REFILL_CYCLES)
val mem_serdes = new MemSerdes(htif_width) val mem_serdes = new MemSerdes(htif_width)
val hub = new CoherenceHubBroadcast()(chWithHtifConf) //val hub = new CoherenceHubBroadcast()(chWithHtifConf)
//val adapter = new CoherenceHubAdapter()(lnWithHtifConf) //val adapter = new CoherenceHubAdapter()(lnWithHtifConf)
//val hub = new L2CoherenceAgent()(chWithHtifConf) val hub = new L2CoherenceAgent()(chWithHtifConf)
//val net = new ReferenceChipCrossbarNetwork(List(hub)++tileEndpoints)(lnWithHtifConf) val net = new ReferenceChipCrossbarNetwork(List(hub)++tileEndpoints)(lnWithHtifConf)
//net.io(0) <> adapter.io.net //net.io(0) <> adapter.io.net
//hub.io.tiles <> adapter.io.hub //hub.io.tiles <> adapter.io.hub
//hub.io.network <> net.io(0) hub.io.network <> net.io(0)
for (i <- 1 to conf.ln.nTiles) { for (i <- 1 to conf.ln.nTiles) {
//net.io(i) <> io.tiles(i-1) net.io(i) <> io.tiles(i-1)
hub.io.tiles(i-1) <> io.tiles(i-1) //hub.io.tiles(i-1) <> io.tiles(i-1)
hub.io.incoherent(i-1) := io.incoherent(i-1) hub.io.incoherent(i-1) := io.incoherent(i-1)
} }
//net.io(conf.ln.nTiles+1) <> io.htif net.io(conf.ln.nTiles+1) <> io.htif
hub.io.tiles(conf.ln.nTiles) <> io.htif //hub.io.tiles(conf.ln.nTiles) <> io.htif
hub.io.incoherent(conf.ln.nTiles) := Bool(true) hub.io.incoherent(conf.ln.nTiles) := Bool(true)
llc.io.cpu.req_cmd <> Queue(hub.io.mem.req_cmd) llc.io.cpu.req_cmd <> Queue(hub.io.mem.req_cmd)

2
uncore

@ -1 +1 @@
Subproject commit bf8c0b248a0ba912aeda50102f28927aec0d5e08 Subproject commit 29e55842f7bd5c119dcac85fbc935fc2c24487b2