Log: remove unexpected LogPerfHelper when RELEASE=1 (#2343)

OpenXiangShan · Sep 27, 2023 · 34f3869 · 34f3869
1 parent 254e496
commit 34f3869
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/huancun b/huancun
diff --git a/src/main/scala/top/Top.scala b/src/main/scala/top/Top.scala
@@ -69,7 +69,10 @@ class XSTop()(implicit p: Parameters) extends BaseXSSoc() with HasSoCParameter
 
   val l3cacheOpt = soc.L3CacheParamsOpt.map(l3param =>
     LazyModule(new HuanCun()(new Config((_, _, _) => {
-      case HCCacheParamsKey => l3param.copy(hartIds = tiles.map(_.HartId))
+      case HCCacheParamsKey => l3param.copy(
+        hartIds = tiles.map(_.HartId),
+        FPGAPlatform = debugOpts.FPGAPlatform
+      )
     })))
   )
 

diff --git a/src/main/scala/utils/LogUtils.scala b/src/main/scala/utils/LogUtils.scala
@@ -36,13 +36,14 @@ object XSLogLevel extends Enumeration {
 
 object XSLog {
   val MagicStr = "9527"
-  def apply(debugLevel: XSLogLevel)(ctrlInfo: LogPerfIO)
+  def apply(debugLevel: XSLogLevel, ctrlInfoOpt: Option[LogPerfIO] = None)
            (prefix: Boolean, cond: Bool, pable: Printable)(implicit p: Parameters): Any =
   {
     val debugOpts = p(DebugOptionsKey)
     val enableDebug = debugOpts.EnableDebug && debugLevel != XSLogLevel.PERF
     val enablePerf = debugOpts.EnablePerfDebug && debugLevel == XSLogLevel.PERF
     if (!debugOpts.FPGAPlatform && (enableDebug || enablePerf || debugLevel == XSLogLevel.ERROR)) {
+      val ctrlInfo = ctrlInfoOpt.getOrElse(Module(new LogPerfHelper).io)
       val logEnable = ctrlInfo.logEnable
       val logTimestamp = ctrlInfo.timer
       val check_cond = (if (debugLevel == XSLogLevel.ERROR) true.B else logEnable) && cond && RegNext(true.B, false.B)
@@ -55,6 +56,10 @@ object XSLog {
       }
     }
   }
+  def apply(debugLevel: XSLogLevel, ctrlInfo: LogPerfIO)
+           (prefix: Boolean, cond: Bool, pable: Printable)(implicit p: Parameters): Any = {
+    apply(debugLevel, Some(ctrlInfo))(prefix, cond, pable)
+  }
 }
 
 sealed abstract class LogHelper(val logLevel: XSLogLevel){
@@ -68,7 +73,7 @@ sealed abstract class LogHelper(val logLevel: XSLogLevel){
   def apply(prefix: Boolean, cond: Bool, fmt: String, data: Bits*)(implicit p: Parameters): Any =
     apply(prefix, cond, Printable.pack(fmt, data:_*))
   def apply(prefix: Boolean, cond: Bool, pable: Printable)(implicit p: Parameters): Any ={
-    XSLog(logLevel)(Module(new LogPerfHelper).io)(prefix, cond, pable)
+    XSLog(logLevel)(prefix, cond, pable)
   }
 }
 

diff --git a/src/main/scala/utils/PerfCounterUtils.scala b/src/main/scala/utils/PerfCounterUtils.scala
@@ -306,7 +306,7 @@ object XSPerfRolling extends HasRegularPerfName {
 
 object XSPerfPrint {
   def apply(pable: Printable)(ctrlInfo: LogPerfIO)(implicit p: Parameters): Any = {
-    XSLog(XSLogLevel.PERF)(ctrlInfo)(true, true.B, pable)
+    XSLog(XSLogLevel.PERF, ctrlInfo)(true, true.B, pable)
   }
 }
+2 −1		src/main/scala/huancun/HCCacheParameters.scala
+3 −3		src/main/scala/huancun/utils/XSPerfAccumulate.scala