From 657faf22988b018a4c27bd5c770578f45b4f1a07 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Thu, 16 Dec 2021 17:27:19 -0800 Subject: [PATCH] Update comments on config fragments --- .../config/fragments/RoCCFragments.scala | 26 ++++++++++--------- .../config/fragments/SubsystemFragments.scala | 1 - .../config/fragments/TracegenFragments.scala | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/fragments/RoCCFragments.scala b/generators/chipyard/src/main/scala/config/fragments/RoCCFragments.scala index 646e0e6b..774b23c2 100644 --- a/generators/chipyard/src/main/scala/config/fragments/RoCCFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/RoCCFragments.scala @@ -59,18 +59,6 @@ class WithMultiRoCCHwacha(harts: Int*) extends Config( }) ) -class WithMultiRoCCGemmini[T <: Data : Arithmetic, U <: Data, V <: Data]( - harts: Int*)(gemminiConfig: GemminiArrayConfig[T,U,V] = GemminiConfigs.defaultConfig) extends Config((site, here, up) => { - case MultiRoCCKey => up(MultiRoCCKey, site) ++ harts.distinct.map { i => - (i -> Seq((p: Parameters) => { - implicit val q = p - val gemmini = LazyModule(new Gemmini(gemminiConfig)) - gemmini - })) - } -}) - - class WithHwachaTest extends Config((site, here, up) => { case TestSuitesKey => (tileParams: Seq[TileParams], suiteHelper: TestSuiteHelper, p: Parameters) => { up(TestSuitesKey).apply(tileParams, suiteHelper, p) @@ -83,3 +71,17 @@ class WithHwachaTest extends Config((site, here, up) => { } }) +/** + * The MultiRoCCGemmini fragment functions similarly to the + * WithMultiRoCCHwacha fragment defined above + */ +class WithMultiRoCCGemmini[T <: Data : Arithmetic, U <: Data, V <: Data]( + harts: Int*)(gemminiConfig: GemminiArrayConfig[T,U,V] = GemminiConfigs.defaultConfig) extends Config((site, here, up) => { + case MultiRoCCKey => up(MultiRoCCKey, site) ++ harts.distinct.map { i => + (i -> Seq((p: Parameters) => { + implicit val q = p + val gemmini = LazyModule(new Gemmini(gemminiConfig)) + gemmini + })) + } +}) diff --git a/generators/chipyard/src/main/scala/config/fragments/SubsystemFragments.scala b/generators/chipyard/src/main/scala/config/fragments/SubsystemFragments.scala index 144e5762..47f24cdc 100644 --- a/generators/chipyard/src/main/scala/config/fragments/SubsystemFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/SubsystemFragments.scala @@ -8,4 +8,3 @@ class WithBroadcastManager extends Config((site, here, up) => { case BankedL2Key => up(BankedL2Key, site).copy(coherenceManager = CoherenceManagerWrapper.broadcastManager) }) - diff --git a/generators/chipyard/src/main/scala/config/fragments/TracegenFragments.scala b/generators/chipyard/src/main/scala/config/fragments/TracegenFragments.scala index dbb4fb73..9640be9e 100644 --- a/generators/chipyard/src/main/scala/config/fragments/TracegenFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/TracegenFragments.scala @@ -7,6 +7,7 @@ import chipyard.clocking.{HasChipyardPRCI} class TraceGenTop(implicit p: Parameters) extends TraceGenSystem with HasChipyardPRCI + class WithTracegenSystem extends Config((site, here, up) => { case BuildSystem => (p: Parameters) => new TraceGenTop()(p) })