Fit to chisel5

.gitmodules

@@ -1,26 +1,33 @@
 [submodule "rocket-chip"]
 	path = rocket-chip
-	url = https://github.com/OpenXiangShan/rocket-chip.git
+	url = https://github.com/Siudya/rocket-chip
 [submodule "difftest"]
 	path = difftest
-	url = https://github.com/Siudya/difftest.git
-	branch = nanhu-v3
+	url = https://github.com/OpenXiangShan/difftest
+	branch = nh3
 [submodule "ready-to-run"]
 	path = ready-to-run
 	url = https://github.com/Siudya/ready-to-run
 [submodule "huancun"]
 	path = huancun
-	url = https://github.com/Siudya/Huancun
+	url = https://github.com/Siudya/huancun
+	branch = chisel5
 [submodule "fudian"]
 	path = fudian
 	url = https://github.com/Siudya/fudian
+	branch = chisel5
 [submodule "xs-utils"]
 	path = xs-utils
 	url = https://github.com/Siudya/xs-utils
+	branch = chisel5
 [submodule "utility"]
 	path = utility
 	url = https://github.com/OpenXiangShan/utility
 [submodule "CoupledL2"]
 	path = CoupledL2
 	url = https://github.com/cyril0124/CoupledL2
 	branch = integrate_cpl2_cpl3
+[submodule "coupledL2"]
+	path = coupledL2
+	url = https://github.com/cyril0124/CoupledL2
+	branch = chisel5

.mill-version

@@ -1 +1 @@
-0.9.8
+0.11.2

Makefile

@@ -156,16 +156,20 @@ clean:
 
 init:
 	git submodule update --init
-	cd rocket-chip && git submodule update --init api-config-chipsalliance hardfloat
+	cd rocket-chip && git submodule update --init cde hardfloat
 
 bump:
 	git submodule foreach "git fetch origin&&git checkout master&&git reset --hard origin/master"
 
+comp:
+	mill -i XiangShan.compile
+	mill -i XiangShan.test.compile
+
 bsp:
 	mill -i mill.bsp.BSP/install
 
 idea:
-	mill -i mill.scalalib.GenIdea/idea
+	mill -i mill.idea.GenIdea/idea
 
 # verilator simulation
 emu:

build.sc

@@ -14,192 +14,180 @@
 * See the Mulan PSL v2 for more details.
 ***************************************************************************************/
 
-import os.Path
 import mill._
 import scalalib._
+import scalafmt._
+import os.Path
 import publish._
-import coursier.maven.MavenRepository
 import $file.`rocket-chip`.common
-import $file.`rocket-chip`.`api-config-chipsalliance`.`build-rules`.mill.build
+import $file.`rocket-chip`.cde.common
 import $file.`rocket-chip`.hardfloat.build
 
-object ivys {
-  val sv = "2.12.13"
-  val chisel3 = ivy"edu.berkeley.cs::chisel3:3.5.5"
-  val chisel3Plugin = ivy"edu.berkeley.cs:::chisel3-plugin:3.5.5"
-  val chiseltest = ivy"edu.berkeley.cs::chiseltest:0.5.5"
-  val scalatest = ivy"org.scalatest::scalatest:3.2.2"
-  val macroParadise = ivy"org.scalamacros:::paradise:2.1.1"
+val defaultVersions = Map(
+  "chisel" -> "5.0.0",
+  "chisel-plugin" -> "5.0.0",
+  "chiseltest" -> "5.0.0",
+  "scala" -> "2.13.10",
+  "scalatest" -> "3.2.7"
+)
+
+def getVersion(dep: String, org: String = "org.chipsalliance", cross: Boolean = false) = {
+  val version = sys.env.getOrElse(dep + "Version", defaultVersions(dep))
+  if (cross)
+    ivy"$org:::$dep:$version"
+  else
+    ivy"$org::$dep:$version"
 }
 
-trait XSModule extends ScalaModule with PublishModule {
+trait CommonModule extends ScalaModule {
+  override def scalaVersion = defaultVersions("scala")
+
+  override def scalacPluginIvyDeps = Agg(getVersion("chisel-plugin", cross = true))
 
-  // override this to use chisel from source
-  def chiselOpt: Option[PublishModule] = None
+  override def scalacOptions = super.scalacOptions() ++ Agg("-Ytasty-reader", "-Ymacro-annotations")
 
-  override def scalaVersion = ivys.sv
+}
 
-  override def compileIvyDeps = Agg(ivys.macroParadise)
+object rocketchip extends RocketChip
 
-  override def scalacPluginIvyDeps = Agg(ivys.macroParadise, ivys.chisel3Plugin)
+trait RocketChip
+  extends millbuild.`rocket-chip`.common.RocketChipModule
+    with SbtModule {
+  def scalaVersion: T[String] = T(defaultVersions("scala"))
 
-  override def scalacOptions = Seq("-Xsource:2.11")
+  override def millSourcePath = os.pwd / "rocket-chip"
 
-  override def ivyDeps = if(chiselOpt.isEmpty) Agg(ivys.chisel3) else Agg.empty[Dep]
+  def chiselModule = None
 
-  override def moduleDeps = Seq() ++ chiselOpt
+  def chiselPluginJar = None
 
-  def publishVersion = "0.0.1"
+  def chiselIvy = Some(getVersion("chisel"))
 
-  // TODO: fix this
-  def pomSettings = PomSettings(
-    description = "XiangShan",
-    organization = "",
-    url = "https://github.com/OpenXiangShan/XiangShan",
-    licenses = Seq(License.`Apache-2.0`),
-    versionControl = VersionControl.github("OpenXiangShan", "XiangShan"),
-    developers = Seq.empty
-  )
-}
+  def chiselPluginIvy = Some(getVersion("chisel-plugin", cross=true))
 
-object rocketchip extends `rocket-chip`.common.CommonRocketChip {
+  def macrosModule = macros
 
-  val rcPath = os.pwd / "rocket-chip"
+  def hardfloatModule = hardfloat
 
-  override def scalaVersion = ivys.sv
+  def cdeModule = cde
 
-  override def scalacOptions = Seq("-Xsource:2.11")
+  def mainargsIvy = ivy"com.lihaoyi::mainargs:0.5.0"
 
-  override def millSourcePath = rcPath
+  def json4sJacksonIvy = ivy"org.json4s::json4s-jackson:4.0.5"
 
-  object configRocket extends `rocket-chip`.`api-config-chipsalliance`.`build-rules`.mill.build.config with PublishModule {
-    override def millSourcePath = rcPath / "api-config-chipsalliance" / "design" / "craft"
+  object macros extends Macros
 
-    override def scalaVersion = T {
-      rocketchip.scalaVersion()
-    }
+  trait Macros
+    extends millbuild.`rocket-chip`.common.MacrosModule
+      with SbtModule {
 
-    override def pomSettings = T {
-      rocketchip.pomSettings()
-    }
+    def scalaVersion: T[String] = T(defaultVersions("scala"))
 
-    override def publishVersion = T {
-      rocketchip.publishVersion()
-    }
+    def scalaReflectIvy = ivy"org.scala-lang:scala-reflect:${defaultVersions("scala")}"
   }
 
-  object hardfloatRocket extends `rocket-chip`.hardfloat.build.hardfloat {
-    override def millSourcePath = rcPath / "hardfloat"
+  object hardfloat extends Hardfloat
 
-    override def scalaVersion = T {
-      rocketchip.scalaVersion()
-    }
+  trait Hardfloat
+    extends millbuild.`rocket-chip`.hardfloat.common.HardfloatModule {
 
-    def chisel3IvyDeps = if(chisel3Module.isEmpty) Agg(
-      common.getVersion("chisel3")
-    ) else Agg.empty[Dep]
-
-    def chisel3PluginIvyDeps = Agg(common.getVersion("chisel3-plugin", cross=true))
+    def scalaVersion: T[String] = T(defaultVersions("scala"))
+
+    override def millSourcePath = os.pwd / "rocket-chip" / "hardfloat" / "hardfloat"
+
+    def chiselModule = None
+
+    def chiselPluginJar = None
+
+    def chiselIvy = Some(getVersion("chisel"))
+
+    def chiselPluginIvy = Some(getVersion("chisel-plugin", cross=true))
   }
 
-  def hardfloatModule = hardfloatRocket
+  object cde extends CDE
+
+  trait CDE
+    extends millbuild.`rocket-chip`.cde.common.CDEModule
+      with ScalaModule {
 
-  def configModule = configRocket
+    def scalaVersion: T[String] = T(defaultVersions("scala"))
 
+    override def millSourcePath = os.pwd / "rocket-chip" / "cde" / "cde"
+  }
 }
 
-object xsutils extends XSModule with SbtModule {
+object difftest extends SbtModule with ScalafmtModule with CommonModule {
 
-  override def millSourcePath = os.pwd / "xs-utils"
+  override def ivyDeps = Agg(getVersion("chisel"))
 
-  override def moduleDeps = super.moduleDeps ++ Seq(
-    rocketchip
-  )
+  override def millSourcePath = os.pwd / "difftest"
 }
 
-object utility extends XSModule with SbtModule {
+object fudian extends SbtModule with ScalafmtModule with CommonModule {
+
+  override def ivyDeps = Agg(getVersion("chisel"))
+
+  override def millSourcePath = os.pwd / "fudian"
+}
+
+object xsutils extends SbtModule with ScalafmtModule with CommonModule {
+
+  override def ivyDeps = Agg(getVersion("chisel"))
 
-  override def millSourcePath = os.pwd / "utility"
+  override def millSourcePath = os.pwd / "xs-utils"
 
   override def moduleDeps = super.moduleDeps ++ Seq(
     rocketchip
   )
 }
 
-object huancun extends XSModule with SbtModule {
+object huancun extends SbtModule with ScalafmtModule with CommonModule {
+
+  override def ivyDeps = Agg(getVersion("chisel"))
 
   override def millSourcePath = os.pwd / "huancun"
 
-  override def moduleDeps = super.moduleDeps ++ Seq(
-    rocketchip, 
-    xsutils
-  )
+  override def moduleDeps = super.moduleDeps ++ Seq(rocketchip, xsutils)
 }
 
-object CoupledL2 extends XSModule with SbtModule {
+object coupledL2 extends SbtModule with ScalafmtModule with CommonModule {
+
+  override def ivyDeps = Agg(getVersion("chisel"))
 
-  override def millSourcePath = os.pwd / "CoupledL2"
+  override def millSourcePath = os.pwd / "coupledL2"
 
   override def moduleDeps = super.moduleDeps ++ Seq(
     rocketchip,
     huancun,
-    xsutils,
-    utility
+    xsutils
   )
 }
 
-object difftest extends XSModule with SbtModule {
-  override def millSourcePath = os.pwd / "difftest"
-}
-
-object fudian extends XSModule with SbtModule
-
-// extends this trait to use XiangShan in other projects
-trait CommonXiangShan extends XSModule with SbtModule { m =>
+object XiangShan extends SbtModule with ScalafmtModule with CommonModule {
 
-  // module deps
-  def rocketModule: PublishModule
-  def difftestModule: PublishModule
-  def huancunModule: PublishModule
-  def coupledL2Module: PublishModule
-  def fudianModule: PublishModule
-  def xsutilsModule: PublishModule
-  def utilityModule: PublishModule
-
-  override def millSourcePath = os.pwd
+  override def millSourcePath = millOuterCtx.millSourcePath
 
   override def forkArgs = Seq("-Xmx64G", "-Xss256m")
 
-  override def ivyDeps = super.ivyDeps() ++ Seq(ivys.chiseltest)
+  override def ivyDeps = super.ivyDeps() ++ Agg(
+    getVersion("chisel"),
+    getVersion("chiseltest", "edu.berkeley.cs"),
+  )
 
   override def moduleDeps = super.moduleDeps ++ Seq(
-    rocketModule,
-    difftestModule,
-    huancunModule,
-    fudianModule,
-    xsutilsModule,
-    coupledL2Module,
-    utilityModule
+    rocketchip,
+    xsutils,
+    huancun,
+    difftest,
+    coupledL2,
+    fudian
   )
 
-  object test extends Tests with TestModule.ScalaTest {
-
-    override def forkArgs = m.forkArgs
-
+  object test extends SbtModuleTests with TestModule.ScalaTest {
     override def ivyDeps = super.ivyDeps() ++ Agg(
-      ivys.scalatest
+      getVersion("scalatest","org.scalatest")
     )
 
+    def testFramework = "org.scalatest.tools.Framework"
   }
-
-}
-
-object XiangShan extends CommonXiangShan {
-  override def rocketModule = rocketchip
-  override def difftestModule = difftest
-  override def huancunModule = huancun
-  override def fudianModule = fudian
-  override def xsutilsModule = xsutils
-  override def coupledL2Module = CoupledL2
-  override def utilityModule = utility
-}
+}