From 994f11080841c3b209296d1071eaa4a9c7e2da7f Mon Sep 17 00:00:00 2001 From: Clo91eaf Date: Sat, 23 Mar 2024 01:34:59 +0800 Subject: [PATCH] add chisel6 option --- chisel/.gitignore | 4 ++++ chisel/build.sc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/chisel/.gitignore b/chisel/.gitignore index daec61a..905ee06 100644 --- a/chisel/.gitignore +++ b/chisel/.gitignore @@ -22,3 +22,7 @@ out/ .idea/ .idea_modules/ test_run_dir/ + +# vscode +.metals/ +.vscode/ diff --git a/chisel/build.sc b/chisel/build.sc index 2768db8..3cf92e2 100644 --- a/chisel/build.sc +++ b/chisel/build.sc @@ -7,7 +7,8 @@ import mill.scalalib.TestModule.ScalaTest import mill.bsp._ object playground extends ScalaModule with ScalafmtModule { m => - val useChisel5 = true + val useChisel5 = false + val useChisel6 = true override def scalaVersion = "2.13.10" override def scalacOptions = Seq( "-language:reflectiveCalls", @@ -17,16 +18,19 @@ object playground extends ScalaModule with ScalafmtModule { m => ) override def ivyDeps = Agg( if (useChisel5) ivy"org.chipsalliance::chisel:5.0.0" else + if (useChisel6) ivy"org.chipsalliance::chisel:6.1.0" else ivy"edu.berkeley.cs::chisel3:3.6.0", ) override def scalacPluginIvyDeps = Agg( if (useChisel5) ivy"org.chipsalliance:::chisel-plugin:5.0.0" else + if (useChisel6) ivy"org.chipsalliance:::chisel-plugin:6.1.0" else ivy"edu.berkeley.cs:::chisel3-plugin:3.6.0", ) object test extends ScalaTests with ScalaTest { override def ivyDeps = m.ivyDeps() ++ Agg( ivy"com.lihaoyi::utest:0.8.1", if (useChisel5) ivy"edu.berkeley.cs::chiseltest:5.0.0" else + if (useChisel5) ivy"edu.berkeley.cs::chiseltest:6.1.0" else ivy"edu.berkeley.cs::chiseltest:0.6.0", ) }