Various Chisel3 compatibility changes
This commit is contained in:
		| @@ -103,9 +103,9 @@ class MultiChannelTop extends Module with TopLevelParameters { | ||||
|   // Connect the uncore to the tile memory ports, HostIO and MemIO | ||||
|   uncore.io.tiles_cached <> tileList.map(_.io.cached) | ||||
|   uncore.io.tiles_uncached <> tileList.map(_.io.uncached) | ||||
|   uncore.io.host <> io.host | ||||
|   uncore.io.mem <> io.mem | ||||
|   if(params(UseBackupMemoryPort)) { uncore.io.mem_backup_ctrl <> io.mem_backup_ctrl } | ||||
|   io.host <> uncore.io.host | ||||
|   io.mem <> uncore.io.mem | ||||
|   if(params(UseBackupMemoryPort)) { io.mem_backup_ctrl <> uncore.io.mem_backup_ctrl } | ||||
| } | ||||
|  | ||||
| /** Wrapper around everything that isn't a Tile. | ||||
| @@ -133,7 +133,7 @@ class Uncore extends Module with TopLevelParameters { | ||||
|   // Wire the htif to the memory port(s) and host interface | ||||
|   io.host.debug_stats_pcr := htif.io.host.debug_stats_pcr | ||||
|   htif.io.cpu <> io.htif | ||||
|   outmemsys.io.mem <> io.mem | ||||
|   io.mem <> outmemsys.io.mem | ||||
|   if(params(UseBackupMemoryPort)) { | ||||
|     outmemsys.io.mem_backup_en := io.mem_backup_ctrl.en | ||||
|     VLSIUtils.padOutHTIFWithDividedClock(htif.io, outmemsys.io.mem_backup, io.mem_backup_ctrl, io.host, htifW) | ||||
| @@ -188,7 +188,7 @@ class OuterMemorySystem extends Module with TopLevelParameters { | ||||
|       val arb = Module(new RocketChipTileLinkArbiter(managerDepths = backendBuffering))(outerTLParams) | ||||
|       val conv = Module(new MemPipeIOTileLinkIOConverter(nMemReqs))(outerTLParams) | ||||
|       arb.io.clients <> banks.map(_.outerTL) | ||||
|       conv.io.tl <> arb.io.managers.head | ||||
|       arb.io.managers.head <> conv.io.tl | ||||
|       MemIOMemPipeIOConverter(conv.io.mem) | ||||
|     } else { | ||||
|       val arb = Module(new RocketChipTileLinkArbiter(managerDepths = backendBuffering))(outerTLParams) | ||||
| @@ -196,7 +196,7 @@ class OuterMemorySystem extends Module with TopLevelParameters { | ||||
|       val conv2 = Module(new MemIONASTISlaveIOConverter(params(CacheBlockOffsetBits))) | ||||
|       val conv3 = Module(new MemPipeIOMemIOConverter(nMemReqs)) | ||||
|       arb.io.clients <> banks.map(_.outerTL) | ||||
|       conv1.io.tl <> arb.io.managers.head | ||||
|       arb.io.managers.head <> conv1.io.tl | ||||
|       conv2.io.nasti <> conv1.io.nasti | ||||
|       conv3.io.cpu.req_cmd <> Queue(conv2.io.mem.req_cmd, 2) | ||||
|       conv3.io.cpu.req_data <> Queue(conv2.io.mem.req_data, mifDataBeats) | ||||
|   | ||||
| @@ -24,7 +24,7 @@ object VLSIUtils { | ||||
|     val arb = Module(new MemIOArbiter(nMemChannels)) | ||||
|     val mem_serdes = Module(new MemSerdes(htifWidth)) | ||||
|     mem_serdes.io.wide <> arb.io.outer | ||||
|     mem_serdes.io.narrow <> backup | ||||
|     backup <> mem_serdes.io.narrow | ||||
|  | ||||
|     llcs zip mems zip arb.io.inner foreach { case ((llc, mem), wide) => | ||||
|       llc.req_cmd.ready := Mux(en, wide.req_cmd.ready, mem.req_cmd.ready) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user