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
8 changes: 4 additions & 4 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ import mill.bsp._

object %NAME% extends SbtModule { m =>
override def millSourcePath = super.millSourcePath / os.up
override def scalaVersion = "2.13.15"
override def scalaVersion = "2.13.16"
override def scalacOptions = Seq(
"-language:reflectiveCalls",
"-deprecation",
"-feature",
"-Xcheckinit",
)
override def ivyDeps = Agg(
ivy"org.chipsalliance::chisel:6.6.0",
ivy"org.chipsalliance::chisel:7.0.0-RC1",
)
override def scalacPluginIvyDeps = Agg(
ivy"org.chipsalliance:::chisel-plugin:6.6.0",
ivy"org.chipsalliance:::chisel-plugin:7.0.0-RC1",
)
object test extends SbtTests with TestModule.ScalaTest {
override def ivyDeps = m.ivyDeps() ++ Agg(
ivy"org.scalatest::scalatest::3.2.16"
ivy"org.scalatest::scalatest::3.2.19"
)
}
}
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// See README.md for license details.

ThisBuild / scalaVersion := "2.13.15"
ThisBuild / scalaVersion := "2.13.16"
ThisBuild / version := "0.1.0"
ThisBuild / organization := "%ORGANIZATION%"

val chiselVersion = "6.6.0"
val chiselVersion = "7.0.0-RC1"

lazy val root = (project in file("."))
.settings(
name := "%NAME%",
libraryDependencies ++= Seq(
"org.chipsalliance" %% "chisel" % chiselVersion,
"org.scalatest" %% "scalatest" % "3.2.16" % "test",
"org.scalatest" %% "scalatest" % "3.2.19" % "test",
),
scalacOptions ++= Seq(
"-language:reflectiveCalls",
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/gcd/GCD.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ class GCD extends Module {
object GCD extends App {
ChiselStage.emitSystemVerilogFile(
new GCD,
firtoolOpts = Array("-disable-all-randomization", "-strip-debug-info")
firtoolOpts = Array("-disable-all-randomization", "-strip-debug-info", "-default-layer-specialization=enable")
)
}
4 changes: 2 additions & 2 deletions src/test/scala/gcd/GCDSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package gcd

import chisel3._
import chisel3.experimental.BundleLiterals._
import chisel3.simulator.EphemeralSimulator._
import chisel3.simulator.scalatest.ChiselSim
import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.must.Matchers

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

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