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.

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

build: bump mill to 0.12.3 #3933

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.8
0.12.3
50 changes: 26 additions & 24 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
import mill._
import scalalib._
import scalafmt._
import $packages._
import $file.`rocket-chip`.common
import $file.`rocket-chip`.cde.common
import $file.`rocket-chip`.hardfloat.build
import $file.`rocket-chip`.hardfloat.common
import $file.huancun.common
import $file.coupledL2.common
import $file.openLLC.common
Expand All @@ -35,6 +36,7 @@ import java.util.Locale
import scala.util.matching.Regex

val defaultScalaVersion = "2.13.14"
val pwd = os.Path(sys.env("MILL_WORKSPACE_ROOT"))

def defaultVersions = Map(
"chisel" -> ivy"org.chipsalliance::chisel:6.5.0",
Expand Down Expand Up @@ -62,11 +64,11 @@ trait HasChisel extends SbtModule {
}

object rocketchip
extends millbuild.`rocket-chip`.common.RocketChipModule
extends $file.`rocket-chip`.common.RocketChipModule
with HasChisel {
def scalaVersion: T[String] = T(defaultScalaVersion)

override def millSourcePath = os.pwd / "rocket-chip"
override def millSourcePath = pwd / "rocket-chip"

def macrosModule = macros

Expand All @@ -81,7 +83,7 @@ object rocketchip
object macros extends Macros

trait Macros
extends millbuild.`rocket-chip`.common.MacrosModule
extends $file.`rocket-chip`.common.MacrosModule
with SbtModule {

def scalaVersion: T[String] = T(defaultScalaVersion)
Expand All @@ -90,26 +92,26 @@ object rocketchip
}

object hardfloat
extends millbuild.`rocket-chip`.hardfloat.common.HardfloatModule with HasChisel {
extends $file.`rocket-chip`.hardfloat.common.HardfloatModule with HasChisel {

def scalaVersion: T[String] = T(defaultScalaVersion)

override def millSourcePath = os.pwd / "rocket-chip" / "hardfloat" / "hardfloat"
override def millSourcePath = pwd / "rocket-chip" / "hardfloat" / "hardfloat"

}

object cde
extends millbuild.`rocket-chip`.cde.common.CDEModule with ScalaModule {
extends $file.`rocket-chip`.cde.common.CDEModule with ScalaModule {

def scalaVersion: T[String] = T(defaultScalaVersion)

override def millSourcePath = os.pwd / "rocket-chip" / "cde" / "cde"
override def millSourcePath = pwd / "rocket-chip" / "cde" / "cde"
}
}

object utility extends HasChisel {

override def millSourcePath = os.pwd / "utility"
override def millSourcePath = pwd / "utility"

override def moduleDeps = super.moduleDeps ++ Seq(
rocketchip
Expand All @@ -119,23 +121,23 @@ object utility extends HasChisel {

object yunsuan extends HasChisel {

override def millSourcePath = os.pwd / "yunsuan"
override def millSourcePath = pwd / "yunsuan"

}

object huancun extends millbuild.huancun.common.HuanCunModule with HasChisel {
object huancun extends $file.huancun.common.HuanCunModule with HasChisel {

override def millSourcePath = os.pwd / "huancun"
override def millSourcePath = pwd / "huancun"

def rocketModule: ScalaModule = rocketchip

def utilityModule: ScalaModule = utility

}

object coupledL2 extends millbuild.coupledL2.common.CoupledL2Module with HasChisel {
object coupledL2 extends $file.coupledL2.common.CoupledL2Module with HasChisel {

override def millSourcePath = os.pwd / "coupledL2"
override def millSourcePath = pwd / "coupledL2"

def rocketModule: ScalaModule = rocketchip

Expand All @@ -147,17 +149,17 @@ object coupledL2 extends millbuild.coupledL2.common.CoupledL2Module with HasChis

object openNCB extends SbtModule with HasChisel {

override def millSourcePath = os.pwd / "openLLC" / "openNCB"
override def millSourcePath = pwd / "openLLC" / "openNCB"

override def moduleDeps = super.moduleDeps ++ Seq(
rocketchip
)

}

object openLLC extends millbuild.openLLC.common.OpenLLCModule with HasChisel {
object openLLC extends $file.openLLC.common.OpenLLCModule with HasChisel {

override def millSourcePath = os.pwd / "openLLC"
override def millSourcePath = pwd / "openLLC"

def coupledL2Module: ScalaModule = coupledL2

Expand All @@ -171,19 +173,19 @@ object openLLC extends millbuild.openLLC.common.OpenLLCModule with HasChisel {

object difftest extends HasChisel {

override def millSourcePath = os.pwd / "difftest"
override def millSourcePath = pwd / "difftest"

}

object fudian extends HasChisel {

override def millSourcePath = os.pwd / "fudian"
override def millSourcePath = pwd / "fudian"

}

object macros extends ScalaModule {

override def millSourcePath = os.pwd / "macros"
override def millSourcePath = pwd / "macros"

override def scalaVersion: T[String] = T(defaultScalaVersion)

Expand Down Expand Up @@ -225,15 +227,15 @@ trait XiangShanModule extends ScalaModule {
macrosModule,
)

val resourcesPATH = os.pwd.toString() + "/src/main/resources"
val resourcesPATH = pwd.toString() + "/src/main/resources"
val envPATH = sys.env("PATH") + ":" + resourcesPATH

override def forkEnv = Map("PATH" -> envPATH)
}

object xiangshan extends XiangShanModule with HasChisel with ScalafmtModule {

override def millSourcePath = os.pwd
override def millSourcePath = pwd

def rocketModule = rocketchip

Expand Down Expand Up @@ -303,7 +305,7 @@ object xiangshan extends XiangShanModule with HasChisel with ScalafmtModule {
super.resources() ++ Seq(PathRef(T.dest))
}

object test extends SbtModuleTests with TestModule.ScalaTest {
object test extends SbtTests with TestModule.ScalaTest {
override def forkArgs = Seq("-Xmx40G", "-Xss256m")

override def ivyDeps = super.ivyDeps() ++ Agg(
Expand All @@ -312,7 +314,7 @@ object xiangshan extends XiangShanModule with HasChisel with ScalafmtModule {

override def scalacOptions = super.scalacOptions() ++ Agg("-deprecation", "-feature")

val resourcesPATH = os.pwd.toString() + "/src/main/resources"
val resourcesPATH = pwd.toString() + "/src/main/resources"
val envPATH = sys.env("PATH") + ":" + resourcesPATH

override def forkEnv = Map("PATH" -> envPATH)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/device/IMSIC.scala
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class imsic_csr_top(
"XLEN" -> XLEN,
"NR_SRC" -> NumIRSrc,
"EID_VLD_DLY_NUM"-> EidVldDlyNum,
)) with HasBlackBoxResource with HasBlackBoxPath {
)) with HasBlackBoxResource {
private val NR_SRC_WIDTH = log2Up(NumIRSrc)
private val NR_HARTS_WIDTH = log2Up(NumHart)
private val INTP_FILE_WIDTH = log2Up(NumIRFiles)
Expand Down
Loading