Separate parameter to enable cyclotron profiler

Author: hansungk

chipyard/RadianceConfigs.scala

@@ -247,6 +247,7 @@ class RadianceSingleClusterIssueDepthConfig(issueQueueEntries: Int) extends Conf
     noILP = false,
     l0i = Some(L0iCacheConfig),
     l0d = Some(L0dCacheConfig),
+    profiler = false,
     numIssueQueueEntries = issueQueueEntries
   ) ++
   new WithRadianceCluster(0, smemConfig = TapeoutSmemConfig, l1Config = L1CacheConfig) ++
@@ -285,6 +286,7 @@ class RadianceSingleClusterWarpLenConfig(warpLen: Int) extends Config(
     noILP = false,
     l0i = Some(RadianceWarpLenConfig.l0i(warpLen)),
     l0d = Some(RadianceWarpLenConfig.l0d(warpLen)),
+    profiler = false,
     numLanes = Some(warpLen)
   ) ++
   new WithSIMTConfig(numWarps = 8, numLanes = warpLen, numLsuLanes = warpLen, numSMEMInFlights = 8) ++

src/main/scala/radiance/muon/MuonCore.scala

@@ -55,6 +55,7 @@ case class MuonCoreParams(
   barrierBits: Int = 4,
   debug: Boolean = false, // enable extra IOs for debug (ex: PC)
   trace: Boolean = false,   // enable instruction trace generation
+  profiler: Boolean = true, // enable performance profiling report generation
   difftest: Boolean = false // enable arch-state differential testing
                             // against cyclotron
 ) extends PhysicalCoreParams {

src/main/scala/radiance/muon/MuonTile.scala

@@ -419,8 +419,7 @@ class MuonTileModuleImp(outer: MuonTile) extends BaseTileModuleImp(outer) {
   }
 
   // performance counters
-  val isSim = p(RadianceSimArgs)
-  if (isSim) {
+  if (core.muonParams.profiler) {
     val cperf = Module(new Profiler(
       clusterId = outer.muonParams.clusterId,
       coreId = outer.muonParams.coreId,
@@ -431,7 +430,6 @@ class MuonTileModuleImp(outer: MuonTile) extends BaseTileModuleImp(outer) {
 
   // RTL-model difftest
   if (core.muonParams.difftest) {
-    assert(isSim, "muon traces cannot enabled in non-sim mode!")
     val cdiff = Module(new CyclotronDiffTest(
       clusterId = outer.muonParams.clusterId,
       coreId = outer.muonParams.coreId,

src/main/scala/radiance/subsystem/Configs.scala

@@ -69,6 +69,7 @@ class WithMuonCores(
   standalone: Boolean,
   noILP: Boolean,
   trace: Boolean,
+  profiler: Boolean,
   /** cyclotron-as-a-tile: use golden core model */
   cyclotron: Boolean,
   difftest: Boolean,
@@ -80,9 +81,9 @@ class WithMuonCores(
 ) extends Config((site, here, up) => {
   // for use in tile-less standalone instantiation
   case MuonKey => {
-    if (difftest) {
+    if (difftest || trace || profiler) {
       assert(up(RadianceSimArgs),
-             "WithMuonCores: difftest cannot be enabled in non-sim mode!")
+             "cyclotron features cannot be enabled in non-sim mode!")
     }
     val simt = up(SIMTCoreKey).get
     val resolvedNumLanes = numLanes.getOrElse(simt.numLanes)
@@ -112,11 +113,12 @@ class WithMuonCores(
         numLsuLanes = numLanes.getOrElse(simt.numLsuLanes)
       ),
       trace = trace || difftest,
+      profiler = profiler,
       difftest = difftest,
     )
   }
   case CyclotronLinked => {
-    up(CyclotronLinked) || site(RadianceSimArgs) || trace || difftest || cyclotron
+    up(CyclotronLinked) || trace || difftest || cyclotron || profiler
   }
   case TilesLocated(`location`) => {
     if (standalone) {
@@ -157,7 +159,7 @@ class WithMuonCores(
   // constructor override that omits `crossing`
   def this(n: Int, location: HierarchicalLocation = InSubsystem,
     standalone: Boolean = false, noILP: Boolean = false,
-    trace: Boolean = false, cyclotron: Boolean = false,
+    trace: Boolean = false, profiler: Boolean = true, cyclotron: Boolean = false,
     difftest: Boolean = false, disabled: Boolean = false,
     numLanes: Option[Int] = None,
     numIssueQueueEntries: Int = 8,
@@ -169,7 +171,7 @@ class WithMuonCores(
       case InSubsystem => CBUS
       case InCluster(clusterId) => CCBUS(clusterId)
     },
-  ), standalone, noILP, trace, cyclotron, difftest, disabled, numLanes, numIssueQueueEntries, l0i, l0d)
+  ), standalone, noILP, trace, profiler, cyclotron, difftest, disabled, numLanes, numIssueQueueEntries, l0i, l0d)
 }
 
 class WithCyclotronCores(

src/main/scala/radiance/unittest/Muon.scala

@@ -234,12 +234,14 @@ class MuonCoreTop(implicit p: Parameters) extends LazyModule with HasCoreParamet
     }
 
     // performance counters
-    val cperf = Module(new Profiler (
-      clusterId = 0,
-      coreId = 0,
-    ))
-    cperf.io.perf <> core.io.perf
-    cperf.io.finished := core.io.finished
+    if (core.muonParams.profiler) {
+      val cperf = Module(new Profiler (
+        clusterId = 0,
+        coreId = 0,
+      ))
+      cperf.io.perf <> core.io.perf
+      cperf.io.finished := core.io.finished
+    }
 
     // RTL-model difftest
     if (core.muonParams.difftest) {