Skip to content

Commit

Permalink
Bump dsptools and update build.sbt
Browse files Browse the repository at this point in the history
* Suppress warnings from rocketchip and its dependencies by converting them to info-summary
  • Loading branch information
konda-x1 authored and milovanovic committed Aug 22, 2023
1 parent 1877c37 commit 341e919
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ val rocketSettings = Seq(
Test / parallelExecution := false,
)

lazy val managedDepSettings = Seq(
scalacOptions += "-Wconf:any:is"
)

publishMavenStyle := true

Test / publishArtifact := false
Expand Down Expand Up @@ -104,6 +108,7 @@ val rocketChipDir = file("tools/rocket-chip")
lazy val hardfloat = freshProject("hardfloat", rocketChipDir / "hardfloat")
.settings(chiselSettings)
.settings(commonSettings)
.settings(managedDepSettings)
.settings(
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.0" % "test"
Expand All @@ -112,6 +117,7 @@ lazy val hardfloat = freshProject("hardfloat", rocketChipDir / "hardfloat")

lazy val rocketMacros = (project in rocketChipDir / "macros")
.settings(commonSettings)
.settings(managedDepSettings)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
Expand All @@ -120,12 +126,14 @@ lazy val rocketMacros = (project in rocketChipDir / "macros")

lazy val cde = (project in rocketChipDir / "cde")
.settings(commonSettings)
.settings(managedDepSettings)
.settings(Compile / scalaSource := baseDirectory.value / "cde/src/chipsalliance/rocketchip")

lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
.dependsOn(hardfloat, rocketMacros, cde)
.settings(commonSettings)
.settings(chiselSettings)
.settings(managedDepSettings)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
Expand All @@ -137,7 +145,6 @@ lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
.settings( // Settings for scalafix
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision,
scalacOptions += "-Ywarn-unused"
)
lazy val rocketLibDeps = (rocketchip / Keys.libraryDependencies)

Expand Down Expand Up @@ -176,7 +183,6 @@ val `rocket-dsp-utils` = (project in file("."))
.settings(
chiselSettings,
commonSettings,
scalacOptions += raw"-Wconf:src=tools/.*:s",
libraryDependencies ++= rocketLibDeps.value,
libraryDependencies ++= Seq(
"edu.berkeley.cs" %% "chiseltest" % "0.6.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/dsptools
Submodule dsptools updated 25 files
+1 −1 fixedpoint
+41 −41 src/main/scala/dsptools/numbers/chisel_concrete/DspReal.scala
+16 −16 src/main/scala/dsptools/numbers/chisel_concrete/RealTrig.scala
+7 −7 src/main/scala/dsptools/numbers/chisel_types/DspRealTypeClass.scala
+126 −0 src/test/scala/dsptools/DspContextSpec.scala
+69 −0 src/test/scala/dsptools/DspTesterUtilitiesSpec.scala
+151 −0 src/test/scala/dsptools/ShiftRegisterDelaySpec.scala
+91 −0 src/test/scala/dsptools/numbers/AbsSpec.scala
+31 −0 src/test/scala/dsptools/numbers/BaseNSpec.scala
+306 −0 src/test/scala/dsptools/numbers/BlackBoxFloatSpec.scala
+225 −0 src/test/scala/dsptools/numbers/FixedPointSpec.scala
+83 −0 src/test/scala/dsptools/numbers/FixedPrecisionChangerSpec.scala
+31 −0 src/test/scala/dsptools/numbers/LnSpec.scala
+491 −0 src/test/scala/dsptools/numbers/NumbersSpec.scala
+156 −0 src/test/scala/dsptools/numbers/ParameterizedOpSpec.scala
+186 −0 src/test/scala/dsptools/numbers/TypeclassSpec.scala
+75 −0 src/test/scala/examples/DspComplexSpec.scala
+4 −2 src/test/scala/examples/ParameterizedAdderSpec.scala
+89 −0 src/test/scala/examples/ParameterizedSaturatingAdderSpec.scala
+47 −0 src/test/scala/examples/RealAdderSpec.scala
+48 −0 src/test/scala/examples/SimpleCaseClassBundleSpec.scala
+60 −0 src/test/scala/examples/SimpleComplexMultiplierSpec.scala
+80 −0 src/test/scala/examples/SimpleDspModuleSpec.scala
+34 −0 src/test/scala/examples/StreamingAutocorrelatorSpec.scala
+65 −0 src/test/scala/examples/TransposedStreamFIRSpec.scala

0 comments on commit 341e919

Please sign in to comment.