Rename defaultConfig -> DefaultCoalescerConfig
This commit is contained in:
@@ -15,7 +15,7 @@ trait CanHaveMemtraceCore { this: BaseSubsystem =>
|
|||||||
p(MemtraceCoreKey).map { param =>
|
p(MemtraceCoreKey).map { param =>
|
||||||
// Safe to use get as WithMemtraceCore requires WithNLanes to be defined
|
// Safe to use get as WithMemtraceCore requires WithNLanes to be defined
|
||||||
val simtParam = p(SIMTCoreKey).get
|
val simtParam = p(SIMTCoreKey).get
|
||||||
val config = defaultConfig.copy(
|
val config = DefaultCoalescerConfig.copy(
|
||||||
numLanes = simtParam.nLanes,
|
numLanes = simtParam.nLanes,
|
||||||
numOldSrcIds = simtParam.nSrcIds
|
numOldSrcIds = simtParam.nSrcIds
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -99,14 +99,14 @@ case class CoalescerConfig(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
object defaultConfig extends CoalescerConfig(
|
object DefaultCoalescerConfig extends CoalescerConfig(
|
||||||
enable = true,
|
enable = true,
|
||||||
numLanes = 4,
|
numLanes = 4,
|
||||||
queueDepth = 1,
|
queueDepth = 1,
|
||||||
waitTimeout = 8,
|
waitTimeout = 8,
|
||||||
addressWidth = 24,
|
addressWidth = 24,
|
||||||
dataBusWidth = 4, // if "4": 2^4=16 bytes, 128 bit bus
|
dataBusWidth = 4, // if "4": 2^4=16 bytes, 128 bit bus
|
||||||
coalLogSizes = Seq(4),
|
coalLogSizes = Seq(4), // if "4": 2^4=16 bytes, 128 bit bus
|
||||||
// watermark = 2,
|
// watermark = 2,
|
||||||
wordSizeInBytes = 4,
|
wordSizeInBytes = 4,
|
||||||
// when attaching to SoC, 16 source IDs are not enough due to longer latency
|
// when attaching to SoC, 16 source IDs are not enough due to longer latency
|
||||||
@@ -1995,7 +1995,7 @@ class DummyDriverImp(outer: DummyDriver, config: CoalescerConfig)
|
|||||||
// Should not instantiate any memtrace modules.
|
// Should not instantiate any memtrace modules.
|
||||||
class DummyCoalescer(implicit p: Parameters) extends LazyModule {
|
class DummyCoalescer(implicit p: Parameters) extends LazyModule {
|
||||||
val numLanes = p(SIMTCoreKey).get.nLanes
|
val numLanes = p(SIMTCoreKey).get.nLanes
|
||||||
val config = defaultConfig.copy(numLanes = numLanes)
|
val config = DefaultCoalescerConfig.copy(numLanes = numLanes)
|
||||||
|
|
||||||
val driver = LazyModule(new DummyDriver(config))
|
val driver = LazyModule(new DummyDriver(config))
|
||||||
val rams = Seq.fill(config.numLanes + 1)( // +1 for coalesced edge
|
val rams = Seq.fill(config.numLanes + 1)( // +1 for coalesced edge
|
||||||
@@ -2032,7 +2032,7 @@ class DummyCoalescerTest(timeout: Int = 500000)(implicit p: Parameters)
|
|||||||
class TLRAMCoalescerLogger(filename: String)(implicit p: Parameters)
|
class TLRAMCoalescerLogger(filename: String)(implicit p: Parameters)
|
||||||
extends LazyModule {
|
extends LazyModule {
|
||||||
val numLanes = p(SIMTCoreKey).get.nLanes
|
val numLanes = p(SIMTCoreKey).get.nLanes
|
||||||
val config = defaultConfig.copy(numLanes = numLanes)
|
val config = DefaultCoalescerConfig.copy(numLanes = numLanes)
|
||||||
|
|
||||||
val driver = LazyModule(new MemTraceDriver(config, filename))
|
val driver = LazyModule(new MemTraceDriver(config, filename))
|
||||||
val coreSideLogger = LazyModule(
|
val coreSideLogger = LazyModule(
|
||||||
@@ -2092,7 +2092,7 @@ class TLRAMCoalescerLoggerTest(filename: String, timeout: Int = 500000)(implicit
|
|||||||
// tracedriver --> coalescer --> tlram
|
// tracedriver --> coalescer --> tlram
|
||||||
class TLRAMCoalescer(implicit p: Parameters) extends LazyModule {
|
class TLRAMCoalescer(implicit p: Parameters) extends LazyModule {
|
||||||
val numLanes = p(SIMTCoreKey).get.nLanes
|
val numLanes = p(SIMTCoreKey).get.nLanes
|
||||||
val config = defaultConfig.copy(numLanes = numLanes)
|
val config = DefaultCoalescerConfig.copy(numLanes = numLanes)
|
||||||
|
|
||||||
val filename = "vecadd.core1.thread4.trace"
|
val filename = "vecadd.core1.thread4.trace"
|
||||||
val coal = LazyModule(new CoalescingUnit(config))
|
val coal = LazyModule(new CoalescingUnit(config))
|
||||||
|
|||||||
Reference in New Issue
Block a user