Fix TL unittests

chipsalliance · May 17, 2023 · ecf08f5 · ecf08f5
1 parent 03efdab
commit ecf08f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/main/scala/tilelink/Delayer.scala b/src/main/scala/tilelink/Delayer.scala
@@ -23,26 +23,28 @@ class TLDelayer(q: Double)(implicit p: Parameters) extends LazyModule
       when (!sink.valid) { sink.bits := noise }
     }
 
-    (node.in zip node.out) foreach { case ((in, _), (out, _)) =>
-      val anoise = Wire(in.a.bits)
+    (node.in zip node.out) foreach { case ((in, edgeIn), (out, edgeOut)) =>
+      val anoise = Wire(new TLBundleA(edgeIn.bundle))
       anoise.opcode  := LFSRNoiseMaker(3)
       anoise.param   := LFSRNoiseMaker(3)
       anoise.size    := LFSRNoiseMaker(anoise.params.sizeBits)
       anoise.source  := LFSRNoiseMaker(anoise.params.sourceBits)
       anoise.address := LFSRNoiseMaker(anoise.params.addressBits)
       anoise.mask    := LFSRNoiseMaker(anoise.params.dataBits/8)
       anoise.data    := LFSRNoiseMaker(anoise.params.dataBits)
+      anoise.corrupt := LFSRNoiseMaker(1)
 
-      val bnoise = Wire(out.b.bits)
+      val bnoise = Wire(new TLBundleB(edgeOut.bundle))
       bnoise.opcode  := LFSRNoiseMaker(3)
       bnoise.param   := LFSRNoiseMaker(3)
       bnoise.size    := LFSRNoiseMaker(bnoise.params.sizeBits)
       bnoise.source  := LFSRNoiseMaker(bnoise.params.sourceBits)
       bnoise.address := LFSRNoiseMaker(bnoise.params.addressBits)
       bnoise.mask    := LFSRNoiseMaker(bnoise.params.dataBits/8)
       bnoise.data    := LFSRNoiseMaker(bnoise.params.dataBits)
+      bnoise.corrupt := LFSRNoiseMaker(1)
 
-      val cnoise = Wire(in.c.bits)
+      val cnoise = Wire(new TLBundleC(edgeIn.bundle))
       cnoise.opcode  := LFSRNoiseMaker(3)
       cnoise.param   := LFSRNoiseMaker(3)
       cnoise.size    := LFSRNoiseMaker(cnoise.params.sizeBits)
@@ -51,7 +53,7 @@ class TLDelayer(q: Double)(implicit p: Parameters) extends LazyModule
       cnoise.data    := LFSRNoiseMaker(cnoise.params.dataBits)
       cnoise.corrupt := LFSRNoiseMaker(1)(0)
 
-      val dnoise = Wire(out.d.bits)
+      val dnoise = Wire(new TLBundleD(edgeOut.bundle))
       dnoise.opcode  := LFSRNoiseMaker(3)
       dnoise.param   := LFSRNoiseMaker(3)
       dnoise.size    := LFSRNoiseMaker(dnoise.params.sizeBits)
@@ -61,7 +63,7 @@ class TLDelayer(q: Double)(implicit p: Parameters) extends LazyModule
       dnoise.data    := LFSRNoiseMaker(dnoise.params.dataBits)
       dnoise.corrupt := LFSRNoiseMaker(1)(0)
 
-      val enoise = Wire(in.e.bits)
+      val enoise = Wire(new TLBundleE(edgeIn.bundle))
       enoise.sink := LFSRNoiseMaker(enoise.params.sinkBits)
 
       feed(out.a, in.a, anoise)

diff --git a/src/main/scala/tilelink/Fragmenter.scala b/src/main/scala/tilelink/Fragmenter.scala
@@ -370,4 +370,5 @@ class TLRAMFragmenter(ramBeatBytes: Int, maxSize: Int, txns: Int)(implicit p: Pa
 class TLRAMFragmenterTest(ramBeatBytes: Int, maxSize: Int, txns: Int = 5000, timeout: Int = 500000)(implicit p: Parameters) extends UnitTest(timeout) {
   val dut = Module(LazyModule(new TLRAMFragmenter(ramBeatBytes,maxSize,txns)).module)
   io.finished := dut.io.finished
+  dut.io.start := io.start
 }
diff --git a/src/main/scala/tilelink/Fuzzer.scala b/src/main/scala/tilelink/Fuzzer.scala
@@ -271,4 +271,5 @@ class TLFuzzRAM(txns: Int)(implicit p: Parameters) extends LazyModule
 class TLFuzzRAMTest(txns: Int = 5000, timeout: Int = 500000)(implicit p: Parameters) extends UnitTest(timeout) {
   val dut = Module(LazyModule(new TLFuzzRAM(txns)).module)
   io.finished := dut.io.finished
+  dut.io.start := io.start
 }
diff --git a/src/main/scala/tilelink/RationalCrossing.scala b/src/main/scala/tilelink/RationalCrossing.scala
@@ -205,4 +205,5 @@ class TLRAMRationalCrossing(txns: Int)(implicit p: Parameters) extends LazyModul
 class TLRAMRationalCrossingTest(txns: Int = 5000, timeout: Int = 500000)(implicit p: Parameters) extends UnitTest(timeout) {
   val dut = Module(LazyModule(new TLRAMRationalCrossing(txns)).module)
   io.finished := dut.io.finished
+  dut.io.start := io.start
 }