From a5b412cfbcae3ed8237aab964bb03ef7ee9f4188 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Mon, 6 Dec 2021 23:36:13 +0000 Subject: [PATCH] Remove sriracha and generated .sbtopts --- .circleci/do-rtl-build.sh | 3 --- .circleci/run-firesim-scala-tests.sh | 3 --- .gitignore | 1 - build.sbt | 17 +++++------------ project/plugins.sbt | 1 - scripts/init-submodules-no-riscv-tools-nolog.sh | 2 -- variables.mk | 9 ++------- 7 files changed, 7 insertions(+), 29 deletions(-) diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh index 95f3c903..3a537ea3 100755 --- a/.circleci/do-rtl-build.sh +++ b/.circleci/do-rtl-build.sh @@ -21,9 +21,6 @@ cd $LOCAL_CHIPYARD_DIR ./scripts/init-submodules-no-riscv-tools.sh ./scripts/init-fpga.sh -# replace the workspace dir with a local dir so you can copy around -sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts - # set stricthostkeychecking to no (must happen before rsync) run "echo \"Ping $SERVER\"" diff --git a/.circleci/run-firesim-scala-tests.sh b/.circleci/run-firesim-scala-tests.sh index 0a74adb8..022894f2 100755 --- a/.circleci/run-firesim-scala-tests.sh +++ b/.circleci/run-firesim-scala-tests.sh @@ -29,9 +29,6 @@ mkdir -p $local_firesim_sysroot ./scripts/build-libdwarf.sh $local_firesim_sysroot cd $LOCAL_CHIPYARD_DIR -# replace the workspace dir with a local dir so you can copy around -sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts - make -C $LOCAL_CHIPYARD_DIR/tools/dromajo/dromajo-src/src # set stricthostkeychecking to no (must happen before rsync) diff --git a/.gitignore b/.gitignore index 7c0f02bf..257d2c58 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,3 @@ tags env-riscv-tools.sh env-esp-tools.sh .bsp/ -.sbtopts diff --git a/build.sbt b/build.sbt index 509c67d7..d44a9243 100644 --- a/build.sbt +++ b/build.sbt @@ -156,11 +156,9 @@ lazy val testchipip = (project in file("generators/testchipip")) .dependsOn(rocketchip, sifive_blocks) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) -lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHOT" lazy val chipyard = (project in file("generators/chipyard")) - .sourceDependency(testchipip, testchipipLib) - .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell, + .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell, sha3, // On separate line to allow for cleaner tutorial-setup patches dsptools, `rocket-dsp-utils`, gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex) @@ -168,14 +166,12 @@ lazy val chipyard = (project in file("generators/chipyard")) .settings(commonSettings) lazy val tracegen = (project in file("generators/tracegen")) - .sourceDependency(testchipip, testchipipLib) - .dependsOn(rocketchip, sifive_cache, boom) + .dependsOn(testchipip, rocketchip, sifive_cache, boom) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) lazy val icenet = (project in file("generators/icenet")) - .sourceDependency(testchipip, testchipipLib) - .dependsOn(rocketchip) + .dependsOn(testchipip, rocketchip) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) @@ -185,8 +181,7 @@ lazy val hwacha = (project in file("generators/hwacha")) .settings(commonSettings) lazy val boom = (project in file("generators/boom")) - .sourceDependency(testchipip, testchipipLib) - .dependsOn(rocketchip) + .dependsOn(testchipip, rocketchip) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) @@ -211,8 +206,7 @@ lazy val sha3 = (project in file("generators/sha3")) .settings(commonSettings) lazy val gemmini = (project in file("generators/gemmini")) - .sourceDependency(testchipip, testchipipLib) - .dependsOn(rocketchip, chisel_testers) + .dependsOn(testchipip, rocketchip, chisel_testers) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) @@ -280,7 +274,6 @@ lazy val midas = ProjectRef(firesimDir, "midas") lazy val firesimLib = ProjectRef(firesimDir, "firesimLib") lazy val firechip = (project in file("generators/firechip")) - .sourceDependency(testchipip, testchipipLib) .dependsOn(chipyard, midasTargetUtils, midas, firesimLib % "test->test;compile->compile") .settings( commonSettings, diff --git a/project/plugins.sbt b/project/plugins.sbt index 7e6f3aa8..026b95e9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,5 +11,4 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2") addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.3") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1") -addSbtPlugin("com.eed3si9n" % "sbt-sriracha" % "0.1.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" ) diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh index 743ea198..967c4ba7 100755 --- a/scripts/init-submodules-no-riscv-tools-nolog.sh +++ b/scripts/init-submodules-no-riscv-tools-nolog.sh @@ -88,5 +88,3 @@ echo "# line auto-generated by init-submodules-no-riscv-tools.sh" >> env.sh echo '__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"' >> env.sh echo "PATH=\$__DIR/bin:\$PATH" >> env.sh echo "PATH=\$__DIR/software/firemarshal:\$PATH" >> env.sh -echo "-Dsbt.sourcemode=true" > .sbtopts -echo "-Dsbt.workspace=$CHIPYARD_DIR/tools" >> .sbtopts diff --git a/variables.mk b/variables.mk index 9ba9f4a3..dd40f565 100644 --- a/variables.mk +++ b/variables.mk @@ -6,7 +6,8 @@ HELP_COMPILATION_VARIABLES = \ " JAVA_HEAP_SIZE = if overridden, set the default java heap size (default is 8G)" \ " JAVA_TOOL_OPTIONS = if overridden, set underlying java tool options (default sets misc. sizes and tmp dir)" \ -" SBT_OPTS = if overridden, set underlying sbt options (default uses options in .sbtopts)" \ +" SBT_OPTS = set additional sbt command line options (these take the form -Dsbt.