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

Switched back to old, better-tested hub on master

Browse Source
This commit is contained in:
Henry Cook 2013-01-22 19:57:31 -08:00
parent 5b82d72eb7
commit bb5c465bb3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/RocketChip.scala
View File

@ -221,19 +221,21 @@ class OuterMemorySystem(htif_width: Int, tileEndpoints: Seq[ClientCoherenceAgent
val llc = new DRAMSideLLC(512, 8, 4, llc_tag_leaf, llc_data_leaf) val llc = new DRAMSideLLC(512, 8, 4, llc_tag_leaf, llc_data_leaf)
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.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.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)