Remove type parameter from chisel3.experimental.inlinetest.HasTests (#4834)

Author: tmckay-sifive

src/main/scala/chisel3/experimental/inlinetest/InlineTest.scala

@@ -93,7 +93,8 @@ object TestHarnessGenerator {
   *  @tparam TestResult the type returned from each test body generator, typically
   *  hardware indicating completion and/or exit code to the testharness.
   */
-trait HasTests[M <: RawModule] { module: M =>
+trait HasTests { module: RawModule =>
+  type M = module.type
 
   /** A Definition of the DUT to be used for each of the tests. */
   private lazy val moduleDefinition =

src/test/scala/chiselTests/experimental/InlineTestSpec.scala

@@ -68,11 +68,26 @@ class ProtocolMonitor(bundleType: ProtocolBundle) extends Module {
   assert(io.in === io.out, "in === out")
 }
 
+@instantiable
+trait HasProtocolInterface extends HasTests { this: RawModule =>
+  @public val io: ProtocolBundle
+
+  test("check1")(ProtocolChecks.check(1))
+}
+
+object ProtocolChecks {
+  def check(v: Int)(instance: Instance[RawModule with HasProtocolInterface]) = {
+    instance.io.in := v.U
+    assert(instance.io.out === v.U): Unit
+  }
+}
+
 @instantiable
 class ModuleWithTests(ioWidth: Int = 32, override val resetType: Module.ResetType.Type = Module.ResetType.Synchronous)
     extends Module
     with HasMonitorSocket
-    with HasTests[ModuleWithTests] {
+    with HasTests
+    with HasProtocolInterface {
   @public val io = IO(new ProtocolBundle(ioWidth))
 
   override val monProbe = makeProbe(io)
@@ -115,10 +130,12 @@ class ModuleWithTests(ioWidth: Int = 32, override val resetType: Module.ResetTyp
       assert(instance.io.out =/= 0.U): Unit
     }
   }
+
+  test("check2")(ProtocolChecks.check(2))
 }
 
 @instantiable
-class RawModuleWithTests(ioWidth: Int = 32) extends RawModule with HasTests[RawModuleWithTests] {
+class RawModuleWithTests(ioWidth: Int = 32) extends RawModule with HasTests {
   @public val io = IO(new ProtocolBundle(ioWidth))
   io.out := io.in
   test("foo") { instance =>
@@ -134,6 +151,11 @@ class InlineTestSpec extends AnyFlatSpec with FileCheck {
       | CHECK:      module ModuleWithTests
       | CHECK:        output monProbe : Probe<{ in : UInt<32>, out : UInt<32>}>
       |
+      | CHECK:      public module test_ModuleWithTests_check1
+      | CHECK-NEXT:   input clock : Clock
+      | CHECK-NEXT:   input reset
+      | CHECK:        inst dut of ModuleWithTests
+      |
       | CHECK:      public module test_ModuleWithTests_foo
       | CHECK-NEXT:   input clock : Clock
       | CHECK-NEXT:   input reset
@@ -159,6 +181,11 @@ class InlineTestSpec extends AnyFlatSpec with FileCheck {
       | CHECK-NEXT:   connect monitor.reset, reset
       | CHECK-NEXT:   connect monitor.io.out, read(dut.monProbe).out
       | CHECK-NEXT:   connect monitor.io.in, read(dut.monProbe).in
+      |
+      | CHECK:      public module test_ModuleWithTests_check2
+      | CHECK-NEXT:   input clock : Clock
+      | CHECK-NEXT:   input reset
+      | CHECK:        inst dut of ModuleWithTests
       """
     )
   }
@@ -169,10 +196,12 @@ class InlineTestSpec extends AnyFlatSpec with FileCheck {
       .fileCheck()(
         """
       | CHECK: module ModuleWithTests
+      | CHECK: module test_ModuleWithTests_check1
       | CHECK: module test_ModuleWithTests_foo
       | CHECK: module test_ModuleWithTests_bar
       | CHECK: module test_ModuleWithTests_with_result
       | CHECK: module test_ModuleWithTests_with_monitor
+      | CHECK: module test_ModuleWithTests_check2
       """
       )
   }
@@ -184,6 +213,10 @@ class InlineTestSpec extends AnyFlatSpec with FileCheck {
       | CHECK-NEXT:   input clock : Clock
       | CHECK-NEXT:   input reset : ${resetType}
       |
+      | CHECK:      public module test_ModuleWithTests_check1
+      | CHECK-NEXT:   input clock : Clock
+      | CHECK-NEXT:   input reset : ${resetType}
+      |
       | CHECK:      public module test_ModuleWithTests_foo
       | CHECK-NEXT:   input clock : Clock
       | CHECK-NEXT:   input reset : ${resetType}
@@ -199,6 +232,10 @@ class InlineTestSpec extends AnyFlatSpec with FileCheck {
       | CHECK:      public module test_ModuleWithTests_with_monitor
       | CHECK-NEXT:   input clock : Clock
       | CHECK-NEXT:   input reset : ${resetType}
+      |
+      | CHECK:      public module test_ModuleWithTests_check2
+      | CHECK-NEXT:   input clock : Clock
+      | CHECK-NEXT:   input reset : ${resetType}
       """
 
     emitCHIRRTL(new ModuleWithTests(resetType = Module.ResetType.Synchronous)).fileCheck()(