Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to chisel 6.5.0 #1927

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Bump to chisel 6.5.0 #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Tests._

val chisel6 = sys.env.get("USE_CHISEL6").isDefined
val chisel6Version = "6.5.0"
val chisel3Version = "3.6.1"
val chiselTestVersion = if (chisel6) "6.0.0" else "0.6.0"
val scalaVersionFromChisel = if (chisel6) "2.13.12" else "2.13.10"

Expand Down Expand Up @@ -94,12 +96,12 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>


lazy val chisel6Settings = Seq(
libraryDependencies ++= Seq("org.chipsalliance" %% "chisel" % "6.0.0"),
addCompilerPlugin("org.chipsalliance" % "chisel-plugin" % "6.0.0" cross CrossVersion.full)
libraryDependencies ++= Seq("org.chipsalliance" %% "chisel" % chisel6Version),
addCompilerPlugin("org.chipsalliance" % "chisel-plugin" % chisel6Version cross CrossVersion.full)
)
lazy val chisel3Settings = Seq(
libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % "3.6.1"),
addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % "3.6.1" cross CrossVersion.full)
libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chisel3Version),
addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chisel3Version cross CrossVersion.full)
)

lazy val chiselSettings = (if (chisel6) chisel6Settings else chisel3Settings) ++ Seq(
Expand Down
5 changes: 4 additions & 1 deletion tools/stage/src/main/scala/ChipyardStage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ final class ChipyardChiselStage extends ChiselStage {
}

class ChipyardStage extends ChiselStage {
override val shell = new Shell("chipyard") with ChipyardCli with circt.stage.CLI
override val shell = new Shell("chipyard") with ChipyardCli with circt.stage.CLI {
// These are added by firrtl.options.Shell (which we must extend because we are a Stage)
override protected def includeLoggerOptions = false
}
override def run(annotations: AnnotationSeq): AnnotationSeq = {

val pm = new PhaseManager(
Expand Down
Loading