Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Tests._

val chisel6Version = "6.7.0"
val chisel7Version = "7.0.0-RC4"
val chisel7Version = "7.13.0"
val chiselTestVersion = "6.0.0"
val scalaVersionFromChisel = "2.13.16"
val scalaVersionFromChisel = if (sys.env.contains("USE_CHISEL7")) "2.13.18" else "2.13.16"

val chisel3Version = "3.6.1"

Expand Down Expand Up @@ -151,7 +151,13 @@ lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
.settings(
libraryDependencies ++= Seq(
"com.lihaoyi" %% "mainargs" % "0.5.0",
"org.json4s" %% "json4s-jackson" % "4.0.5",
// Chisel 7+ needs a more recent version of json4s to avoid linking errors, and json4s
// migrated group ID at version 4.0.7.
if (sys.env.contains("USE_CHISEL7")) {
"io.github.json4s" %% "json4s-jackson" % "4.1.0"
} else {
"org.json4s" %% "json4s-jackson" % "4.0.5"
},
"org.scala-graph" %% "graph-core" % "1.13.5"
)
)
Expand Down
5 changes: 5 additions & 0 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ MFC_BASE_LOWERING_OPTIONS ?= emittedLineLength=2048,noAlwaysComb,disallowLocalVa
FIRTOOL_EXTRA_FLAGS ?=
ifdef USE_CHISEL7
FIRTOOL_EXTRA_FLAGS += --verification-flavor=if-else-fatal --disable-layers=Verification.Assume,Verification.Cover
# Enable the Verification (for printf statements) and Assert (for assert statements) layers.
VERIFICATION_LAYER_DIR = $(GEN_COLLATERAL_DIR)/verification
ASSERT_LAYER_DIR = $(VERIFICATION_LAYER_DIR)/assert
EXTRA_SIM_SOURCES += $(VERIFICATION_LAYER_DIR)/layers-$(MODEL)-Verification.sv $(ASSERT_LAYER_DIR)/layers-$(MODEL)-Verification-Assert.sv
EXT_INCDIRS += $(VERIFICATION_LAYER_DIR) $(ASSERT_LAYER_DIR)
endif

# DOC include start: FirrtlCompiler
Expand Down