Bump to chisel3.6

ucb-bar · Jun 21, 2023 · 207cee2 · 207cee2
1 parent ca9e132
commit 207cee2
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 24 deletions.
diff --git a/build.sbt b/build.sbt
@@ -82,7 +82,7 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
-val chiselVersion = "3.5.6"
+val chiselVersion = "3.6.0"
 
 lazy val chiselSettings = Seq(
   libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion,
@@ -91,16 +91,12 @@ lazy val chiselSettings = Seq(
   addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full))
 
 
-val chiselTestVersion = "2.5.1"
-
-lazy val chiselTestSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel-iotesters" % chiselTestVersion))
-
 // Subproject definitions begin
 
 // -- Rocket Chip --
 
 // Rocket-chip dependencies (subsumes making RC a RootProject)
-lazy val hardfloat  = (project in rocketChipDir / "hardfloat")
+lazy val hardfloat  = freshProject("hardfloat", rocketChipDir / "hardfloat")
   .settings(chiselSettings)
   .dependsOn(midasTargetUtils)
   .settings(commonSettings)
@@ -165,7 +161,6 @@ lazy val chipyard = (project in file("generators/chipyard"))
 lazy val mempress = (project in file("generators/mempress"))
   .dependsOn(rocketchip, midasTargetUtils)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val barf = (project in file("generators/bar-fetchers"))
@@ -226,13 +221,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
 lazy val sha3 = (project in file("generators/sha3"))
   .dependsOn(rocketchip, midasTargetUtils)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val gemmini = (project in file("generators/gemmini"))
   .dependsOn(rocketchip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val nvdla = (project in file("generators/nvdla"))
@@ -250,13 +243,11 @@ lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "sr
 
 lazy val tapeout = (project in file("./tools/barstools/"))
   .settings(chiselSettings)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
   .settings(
     chiselSettings,
-    chiselTestSettings,
     commonSettings,
     libraryDependencies ++= Seq(
       "org.scalatest" %% "scalatest" % "3.2.+" % "test",

diff --git a/fpga/src/main/scala/vc707/TestHarness.scala b/fpga/src/main/scala/vc707/TestHarness.scala
@@ -90,7 +90,7 @@ class VC707FPGATestHarness(override implicit val p: Parameters) extends VC707She
 class VC707FPGATestHarnessImp(_outer: VC707FPGATestHarness) extends LazyRawModuleImp(_outer) with HasHarnessInstantiators {
   val vc707Outer = _outer
 
-  val reset = IO(Input(Bool()))
+  val reset = IO(Input(Bool())).suggestName("reset")
   _outer.xdc.addBoardPin(reset, "reset")
 
   val resetIBUF = Module(new IBUF)

diff --git a/fpga/src/main/scala/vcu118/TestHarness.scala b/fpga/src/main/scala/vcu118/TestHarness.scala
@@ -93,7 +93,7 @@ class VCU118FPGATestHarness(override implicit val p: Parameters) extends VCU118S
 class VCU118FPGATestHarnessImp(_outer: VCU118FPGATestHarness) extends LazyRawModuleImp(_outer) with HasHarnessInstantiators {
   val vcu118Outer = _outer
 
-  val reset = IO(Input(Bool()))
+  val reset = IO(Input(Bool())).suggestName("reset")
   _outer.xdc.addPackagePin(reset, "L19")
   _outer.xdc.addIOStandard(reset, "LVCMOS12")
 

diff --git a/generators/bar-fetchers b/generators/bar-fetchers
diff --git a/generators/gemmini b/generators/gemmini
diff --git a/generators/rocket-chip b/generators/rocket-chip
diff --git a/generators/shuttle b/generators/shuttle
diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
@@ -11,19 +11,17 @@ index ec36a85f..c0c2849a 100644
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
      constellation, mempress, barf, shuttle)
-@@ -204,11 +204,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -204,7 +204,7 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
 
 -lazy val sha3 = (project in file("generators/sha3"))
 -  .dependsOn(rocketchip, midasTargetUtils)
 -  .settings(libraryDependencies ++= rocketLibDeps.value)
--  .settings(chiselTestSettings)
 -  .settings(commonSettings)
 +//lazy val sha3 = (project in file("generators/sha3"))
 +//  .dependsOn(rocketchip, midasTargetUtils)
 +//  .settings(libraryDependencies ++= rocketLibDeps.value)
-+//  .settings(chiselTestSettings)
 +//  .settings(commonSettings)
 
  lazy val gemmini = (project in file("generators/gemmini"))

diff --git a/sims/firesim b/sims/firesim
diff --git a/tools/barstools b/tools/barstools
diff --git a/tools/dsptools b/tools/dsptools
diff --git a/tools/rocket-dsp-utils b/tools/rocket-dsp-utils
+2 −2		build.sbt
+62 −35		build.sc
+8 −3		common.sc
+6 −6		flake.lock
+1 −0		flake.nix
+1 −1		hardfloat
+0 −1		src/main/scala/amba/axis/Bundles.scala
+5 −5		src/main/scala/devices/debug/SBA.scala
+0 −1		src/main/scala/diplomacy/CloneModule.scala
+18 −14		src/main/scala/diplomacy/LazyModule.scala
+1 −1		src/main/scala/diplomacy/package.scala
+1 −1		src/main/scala/formal/FormalUtils.scala
+1 −1		src/main/scala/interrupts/Nodes.scala
+1 −1		src/main/scala/jtag/JtagStateMachine.scala
+1 −1		src/main/scala/jtag/JtagTap.scala
+34 −0		src/main/scala/rocket/CSR.scala
+2 −2		src/main/scala/rocket/TLB.scala
+1 −1		src/main/scala/subsystem/BaseSubsystem.scala
+1 −1		src/main/scala/tilelink/Arbiter.scala
+1 −1		src/main/scala/tilelink/AtomicAutomata.scala
+1 −1		src/main/scala/tilelink/Buffer.scala
+0 −1		src/main/scala/tilelink/Bundle_ACancel.scala
+0 −1		src/main/scala/tilelink/Bundles.scala
+1 −1		src/main/scala/tilelink/Monitor.scala
+1 −1		src/main/scala/unittest/UnitTest.scala
+1 −1		src/main/scala/util/Annotations.scala
+0 −12		src/main/scala/util/BundleMap.scala
+9 −6		src/main/scala/util/HeterogeneousBag.scala
+1 −1		src/main/scala/util/ReadyValidCancel.scala
+0 −2		src/main/scala/util/RecordMap.scala
+1 −1		src/main/scala/util/package.scala
+3 −3		src/main/scala/ifu/Frontend.scala
+0 −1		src/main/scala/ifu/ICache.scala
+1 −1		sim/build.sbt
+0 −1		sim/midas/src/main/scala/midas/core/SimUtils.scala
+0 −3		sim/midas/src/main/scala/midas/core/SimWrapper.scala
+0 −1		sim/midas/src/main/scala/midas/widgets/AssertBridge.scala
+0 −1		sim/midas/src/main/scala/midas/widgets/AutoCounterBridge.scala
+0 −2		sim/midas/src/main/scala/midas/widgets/HostPort.scala
+0 −2		sim/midas/src/main/scala/midas/widgets/PeekPokeIO.scala
+0 −2		sim/midas/src/main/scala/midas/widgets/PrintBridge.scala
+0 −1		sim/midas/src/main/scala/midas/widgets/SerializationUtils.scala
+1 −1		sim/src/main/scala/midasexamples/PointerChaser.scala
+2 −5		build.sbt
+26 −6		src/main/scala/barstools/iocell/chisel/IOCell.scala
+1 −1		src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala
+0 −2		src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
+0 −93		src/main/scala/dsptools/Driver.scala
+0 −51		src/main/scala/dsptools/dspmath/Factorization.scala
+0 −374		src/main/scala/dsptools/numbers/blackbox_compatibility/DspRealFirrtlInterpBB.scala
+1 −3		src/main/scala/dsptools/numbers/chisel_concrete/DspReal.scala
+0 −33		src/main/scala/dsptools/tester/Chisel3TestersCompatibility.scala
+0 −359		src/main/scala/dsptools/tester/DspTester.scala
+0 −126		src/main/scala/dsptools/tester/DspTesterOptions.scala
+0 −126		src/main/scala/dsptools/tester/DspTesterUtilities.scala
+0 −11		src/main/scala/dsptools/tester/MemMasterModel.scala
+0 −146		src/main/scala/dsptools/tester/VerilogTbDump.scala
+2 −2		src/test/scala/dsptools/BaseNSpec.scala
+2 −2		src/test/scala/dsptools/DspContextSpec.scala
+2 −2		src/test/scala/dsptools/DspTesterSpec.scala
+2 −2		src/test/scala/dsptools/LoggingSpec.scala
+2 −2		src/test/scala/dsptools/ShiftRegisterDelaySpec.scala
+2 −2		src/test/scala/dsptools/VerboseDspTesterSpec/SimpleTBwGenTypeOption.scala
+2 −2		src/test/scala/dsptools/numbers/AbsSpec.scala
+2 −2		src/test/scala/dsptools/numbers/BaseNSpec.scala
+2 −2		src/test/scala/dsptools/numbers/FixedPointSpec.scala
+2 −2		src/test/scala/dsptools/numbers/FixedPrecisionChangerSpec.scala
+2 −2		src/test/scala/dsptools/numbers/LnSpec.scala
+2 −2		src/test/scala/dsptools/numbers/NumbersSpec.scala
+2 −2		src/test/scala/dsptools/numbers/OverflowSpec.scala
+2 −2		src/test/scala/dsptools/numbers/ParameterizedOpSpec.scala
+2 −2		src/test/scala/dsptools/numbers/SaturateSpec.scala
+2 −2		src/test/scala/dsptools/numbers/TypeclassSpec.scala
+2 −2		src/test/scala/examples/CaseClassBundleSpec.scala
+2 −2		src/test/scala/examples/ComplexMultiplierSpec.scala
+2 −2		src/test/scala/examples/ParameterizedAdderSpec.scala
+2 −2		src/test/scala/examples/ParameterizedSaturatingAdder.scala
+2 −2		src/test/scala/examples/RealAdderSpec.scala
+2 −2		src/test/scala/examples/SimpleAdderSpec.scala
+2 −2		src/test/scala/examples/SimpleDspModuleSpec.scala
+2 −2		src/test/scala/examples/StreamingAutocorrelatorSpec.scala
+2 −2		src/test/scala/examples/TransposedStreamFIRSpec.scala
+2 −64		src/main/scala/dspblocks/TestIP.scala
+0 −53		src/main/scala/freechips/rocketchip/amba/apb/APBMasterModel.scala
+0 −205		src/main/scala/freechips/rocketchip/amba/axi4/AXI4MasterModel.scala
+3 −170		src/main/scala/freechips/rocketchip/tilelink/TestIP.scala
+1 −4		src/test/scala/dsptools/tester/MemMasterSpec.scala