Bump barstools, chisel-testers, dsptools | Split build.sbt dependencies between projects | Bump CY collateral

.gitmodules

@@ -76,7 +76,7 @@
 	url = https://github.com/ucb-bar/dsptools.git
 [submodule "tools/chisel-testers"]
 	path = tools/chisel-testers
-	url = https://github.com/freechipsproject/chisel-testers.git
+	url = https://github.com/abejgonzalez/chisel-testers.git
 [submodule "tools/treadle"]
 	path = tools/treadle
 	url = https://github.com/freechipsproject/treadle.git

build.sbt

@@ -14,14 +14,11 @@ lazy val commonSettings = Seq(
     case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
     case _ => MergeStrategy.first}},
   scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
-  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % "test",
-  libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.1",
+  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % "test",
+  libraryDependencies += "org.scalatestplus" %% "scalacheck-1-14" % "3.1.1.1" % "test",
+  libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.10",
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-  libraryDependencies += "com.github.scopt" %% "scopt" % "3.7.0",
-  libraryDependencies += "org.scala-lang.modules" % "scala-jline" % "2.12.1",
-  libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.10",
   libraryDependencies += "org.typelevel" %% "spire" % "0.16.2",
-  libraryDependencies += "org.scalanlp" %% "breeze" % "1.0",
   addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
   unmanagedBase := (chipyardRoot / unmanagedBase).value,
   allDependencies := allDependencies.value.filterNot(_.organization == "edu.berkeley.cs"),
@@ -72,9 +69,9 @@ def freshProject(name: String, dir: File): Project = {
 // Fork each scala test for now, to work around persistent mutable state
 // in Rocket-Chip based generators
 def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
-      val options = ForkOptions()
-      new Group(test.name, Seq(test), SubProcess(options))
-  } toSeq
+  val options = ForkOptions()
+  new Group(test.name, Seq(test), SubProcess(options))
+} toSeq
 
 // Subproject definitions begin
 
@@ -82,22 +79,32 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
 lazy val chisel  = (project in file("tools/chisel3"))
 
 lazy val firrtl_interpreter = (project in file("tools/firrtl-interpreter"))
-  .settings(commonSettings)
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "org.scala-lang.modules" % "scala-jline" % "2.12.1",
+  ))
 
 lazy val treadle = (project in file("tools/treadle"))
-  .settings(commonSettings)
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "org.scala-lang.modules" % "scala-jline" % "2.12.1",
+      "com.github.scopt" %% "scopt" % "3.7.1",
+      "org.json4s" %% "json4s-native" % "3.6.10"
+  ))
 
 lazy val chisel_testers = (project in file("tools/chisel-testers"))
   .dependsOn(firrtl_interpreter, treadle, chisel)
   .settings(
-      commonSettings,
-      libraryDependencies ++= Seq(
-        "junit" % "junit" % "4.12",
-        "org.scalatest" %% "scalatest" % "3.0.5",
-        "org.scalacheck" %% "scalacheck" % "1.14.0",
-        "com.github.scopt" %% "scopt" % "3.7.0"
-      )
-    )
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "junit" % "junit" % "4.13",
+      "org.scalatest" %% "scalatest" % "3.2.2",
+      "org.scalatestplus" %% "scalacheck-1-14" % "3.1.1.1",
+      "org.scalacheck" %% "scalacheck" % "1.14.3",
+      "com.github.scopt" %% "scopt" % "3.7.1"
+  ))
 
 // Contains annotations & firrtl passes you may wish to use in rocket-chip without
 // introducing a circular dependency between RC and MIDAS
@@ -170,7 +177,11 @@ lazy val sha3 = (project in file("generators/sha3"))
 
 lazy val gemmini = (project in file("generators/gemmini"))
   .dependsOn(rocketchip, chisel_testers, testchipip)
-  .settings(commonSettings)
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "org.scalanlp" %% "breeze" % "0.13.2"
+  ))
 
 lazy val nvdla = (project in file("generators/nvdla"))
   .dependsOn(rocketchip)
@@ -182,26 +193,37 @@ lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeo
   .settings(libraryDependencies ++= Seq("io.github.daviddenton" %% "handlebars-scala-fork" % "2.3.0"))
 
 lazy val mdf = (project in file("./tools/barstools/mdf/scalalib/"))
-  .settings(commonSettings)
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "com.typesafe.play" %% "play-json" % "2.6.10"
+  ))
 
 lazy val barstoolsMacros = (project in file("./tools/barstools/macros/"))
   .dependsOn(firrtl_interpreter, mdf, rocketchip)
   .enablePlugins(sbtassembly.AssemblyPlugin)
   .settings(commonSettings)
 
+val dsptoolsDependencies = Seq(
+  "org.scalanlp" %% "breeze" % "1.0",
+  "junit" % "junit" % "4.13" % "test",
+  "org.scalatest" %% "scalatest" % "3.2.2",
+  "org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
+)
+
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
   .dependsOn(chisel_testers)
   .settings(
-      commonSettings,
-      libraryDependencies ++= Seq(
-        "junit" % "junit" % "4.13" % "test",
-        "org.scalatest" %% "scalatest" % "3.0.8",
-        "org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
-  ))
+    commonSettings,
+    libraryDependencies ++= dsptoolsDependencies
+  )
 
 lazy val `rocket-dsptools` = freshProject("rocket-dsptools", file("./tools/dsptools/rocket"))
   .dependsOn(rocketchip, dsptools)
-  .settings(commonSettings)
+  .settings(
+    commonSettings,
+    libraryDependencies ++= dsptoolsDependencies
+  )
 
 lazy val sifive_blocks = (project in file("generators/sifive-blocks"))
   .dependsOn(rocketchip)

generators/chipyard/src/main/scala/clocking/ResetSynchronizer.scala

@@ -1,30 +0,0 @@
-
-package chipyard.clocking
-
-import chisel3._
-
-import freechips.rocketchip.config.{Parameters}
-import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.prci._
-import freechips.rocketchip.util.{ResetCatchAndSync}
-
-/**
-  * Instantiates a reset synchronizer on all clock-reset pairs in a clock group
-  */
-class ClockGroupResetSynchronizer(implicit p: Parameters) extends LazyModule {
-  val node = ClockGroupAdapterNode()
-  lazy val module = new LazyRawModuleImp(this) {
-    (node.out zip node.in).map { case ((oG, _), (iG, _)) =>
-      (oG.member.data zip iG.member.data).foreach { case (o, i) =>
-        o.clock := i.clock
-        o.reset := ResetCatchAndSync(i.clock, i.reset.asBool)
-      }
-    }
-  }
-}
-
-object ClockGroupResetSynchronizer {
-  def apply()(implicit p: Parameters, valName: ValName) = LazyModule(new ClockGroupResetSynchronizer()).node
-}
-
-

generators/chipyard/src/main/scala/example/NodeTypes.scala

@@ -11,7 +11,7 @@ import testchipip.TLHelper
 
 // DOC include start: MyClient
 class MyClient(implicit p: Parameters) extends LazyModule {
-  val node = TLHelper.makeClientNode(TLClientParameters(
+  val node = TLHelper.makeClientNode(TLMasterParameters.v1(
     name = "my-client",
     sourceId = IdRange(0, 4),
     requestFifo = true,
@@ -29,7 +29,7 @@ class MyClient(implicit p: Parameters) extends LazyModule {
 class MyManager(implicit p: Parameters) extends LazyModule {
   val device = new SimpleDevice("my-device", Seq("tutorial,my-device0"))
   val beatBytes = 8
-  val node = TLHelper.makeManagerNode(beatBytes, TLManagerParameters(
+  val node = TLHelper.makeManagerNode(beatBytes, TLSlaveParameters.v1(
     address = Seq(AddressSet(0x20000, 0xfff)),
     resources = device.reg,
     regionType = RegionType.UNCACHED,
@@ -83,7 +83,7 @@ class MyClientGroup(implicit p: Parameters) extends LazyModule {
 
 // DOC include start: MyManagerGroup
 class MyManager1(beatBytes: Int)(implicit p: Parameters) extends LazyModule {
-  val node = TLHelper.makeManagerNode(beatBytes, TLManagerParameters(
+  val node = TLHelper.makeManagerNode(beatBytes, TLSlaveParameters.v1(
     address = Seq(AddressSet(0x0, 0xfff))))
 
   lazy val module = new LazyModuleImp(this) {
@@ -92,7 +92,7 @@ class MyManager1(beatBytes: Int)(implicit p: Parameters) extends LazyModule {
 }
 
 class MyManager2(beatBytes: Int)(implicit p: Parameters) extends LazyModule {
-  val node = TLHelper.makeManagerNode(beatBytes, TLManagerParameters(
+  val node = TLHelper.makeManagerNode(beatBytes, TLSlaveParameters.v1(
     address = Seq(AddressSet(0x1000, 0xfff))))
 
   lazy val module = new LazyModuleImp(this) {

generators/chipyard/src/main/scala/example/TutorialTile.scala

@@ -43,6 +43,8 @@ case class MyCoreParams(
   val pmpGranularity: Int = 4 // copied from Rocket
   val nBreakpoints: Int = 0 // TODO: Check
   val useBPWatch: Boolean = false
+  val mcontextWidth: Int = 0
+  val scontextWidth: Int = 0
   val nPerfCounters: Int = 29
   val haveBasicCounters: Boolean = true
   val haveFSDirty: Boolean = false