ADD: merge #2173 to #2172, bump decoder commit

generators/chipyard/src/main/scala/config/RocketConfigs.scala

@@ -115,3 +115,10 @@ class SV48RocketConfig extends Config(
   new freechips.rocketchip.rocket.WithSV48 ++
   new freechips.rocketchip.rocket.WithNHugeCores(1) ++
   new chipyard.config.AbstractConfig)
+
+class LTraceEncoderRocketConfig extends Config(
+   new chipyard.config.WithLTraceEncoder ++
+   new chipyard.config.WithNPerfCounters(29) ++
+   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
+   new freechips.rocketchip.rocket.WithNHugeCores(1) ++
+   new chipyard.config.AbstractConfig)

generators/chipyard/src/main/scala/config/fragments/TileFragments.scala

@@ -13,6 +13,7 @@ import ibex.{IbexTileAttachParams}
 import vexiiriscv.{VexiiRiscvTileAttachParams}
 import testchipip.cosim.{TracePortKey, TracePortParams}
 import barf.{TilePrefetchingMasterPortParams}
+import freechips.rocketchip.util.{TraceEncoderParams, TraceCoreParams}
 
 class WithL2TLBs(entries: Int) extends Config((site, here, up) => {
   case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
@@ -64,6 +65,25 @@ class WithNPerfCounters(n: Int = 29) extends Config((site, here, up) => {
   }
 })
 
+class WithLTraceEncoder extends Config((site, here, up) => {
+   case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
+     case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
+       ltrace = Some(new TraceEncoderParams(
+         coreParams = new TraceCoreParams(
+           nGroups = 1,
+           iretireWidth = 1,
+           xlen = tp.tileParams.core.xLen,
+           iaddrWidth = tp.tileParams.core.xLen
+         ),
+         bufferDepth = 16,
+         encoderBaseAddr = 0x3000000 + tp.tileParams.tileId * 0x1000,
+         sinkDMABaseAddr = 0x3010000 + tp.tileParams.tileId * 0x1000,
+         useSinkPrint = true,
+         useSinkDMA = true
+       ))))
+   }
+ })
+
 class WithNPMPs(n: Int = 8) extends Config((site, here, up) => {
   case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
     case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(