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

tile: disable more monitors on slave port

Browse Source
This commit is contained in:
Henry Cook 2018-01-08 18:41:55 -08:00
parent 5075a93e6c
commit 11e5b620f8
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/coreplex/RocketCoreplex.scala
View File

@ -118,18 +118,14 @@ trait HasRocketTiles extends HasTiles
def tileSlaveBuffering: TLInwardNode = rocket { def tileSlaveBuffering: TLInwardNode = rocket {
val slaveBuffer = LazyModule(new TLBuffer(BufferParams.flow, BufferParams.none, BufferParams.none, BufferParams.none, BufferParams.none)) val slaveBuffer = LazyModule(new TLBuffer(BufferParams.flow, BufferParams.none, BufferParams.none, BufferParams.none, BufferParams.none))
crossing.crossingType match { crossing.crossingType match {
case _: SynchronousCrossing => rocket.slaveNode // requirement already checked case RationalCrossing(_) if (tp.boundaryBuffers) => rocket.slaveNode :*= slaveBuffer.node
case _: AsynchronousCrossing => rocket.slaveNode case _ => rocket.slaveNode
case _: RationalCrossing =>
if (tp.boundaryBuffers) {
DisableMonitors { implicit p => rocket.slaveNode :*= slaveBuffer.node }
} else {
rocket.slaveNode
}
} }
} }
pbus.toTile(tp.name) { implicit p => crossing.slave.adapt(this)(tileSlaveBuffering :*= rocket.crossTLIn) } pbus.toTile(tp.name) { implicit p => crossing.slave.adapt(this)( DisableMonitors { implicit p =>
tileSlaveBuffering :*= rocket.crossTLIn
})}
// Handle all the different types of interrupts crossing to or from the tile: // Handle all the different types of interrupts crossing to or from the tile:
// 1. Debug interrupt is definitely asynchronous in all cases. // 1. Debug interrupt is definitely asynchronous in all cases.
@ -151,7 +147,7 @@ trait HasRocketTiles extends HasTiles
if (tp.core.useVM) periphIntNode := plic.intnode // seip if (tp.core.useVM) periphIntNode := plic.intnode // seip
// 3. local interrupts never cross // 3. local interrupts never cross
// this.intInwardNode is wired up externally // lip // rocket.intInwardNode is wired up externally // lip
// 4. conditional crossing from core to PLIC // 4. conditional crossing from core to PLIC
FlipRendering { implicit p => FlipRendering { implicit p =>

2
src/main/scala/tile/RocketTile.scala
View File

@ -66,7 +66,7 @@ class RocketTile(
// TODO: this doesn't block other masters, e.g. RoCCs // TODO: this doesn't block other masters, e.g. RoCCs
tlOtherMastersNode := tile_master_blocker.map { _.node := tlMasterXbar.node } getOrElse { tlMasterXbar.node } tlOtherMastersNode := tile_master_blocker.map { _.node := tlMasterXbar.node } getOrElse { tlMasterXbar.node }
masterNode :=* tlOtherMastersNode masterNode :=* tlOtherMastersNode
tlSlaveXbar.node :*= slaveNode DisableMonitors { implicit p => tlSlaveXbar.node :*= slaveNode }
def findScratchpadFromICache: Option[AddressSet] = dtim_adapter.map { s => def findScratchpadFromICache: Option[AddressSet] = dtim_adapter.map { s =>
val finalNode = frontend.masterNode.edges.out.head.manager.managers.find(_.nodePath.last == s.node) val finalNode = frontend.masterNode.edges.out.head.manager.managers.find(_.nodePath.last == s.node)