From 8f93b873bcd03377b6b13b0b1acdc0d29446291e Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 7 Oct 2021 10:19:08 -0700 Subject: [PATCH] Remove other small deprecations [ci skip] --- build.sbt | 4 ++-- generators/chipyard/src/main/scala/stage/ChipyardCli.scala | 3 +-- generators/chipyard/src/main/scala/stage/ChipyardStage.scala | 3 ++- .../src/main/scala/stage/phases/AddDefaultTests.scala | 4 +++- .../main/scala/stage/phases/GenerateTestSuiteMakefrags.scala | 4 +++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 04a162f6..e83992b9 100644 --- a/build.sbt +++ b/build.sbt @@ -260,8 +260,8 @@ lazy val firechip = (project in file("generators/firechip")) .dependsOn(chipyard, midasTargetUtils, midas, firesimLib % "test->test;compile->compile") .settings( commonSettings, - testGrouping in Test := isolateAllTests( (definedTests in Test).value ), - testOptions in Test += Tests.Argument("-oF") + Test / testGrouping := isolateAllTests( (Test / definedTests).value ), + Test / testOptions += Tests.Argument("-oF") ) lazy val fpga_shells = (project in file("./fpga/fpga-shells")) .dependsOn(rocketchip, sifive_blocks) diff --git a/generators/chipyard/src/main/scala/stage/ChipyardCli.scala b/generators/chipyard/src/main/scala/stage/ChipyardCli.scala index 7d293c36..da9311bf 100644 --- a/generators/chipyard/src/main/scala/stage/ChipyardCli.scala +++ b/generators/chipyard/src/main/scala/stage/ChipyardCli.scala @@ -10,6 +10,5 @@ trait ChipyardCli { this: Shell => parser.note("Chipyard Generator Options") Seq( UnderscoreDelimitedConfigsAnnotation - ) - .foreach(_.addOptions(parser)) + ).foreach(_.addOptions(parser)) } diff --git a/generators/chipyard/src/main/scala/stage/ChipyardStage.scala b/generators/chipyard/src/main/scala/stage/ChipyardStage.scala index 4e429618..a830c3a8 100644 --- a/generators/chipyard/src/main/scala/stage/ChipyardStage.scala +++ b/generators/chipyard/src/main/scala/stage/ChipyardStage.scala @@ -13,7 +13,7 @@ import freechips.rocketchip.system.RocketChipStage import firrtl.options.{Phase, PhaseManager, PreservesAll, Shell, Stage, StageError, StageMain, Dependency} import firrtl.options.phases.DeletedWrapper -class ChipyardStage extends ChiselStage with PreservesAll[Phase] { +class ChipyardStage extends ChiselStage { override val shell = new Shell("chipyard") with ChipyardCli with RocketChipCli with ChiselCli with FirrtlCli override val targets: Seq[PhaseDependency] = Seq( Dependency[freechips.rocketchip.stage.phases.Checks], @@ -33,4 +33,5 @@ class ChipyardStage extends ChiselStage with PreservesAll[Phase] { Dependency[chipyard.stage.phases.GenerateTestSuiteMakefrags], Dependency[freechips.rocketchip.stage.phases.GenerateArtefacts], ) + override final def invalidates(a: Phase): Boolean = false } diff --git a/generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala b/generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala index 177d26b0..25a6fa61 100644 --- a/generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala +++ b/generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala @@ -22,7 +22,7 @@ import freechips.rocketchip.tile.XLen import chipyard.TestSuiteHelper import chipyard.TestSuitesKey -class AddDefaultTests extends Phase with PreservesAll[Phase] with HasRocketChipStageUtils { +class AddDefaultTests extends Phase with HasRocketChipStageUtils { // Make sure we run both after RocketChip's version of this phase, and Rocket Chip's annotation emission phase // because the RocketTestSuiteAnnotation is not serializable (but is not marked as such). override val prerequisites = Seq( @@ -52,4 +52,6 @@ class AddDefaultTests extends Phase with PreservesAll[Phase] with HasRocketChipS implicit val p = getConfig(view[RocketChipOptions](annotations).configNames.get).toInstance addTestSuiteAnnotations ++ oAnnos } + + override final def invalidates(a: Phase): Boolean = false } diff --git a/generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala b/generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala index 0ed5ec11..e0796db5 100644 --- a/generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala +++ b/generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala @@ -21,7 +21,7 @@ trait MakefragSnippet { self: Annotation => case class CustomMakefragSnippet(val toMakefrag: String) extends NoTargetAnnotation with MakefragSnippet with Unserializable /** Generates a make script to run tests in [[RocketTestSuiteAnnotation]]. */ -class GenerateTestSuiteMakefrags extends Phase with PreservesAll[Phase] with HasRocketChipStageUtils { +class GenerateTestSuiteMakefrags extends Phase with HasRocketChipStageUtils { // Our annotations tend not to be serializable, but are not marked as such. override val prerequisites = Seq(Dependency[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos], @@ -46,4 +46,6 @@ class GenerateTestSuiteMakefrags extends Phase with PreservesAll[Phase] with Has writeOutputFile(targetDir, fileName, TestGeneration.generateMakeFrag ++ makefragBuilder.toString) outputAnnotations } + + override final def invalidates(a: Phase): Boolean = false }