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

rocketchip: pull rtcTick out of the coreplex

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-10-28 22:37:46 -07:00
parent 5bca13ebdb
commit 688e1bffdf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/coreplex/BaseCoreplex.scala
View File

@ -122,9 +122,10 @@ trait CoreplexRISCVBundle {
val mem = Vec(nMemChannels, new ClientUncachedTileLinkIO()(outerMemParams)) val mem = Vec(nMemChannels, new ClientUncachedTileLinkIO()(outerMemParams))
val slave = Vec(nSlaves, new ClientUncachedTileLinkIO()(innerParams)).flip val slave = Vec(nSlaves, new ClientUncachedTileLinkIO()(innerParams)).flip
val debug = new DebugBusIO().flip
val rtcTick = Bool(INPUT)
val resetVector = UInt(INPUT, p(XLen)) val resetVector = UInt(INPUT, p(XLen))
val success = Bool(OUTPUT) // used for testing val success = Bool(OUTPUT) // used for testing
val debug = new DebugBusIO().flip
} }
trait CoreplexRISCVModule { trait CoreplexRISCVModule {
@ -215,7 +216,7 @@ trait CoreplexRISCVModule {
} }
outer.debug.module.io.db <> io.debug outer.debug.module.io.db <> io.debug
outer.clint.module.io.rtcTick := Counter(p(rocketchip.RTCPeriod)).inc() outer.clint.module.io.rtcTick := io.rtcTick
// Coreplex doesn't know when to stop running // Coreplex doesn't know when to stop running
io.success := Bool(false) io.success := Bool(false)

2
src/main/scala/rocketchip/BaseTop.scala
View File

@ -69,8 +69,10 @@ trait TopNetworkModule extends HasPeripheryParameters {
val coreplexMem : Vec[ClientUncachedTileLinkIO] = Wire(outer.coreplex.module.io.mem) val coreplexMem : Vec[ClientUncachedTileLinkIO] = Wire(outer.coreplex.module.io.mem)
val coreplexSlave: Vec[ClientUncachedTileLinkIO] = Wire(outer.coreplex.module.io.slave) val coreplexSlave: Vec[ClientUncachedTileLinkIO] = Wire(outer.coreplex.module.io.slave)
val coreplexDebug: DebugBusIO = Wire(outer.coreplex.module.io.debug) val coreplexDebug: DebugBusIO = Wire(outer.coreplex.module.io.debug)
val coreplexRtc : Bool = Wire(outer.coreplex.module.io.rtcTick)
io.success := outer.coreplex.module.io.success io.success := outer.coreplex.module.io.success
coreplexRtc := Counter(p(rocketchip.RTCPeriod)).inc()
} }
/** Base Top with no Periphery */ /** Base Top with no Periphery */