Skip to content

Commit 1ff4250

Browse files
authored
Bump to Chisel 7.0.0-RC1 (#135)
Also bump Scala to 2.13.16, bump scalatest patch version, and switch to new ChiselSim.
1 parent 49165d3 commit 1ff4250

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

build.mill

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ import mill.bsp._
1515

1616
object %NAME% extends SbtModule { m =>
1717
override def millSourcePath = super.millSourcePath / os.up
18-
override def scalaVersion = "2.13.15"
18+
override def scalaVersion = "2.13.16"
1919
override def scalacOptions = Seq(
2020
"-language:reflectiveCalls",
2121
"-deprecation",
2222
"-feature",
2323
"-Xcheckinit",
2424
)
2525
override def ivyDeps = Agg(
26-
ivy"org.chipsalliance::chisel:6.6.0",
26+
ivy"org.chipsalliance::chisel:7.0.0-RC1",
2727
)
2828
override def scalacPluginIvyDeps = Agg(
29-
ivy"org.chipsalliance:::chisel-plugin:6.6.0",
29+
ivy"org.chipsalliance:::chisel-plugin:7.0.0-RC1",
3030
)
3131
object test extends SbtTests with TestModule.ScalaTest {
3232
override def ivyDeps = m.ivyDeps() ++ Agg(
33-
ivy"org.scalatest::scalatest::3.2.16"
33+
ivy"org.scalatest::scalatest::3.2.19"
3434
)
3535
}
3636
}

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// See README.md for license details.
22

3-
ThisBuild / scalaVersion := "2.13.15"
3+
ThisBuild / scalaVersion := "2.13.16"
44
ThisBuild / version := "0.1.0"
55
ThisBuild / organization := "%ORGANIZATION%"
66

7-
val chiselVersion = "6.6.0"
7+
val chiselVersion = "7.0.0-RC1"
88

99
lazy val root = (project in file("."))
1010
.settings(
1111
name := "%NAME%",
1212
libraryDependencies ++= Seq(
1313
"org.chipsalliance" %% "chisel" % chiselVersion,
14-
"org.scalatest" %% "scalatest" % "3.2.16" % "test",
14+
"org.scalatest" %% "scalatest" % "3.2.19" % "test",
1515
),
1616
scalacOptions ++= Seq(
1717
"-language:reflectiveCalls",

src/main/scala/gcd/GCD.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ class GCD extends Module {
4141
object GCD extends App {
4242
ChiselStage.emitSystemVerilogFile(
4343
new GCD,
44-
firtoolOpts = Array("-disable-all-randomization", "-strip-debug-info")
44+
firtoolOpts = Array("-disable-all-randomization", "-strip-debug-info", "-default-layer-specialization=enable")
4545
)
4646
}

src/test/scala/gcd/GCDSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package gcd
44

55
import chisel3._
66
import chisel3.experimental.BundleLiterals._
7-
import chisel3.simulator.EphemeralSimulator._
7+
import chisel3.simulator.scalatest.ChiselSim
88
import org.scalatest.freespec.AnyFreeSpec
99
import org.scalatest.matchers.must.Matchers
1010

@@ -23,7 +23,7 @@ import org.scalatest.matchers.must.Matchers
2323
* mill %NAME%.test.testOnly gcd.GCDSpec
2424
* }}}
2525
*/
26-
class GCDSpec extends AnyFreeSpec with Matchers {
26+
class GCDSpec extends AnyFreeSpec with Matchers with ChiselSim {
2727

2828
"Gcd should calculate proper greatest common denominator" in {
2929
simulate(new DecoupledGcd(16)) { dut =>

0 commit comments

Comments
 (0)