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

coreplex: rename trait CoreplexRISCVPlatform

Browse Source 
This makes it clear we are talking about the devices one expects in the
platform, not the ISA.
This commit is contained in:
Wesley W. Terpstra 2016-10-31 11:40:33 -07:00
parent f943c5d6ef
commit f83d1d0aaf
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ trait CoreplexNetworkModule extends HasCoreplexParameters {
implicit val p = outer.p implicit val p = outer.p
} }
trait CoreplexRISCV { trait CoreplexRISCVPlatform {
this: CoreplexNetwork => this: CoreplexNetwork =>
// Build a set of Tiles // Build a set of Tiles
@ -118,9 +118,9 @@ trait CoreplexRISCV {
tileIntNodes.foreach { _ := plic.intnode } tileIntNodes.foreach { _ := plic.intnode }
} }
trait CoreplexRISCVBundle { trait CoreplexRISCVPlatformBundle {
this: CoreplexNetworkBundle { this: CoreplexNetworkBundle {
val outer: CoreplexRISCV val outer: CoreplexRISCVPlatform
} => } =>
val mem = Vec(nMemChannels, new ClientUncachedTileLinkIO()(outerMemParams)) val mem = Vec(nMemChannels, new ClientUncachedTileLinkIO()(outerMemParams))
@ -131,10 +131,10 @@ trait CoreplexRISCVBundle {
val success = Bool(OUTPUT) // used for testing val success = Bool(OUTPUT) // used for testing
} }
trait CoreplexRISCVModule { trait CoreplexRISCVPlatformModule {
this: CoreplexNetworkModule { this: CoreplexNetworkModule {
val outer: CoreplexNetwork with CoreplexRISCV val outer: CoreplexNetwork with CoreplexRISCVPlatform
val io: CoreplexRISCVBundle val io: CoreplexRISCVPlatformBundle
} => } =>
val tiles = outer.lazyTiles.map(_.module) val tiles = outer.lazyTiles.map(_.module)
@ -231,14 +231,14 @@ trait CoreplexRISCVModule {
class BaseCoreplex(implicit p: Parameters) extends BareCoreplex class BaseCoreplex(implicit p: Parameters) extends BareCoreplex
with CoreplexNetwork with CoreplexNetwork
with CoreplexRISCV { with CoreplexRISCVPlatform {
override lazy val module = new BaseCoreplexModule(this, () => new BaseCoreplexBundle(this)) override lazy val module = new BaseCoreplexModule(this, () => new BaseCoreplexBundle(this))
} }
class BaseCoreplexBundle[+L <: BaseCoreplex](_outer: L) extends BareCoreplexBundle(_outer) class BaseCoreplexBundle[+L <: BaseCoreplex](_outer: L) extends BareCoreplexBundle(_outer)
with CoreplexNetworkBundle with CoreplexNetworkBundle
with CoreplexRISCVBundle with CoreplexRISCVPlatformBundle
class BaseCoreplexModule[+L <: BaseCoreplex, +B <: BaseCoreplexBundle[L]](_outer: L, _io: () => B) extends BareCoreplexModule(_outer, _io) class BaseCoreplexModule[+L <: BaseCoreplex, +B <: BaseCoreplexBundle[L]](_outer: L, _io: () => B) extends BareCoreplexModule(_outer, _io)
with CoreplexNetworkModule with CoreplexNetworkModule
with CoreplexRISCVModule with CoreplexRISCVPlatformModule

10
src/main/scala/coreplex/Coreplex.scala
View File

@ -11,12 +11,12 @@ import util._
import rocket._ import rocket._
trait DirectConnection { trait DirectConnection {
this: CoreplexNetwork with CoreplexRISCV => this: CoreplexNetwork with CoreplexRISCVPlatform =>
lazyTiles.map(_.slave).flatten.foreach { scratch => scratch := cbus.node } lazyTiles.map(_.slave).flatten.foreach { scratch => scratch := cbus.node }
} }
trait DirectConnectionModule { trait DirectConnectionModule {
this: CoreplexNetworkModule with CoreplexRISCVModule => this: CoreplexNetworkModule with CoreplexRISCVPlatformModule =>
val tlBuffering = TileLinkDepths(1,1,2,2,0) val tlBuffering = TileLinkDepths(1,1,2,2,0)
val ultBuffering = UncachedTileLinkDepths(1,2) val ultBuffering = UncachedTileLinkDepths(1,2)
@ -45,7 +45,7 @@ class DefaultCoreplexModule[+L <: DefaultCoreplex, +B <: DefaultCoreplexBundle[L
///// /////
trait AsyncConnection { trait AsyncConnection {
this: CoreplexNetwork with CoreplexRISCV => this: CoreplexNetwork with CoreplexRISCVPlatform =>
val crossings = lazyTiles.map(_.slave).map(_.map { scratch => val crossings = lazyTiles.map(_.slave).map(_.map { scratch =>
val crossing = LazyModule(new TLAsyncCrossing) val crossing = LazyModule(new TLAsyncCrossing)
crossing.node := cbus.node crossing.node := cbus.node
@ -55,7 +55,7 @@ trait AsyncConnection {
} }
trait AsyncConnectionBundle { trait AsyncConnectionBundle {
this: CoreplexNetworkBundle with CoreplexRISCVBundle => this: CoreplexNetworkBundle with CoreplexRISCVPlatformBundle =>
val tcrs = Vec(nTiles, new Bundle { val tcrs = Vec(nTiles, new Bundle {
val clock = Clock(INPUT) val clock = Clock(INPUT)
val reset = Bool(INPUT) val reset = Bool(INPUT)
@ -63,7 +63,7 @@ trait AsyncConnectionBundle {
} }
trait AsyncConnectionModule { trait AsyncConnectionModule {
this: Module with CoreplexNetworkModule with CoreplexRISCVModule { this: Module with CoreplexNetworkModule with CoreplexRISCVPlatformModule {
val outer: AsyncConnection val outer: AsyncConnection
val io: AsyncConnectionBundle val io: AsyncConnectionBundle
} => } =>