Merge pull request #11 from abs-tudelft/chore/testing-isolation

Testing isolation
abs-tudelft · May 6, 2024 · 8888efa · 8888efa
2 parents 8840e3f + 3430cb0
commit 8888efa
Show file tree

Hide file tree

Showing 42 changed files with 68 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,4 @@ target/
 test_run_dir/
 
 build/
-src/tydi/*/*.scala
+library/src/tydi/*/*.scala
diff --git a/build.sbt b/build.sbt
@@ -1,36 +1,51 @@
-ThisBuild / homepage             := Some(url("https://github.com/abs-tudelft/tydi-chisel"))
-ThisBuild / organizationHomepage := Some(url("https://github.com/abs-tudelft/"))
-ThisBuild / licenses             := List(License.Apache2)
-ThisBuild / version              := "0.1.0"
-ThisBuild / organization         := "nl.tudelft"
-ThisBuild / organizationName     := "ABS Group, Delft University of Technology"
-ThisBuild / startYear            := Some(2023)
-
-ThisBuild / scalaVersion := "2.13.12"
-
 val chiselVersion = "5.1.0"
 
-lazy val root = (project in file("."))
-  .settings(
-    name        := "Tydi-Chisel",
-    description := "Tydi-Chisel is an implementation of Tydi concepts in the Chisel HDL.",
-    libraryDependencies += "org.chipsalliance" %% "chisel"     % chiselVersion,
-    libraryDependencies += "edu.berkeley.cs"   %% "chiseltest" % "5.0.2",
-    scalacOptions ++= Seq(
-      "-language:reflectiveCalls",
-      "-deprecation",
-      "-feature",
-      "-Xcheckinit",
-      "-Ymacro-annotations"
-    ),
-    addCompilerPlugin("org.chipsalliance" % "chisel-plugin" % chiselVersion cross CrossVersion.full)
-  )
+ThisBuild / scalaVersion := "2.13.12"
 
 // Settings required for scalafix
 ThisBuild / semanticdbEnabled          := true
 ThisBuild / semanticdbVersion          := scalafixSemanticdb.revision
 ThisBuild / scalafixScalaBinaryVersion := scalaBinaryVersion.value
 
+lazy val commonSettings = Seq(
+  homepage                                   := Some(url("https://github.com/abs-tudelft/tydi-chisel")),
+  organizationHomepage                       := Some(url("https://github.com/abs-tudelft/")),
+  licenses                                   := List(License.Apache2),
+  version                                    := "0.1.0",
+  organization                               := "nl.tudelft",
+  organizationName                           := "ABS Group, Delft University of Technology",
+  startYear                                  := Some(2023),
+  libraryDependencies += "org.chipsalliance" %% "chisel" % chiselVersion,
+  scalacOptions ++= Seq("-language:reflectiveCalls", "-deprecation", "-feature", "-Xcheckinit", "-Ymacro-annotations"),
+  addCompilerPlugin("org.chipsalliance" % "chisel-plugin" % chiselVersion cross CrossVersion.full)
+)
+
+lazy val library: Project = (project in file("library"))
+  .settings(
+    commonSettings,
+    name                                     := "Tydi-Chisel",
+    description                              := "Tydi-Chisel is an implementation of Tydi concepts in the Chisel HDL.",
+    libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "5.0.2" % Test
+  )
+//  .dependsOn(testingTools % "test->test")
+
+lazy val testingTools: Project = (project in file("testing"))
+  .settings(
+    commonSettings,
+    name                                     := "Tydi-Chisel-Test",
+    description                              := "This package contains the testing tools for Tydi-Chisel",
+    libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "5.0.2"
+  )
+  .dependsOn(library % "compile->compile") // Make testingTools project depend on the library project
+
+// Aggregate projects to build them together
+lazy val root = (project in file("."))
+  .aggregate(library, testingTools)
+  .settings(
+    publish      := {}, // Disable publishing for the root project
+    publishLocal := {}
+  )
+
 val CICommands =
   Seq("clean", "compile", "test", "scalafmtCheckAll", "scalafmtSbtCheck", "scalafixAll --check").mkString(";")
 

diff --git a/src/main/scala/Main.scala → library/src/main/scala/Main.scala b/src/main/scala/Main.scala → library/src/main/scala/Main.scala
diff --git a/src/main/scala/gcd/DecoupledGCD.scala → ...ary/src/main/scala/gcd/DecoupledGCD.scala b/src/main/scala/gcd/DecoupledGCD.scala → ...ary/src/main/scala/gcd/DecoupledGCD.scala
diff --git a/src/main/scala/gcd/GCD.scala → library/src/main/scala/gcd/GCD.scala b/src/main/scala/gcd/GCD.scala → library/src/main/scala/gcd/GCD.scala
diff --git a/...delft/tydi_chisel/ReverseTranspiler.scala → ...delft/tydi_chisel/ReverseTranspiler.scala b/...delft/tydi_chisel/ReverseTranspiler.scala → ...delft/tydi_chisel/ReverseTranspiler.scala
diff --git a/...cala/nl/tudelft/tydi_chisel/TydiLib.scala → ...cala/nl/tudelft/tydi_chisel/TydiLib.scala b/...cala/nl/tudelft/tydi_chisel/TydiLib.scala → ...cala/nl/tudelft/tydi_chisel/TydiLib.scala
diff --git a/...la/nl/tudelft/tydi_chisel/TydiUtils.scala → ...la/nl/tudelft/tydi_chisel/TydiUtils.scala b/...la/nl/tudelft/tydi_chisel/TydiUtils.scala → ...la/nl/tudelft/tydi_chisel/TydiUtils.scala
diff --git a/...chisel/examples/chisel/AxiDataViewTest.sc → ...chisel/examples/chisel/AxiDataViewTest.sc b/...chisel/examples/chisel/AxiDataViewTest.sc → ...chisel/examples/chisel/AxiDataViewTest.sc
diff --git a/...t/tydi_chisel/examples/chisel/Blink.scala → ...t/tydi_chisel/examples/chisel/Blink.scala b/...t/tydi_chisel/examples/chisel/Blink.scala → ...t/tydi_chisel/examples/chisel/Blink.scala
diff --git a/...tydi_chisel/examples/chisel/OopExample.sc → ...tydi_chisel/examples/chisel/OopExample.sc b/...tydi_chisel/examples/chisel/OopExample.sc → ...tydi_chisel/examples/chisel/OopExample.sc
diff --git a/...ft/tydi_chisel/examples/chisel/example.sc → ...ft/tydi_chisel/examples/chisel/example.sc b/...ft/tydi_chisel/examples/chisel/example.sc → ...ft/tydi_chisel/examples/chisel/example.sc
diff --git a/...sel/examples/hello_world/HelloWorld.scala → ...sel/examples/hello_world/HelloWorld.scala b/...sel/examples/hello_world/HelloWorld.scala → ...sel/examples/hello_world/HelloWorld.scala
diff --git a/...l/examples/pipeline/PipelineExample.scala → ...l/examples/pipeline/PipelineExample.scala b/...l/examples/pipeline/PipelineExample.scala → ...l/examples/pipeline/PipelineExample.scala
@@ -3,7 +3,6 @@ package nl.tudelft.tydi_chisel.examples.pipeline
 import chisel3._
 import chisel3.internal.firrtl.Width
 import chisel3.util.Counter
-import chiseltest.RawTester.test
 import circt.stage.ChiselStage.{emitCHIRRTL, emitSystemVerilog}
 import nl.tudelft.tydi_chisel._
 
@@ -117,8 +116,6 @@ class PipelineExampleModule extends SimpleProcessorBase(new NumberGroup, new Sta
 object PipelineExample extends App {
   println("Test123")
 
-  test(new PipelineExampleModule()) { c => println(c.tydiCode) }
-
 //  println(emitCHIRRTL(new NonNegativeFilter()))
 //  println(emitSystemVerilog(new NonNegativeFilter(), firtoolOpts = firNormalOpts))
 

diff --git a/...amples/pipeline/PipelineExamplePlus.scala → ...amples/pipeline/PipelineExamplePlus.scala b/...amples/pipeline/PipelineExamplePlus.scala → ...amples/pipeline/PipelineExamplePlus.scala
@@ -4,7 +4,6 @@ import chisel3._
 import chisel3.experimental.hierarchy.Definition
 import chisel3.internal.firrtl.Width
 import chisel3.util.Counter
-import chiseltest.RawTester.test
 import circt.stage.ChiselStage.{emitCHIRRTL, emitSystemVerilog}
 import nl.tudelft.tydi_chisel._
 
@@ -114,10 +113,6 @@ class PipelinePlusStart
 object PipelineExamplePlus extends App {
   println("Test123")
 
-//  test(new PipelinePlusModule()) { c =>
-//    println(c.tydiCode)
-//  }
-
 //  println(emitCHIRRTL(new MultiNonNegativeFilter()))
 //  println(emitSystemVerilog(new NonNegativeFilter(), firtoolOpts = firNormalOpts))
 

diff --git a/...udelft/tydi_chisel/examples/rgb/Rgb.scala → ...udelft/tydi_chisel/examples/rgb/Rgb.scala b/...udelft/tydi_chisel/examples/rgb/Rgb.scala → ...udelft/tydi_chisel/examples/rgb/Rgb.scala
diff --git a/...ydi_chisel/examples/rgb/RgbDataview.scala → ...ydi_chisel/examples/rgb/RgbDataview.scala b/...ydi_chisel/examples/rgb/RgbDataview.scala → ...ydi_chisel/examples/rgb/RgbDataview.scala
diff --git a/...sel/examples/rgb/RgbMultiProcessing.scala → ...sel/examples/rgb/RgbMultiProcessing.scala b/...sel/examples/rgb/RgbMultiProcessing.scala → ...sel/examples/rgb/RgbMultiProcessing.scala
@@ -25,12 +25,6 @@ class SubProcessor extends SubProcessorBase(new RgbBundle, new RgbBundle) {
 class MainProcessor extends MultiProcessorGeneral(Definition(new SubProcessor), 6, new RgbBundle, new RgbBundle)
 
 object RgbMultiProcessing extends App {
-  import chiseltest.RawTester.test
-
-  test(new MainProcessor()) { c =>
-    val str = c.tydiCode
-    println(str)
-  }
   println(emitCHIRRTL(new MainProcessor()))
 
   private val noOptimizationVerilog: String =

diff --git a/...estamped_message/TimestampedMessage.scala → ...estamped_message/TimestampedMessage.scala b/...estamped_message/TimestampedMessage.scala → ...estamped_message/TimestampedMessage.scala
@@ -2,7 +2,6 @@ package nl.tudelft.tydi_chisel.examples.timestamped_message
 
 import chisel3._
 import chisel3.internal.firrtl.Width
-import chiseltest.RawTester.test
 import circt.stage.ChiselStage.{emitCHIRRTL, emitSystemVerilog}
 import nl.tudelft.tydi_chisel._
 
@@ -97,8 +96,6 @@ object TimestampedMessage extends App {
     Array("-disable-opt", "-O=debug", "-disable-all-randomization", "-strip-debug-info" /*, "-preserve-values=all"*/ )
   println("Test123")
 
-  test(new TopLevelModule()) { c => println(c.tydiCode) }
-
   println((new NestedBundle).createEnum)
 
   println(emitCHIRRTL(new TimestampedMessageModuleOut()))

diff --git a/...cala/nl/tudelft/tydi_chisel/package.scala → ...cala/nl/tudelft/tydi_chisel/package.scala b/...cala/nl/tudelft/tydi_chisel/package.scala → ...cala/nl/tudelft/tydi_chisel/package.scala
diff --git a/...di_chisel/utils/ComplexityConverter.scala → ...di_chisel/utils/ComplexityConverter.scala b/...di_chisel/utils/ComplexityConverter.scala → ...di_chisel/utils/ComplexityConverter.scala
diff --git a/...lft/tydi_chisel/utils/LastSeqLength.scala → ...lft/tydi_chisel/utils/LastSeqLength.scala b/...lft/tydi_chisel/utils/LastSeqLength.scala → ...lft/tydi_chisel/utils/LastSeqLength.scala
diff --git a/.../tydi_chisel/utils/LastSeqProcessor.scala → .../tydi_chisel/utils/LastSeqProcessor.scala b/.../tydi_chisel/utils/LastSeqProcessor.scala → .../tydi_chisel/utils/LastSeqProcessor.scala
diff --git a/src/test/scala/gcd/GCDSpec.scala → library/src/test/scala/gcd/GCDSpec.scala b/src/test/scala/gcd/GCDSpec.scala → library/src/test/scala/gcd/GCDSpec.scala
diff --git a/src/tydi/hello-world/main.td → library/src/tydi/hello-world/main.td b/src/tydi/hello-world/main.td → library/src/tydi/hello-world/main.td
diff --git a/src/tydi/number-pipeline/pipeline-example.td → .../tydi/number-pipeline/pipeline-example.td b/src/tydi/number-pipeline/pipeline-example.td → .../tydi/number-pipeline/pipeline-example.td
diff --git a/src/tydi/random-access/main.td → library/src/tydi/random-access/main.td b/src/tydi/random-access/main.td → library/src/tydi/random-access/main.td
diff --git a/src/tydi/rgb/main.td → library/src/tydi/rgb/main.td b/src/tydi/rgb/main.td → library/src/tydi/rgb/main.td
diff --git a/src/tydi/til-demo.exe → library/src/tydi/til-demo.exe b/src/tydi/til-demo.exe → library/src/tydi/til-demo.exe
diff --git a/...mestamped-message/timestamped_message.til → ...mestamped-message/timestamped_message.til b/...mestamped-message/timestamped_message.til → ...mestamped-message/timestamped_message.til
diff --git a/src/tydi/tydi_compiler.exe → library/src/tydi/tydi_compiler.exe b/src/tydi/tydi_compiler.exe → library/src/tydi/tydi_compiler.exe
diff --git a/.../nl/tudelft/tydi_chisel/TydiTesting.scala → ...udelft/tydi_chisel_test/TydiTesting.scala b/.../nl/tudelft/tydi_chisel/TydiTesting.scala → ...udelft/tydi_chisel_test/TydiTesting.scala
@@ -1,4 +1,4 @@
-package nl.tudelft.tydi_chisel
+package nl.tudelft.tydi_chisel_test
 
 import scala.language.implicitConversions
 

diff --git a/testing/src/test/scala/nl/tudelft/tydi_chisel/ReverseTranspileTest.scala b/testing/src/test/scala/nl/tudelft/tydi_chisel/ReverseTranspileTest.scala
@@ -0,0 +1,19 @@
+package nl.tudelft.tydi_chisel
+
+import chiseltest._
+import nl.tudelft.tydi_chisel.examples.pipeline.{PipelineExampleModule, PipelinePlusModule}
+import nl.tudelft.tydi_chisel.examples.rgb.MainProcessor
+import nl.tudelft.tydi_chisel.examples.timestamped_message.TopLevelModule
+import org.scalatest.flatspec.AnyFlatSpec
+
+class ReverseTranspileTest extends AnyFlatSpec with ChiselScalatestTester {
+  behavior of "reverse transpilation"
+
+  it should "reverse transpile" in {
+    // Test reverse transpilation of Chisel to Tydi-Lang code for various modules.
+    test(new PipelineExampleModule()) { c => println(c.tydiCode) }
+    test(new PipelinePlusModule()) { c => println(c.tydiCode) }
+    test(new MainProcessor()) { c => println(c.tydiCode) }
+    test(new TopLevelModule()) { c => println(c.tydiCode) }
+  }
+}
diff --git a/...elft/tydi_chisel/TydiComplianceTest.scala → ...elft/tydi_chisel/TydiComplianceTest.scala b/...elft/tydi_chisel/TydiComplianceTest.scala → ...elft/tydi_chisel/TydiComplianceTest.scala
diff --git a/...ft/tydi_chisel/TydiStreamDriverTest.scala → ...ft/tydi_chisel/TydiStreamDriverTest.scala b/...ft/tydi_chisel/TydiStreamDriverTest.scala → ...ft/tydi_chisel/TydiStreamDriverTest.scala
@@ -3,7 +3,7 @@ package nl.tudelft.tydi_chisel
 import chisel3._
 import chisel3.experimental.BundleLiterals.AddBundleLiteralConstructor
 import chiseltest._
-import nl.tudelft.tydi_chisel.Conversions._
+import nl.tudelft.tydi_chisel_test.Conversions._
 import org.scalatest.flatspec.AnyFlatSpec
 
 class TydiStreamDriverTest extends AnyFlatSpec with ChiselScalatestTester {

diff --git a/...di_chisel/chisel/BundleLiteralsSpec.scala → ...di_chisel/chisel/BundleLiteralsSpec.scala b/...di_chisel/chisel/BundleLiteralsSpec.scala → ...di_chisel/chisel/BundleLiteralsSpec.scala
diff --git a/.../tydi_chisel/chisel/ChiselQueueTest.scala → .../tydi_chisel/chisel/ChiselQueueTest.scala b/.../tydi_chisel/chisel/ChiselQueueTest.scala → .../tydi_chisel/chisel/ChiselQueueTest.scala
diff --git a/...es/pipeline/PipelineExamplePlusTest.scala → ...el/pipeline/PipelineExamplePlusTest.scala b/...es/pipeline/PipelineExamplePlusTest.scala → ...el/pipeline/PipelineExamplePlusTest.scala
@@ -4,8 +4,8 @@ import chisel3._
 import chisel3.experimental.BundleLiterals.AddBundleLiteralConstructor
 import chisel3.experimental.VecLiterals.{AddObjectLiteralConstructor, AddVecLiteralConstructor}
 import chiseltest._
-import nl.tudelft.tydi_chisel.Conversions._
 import nl.tudelft.tydi_chisel.{TydiProcessorTestWrapper, TydiTestWrapper}
+import nl.tudelft.tydi_chisel_test.Conversions._
 import org.scalatest.flatspec.AnyFlatSpec
 
 class PipelineExamplePlusTest extends AnyFlatSpec with ChiselScalatestTester {

diff --git a/...amples/pipeline/PipelineExampleTest.scala → ...chisel/pipeline/PipelineExampleTest.scala b/...amples/pipeline/PipelineExampleTest.scala → ...chisel/pipeline/PipelineExampleTest.scala
@@ -2,8 +2,8 @@ package nl.tudelft.tydi_chisel.examples.pipeline
 
 import chisel3._
 import chiseltest._
-import nl.tudelft.tydi_chisel.Conversions._
 import nl.tudelft.tydi_chisel.{TydiProcessorTestWrapper, TydiTestWrapper}
+import nl.tudelft.tydi_chisel_test.Conversions._
 import org.scalatest.flatspec.AnyFlatSpec
 
 class PipelineExampleTest extends AnyFlatSpec with ChiselScalatestTester {

diff --git a/...hisel/utils/ComplexityConverterTest.scala → ...hisel/utils/ComplexityConverterTest.scala b/...hisel/utils/ComplexityConverterTest.scala → ...hisel/utils/ComplexityConverterTest.scala
@@ -5,9 +5,9 @@ import chisel3.experimental.BundleLiterals.AddBundleLiteralConstructor
 import chisel3.experimental.VecLiterals.{AddObjectLiteralConstructor, AddVecLiteralConstructor}
 import chiseltest._
 import chiseltest.experimental.expose
-import nl.tudelft.tydi_chisel.Conversions._
 import nl.tudelft.tydi_chisel._
-import nl.tudelft.tydi_chisel.printUtils._
+import nl.tudelft.tydi_chisel_test.Conversions._
+import nl.tudelft.tydi_chisel_test.printUtils._
 import org.scalatest.flatspec.AnyFlatSpec
 
 class ComplexityConverterTest extends AnyFlatSpec with ChiselScalatestTester {

diff --git a/...tydi_chisel/utils/LastSeqLengthTest.scala → ...tydi_chisel/utils/LastSeqLengthTest.scala b/...tydi_chisel/utils/LastSeqLengthTest.scala → ...tydi_chisel/utils/LastSeqLengthTest.scala
@@ -3,7 +3,7 @@ package nl.tudelft.tydi_chisel.utils
 import chisel3._
 import chisel3.experimental.VecLiterals.AddObjectLiteralConstructor
 import chiseltest._
-import nl.tudelft.tydi_chisel.printUtils.binaryFromUint
+import nl.tudelft.tydi_chisel_test.printUtils.binaryFromUint
 import org.scalatest.flatspec.AnyFlatSpec
 
 class LastSeqLengthTest extends AnyFlatSpec with ChiselScalatestTester {

diff --git a/...i_chisel/utils/LastSeqProcessorTest.scala → ...i_chisel/utils/LastSeqProcessorTest.scala b/...i_chisel/utils/LastSeqProcessorTest.scala → ...i_chisel/utils/LastSeqProcessorTest.scala
@@ -3,7 +3,7 @@ package nl.tudelft.tydi_chisel.utils
 import chisel3._
 import chisel3.experimental.VecLiterals.AddObjectLiteralConstructor
 import chiseltest._
-import nl.tudelft.tydi_chisel.printUtils._
+import nl.tudelft.tydi_chisel_test.printUtils._
 import org.scalatest.flatspec.AnyFlatSpec
 
 class LastSeqProcessorTest extends AnyFlatSpec with ChiselScalatestTester {