wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update stage to use Dependency instead of classof

Browse Source
This commit is contained in:
Colin Schmidt
2020-05-05 15:24:51 -07:00
parent 43f6083b69
commit a255417513
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
generators/chipyard/src/main/scala/stage/ChipyardStage.scala
View File

@@ -10,27 +10,27 @@ import firrtl.stage.FirrtlCli
import freechips.rocketchip.stage.RocketChipCli import freechips.rocketchip.stage.RocketChipCli
import freechips.rocketchip.system.RocketChipStage import freechips.rocketchip.system.RocketChipStage
import firrtl.options.{Phase, PhaseManager, PreservesAll, Shell, Stage, StageError, StageMain} import firrtl.options.{Phase, PhaseManager, PreservesAll, Shell, Stage, StageError, StageMain, Dependency}
import firrtl.options.phases.DeletedWrapper import firrtl.options.phases.DeletedWrapper
class ChipyardStage extends ChiselStage with PreservesAll[Phase] { class ChipyardStage extends ChiselStage with PreservesAll[Phase] {
override val shell = new Shell("chipyard") with ChipyardCli with RocketChipCli with ChiselCli with FirrtlCli override val shell = new Shell("chipyard") with ChipyardCli with RocketChipCli with ChiselCli with FirrtlCli
override val targets: Seq[PhaseDependency] = Seq( override val targets: Seq[PhaseDependency] = Seq(
classOf[freechips.rocketchip.stage.phases.Checks], Dependency[freechips.rocketchip.stage.phases.Checks],
classOf[freechips.rocketchip.stage.phases.TransformAnnotations], Dependency[freechips.rocketchip.stage.phases.TransformAnnotations],
classOf[freechips.rocketchip.stage.phases.PreElaboration], Dependency[freechips.rocketchip.stage.phases.PreElaboration],
classOf[chisel3.stage.phases.Checks], Dependency[chisel3.stage.phases.Checks],
classOf[chisel3.stage.phases.Elaborate], Dependency[chisel3.stage.phases.Elaborate],
classOf[freechips.rocketchip.stage.phases.GenerateROMs], Dependency[freechips.rocketchip.stage.phases.GenerateROMs],
classOf[chisel3.stage.phases.AddImplicitOutputFile], Dependency[chisel3.stage.phases.AddImplicitOutputFile],
classOf[chisel3.stage.phases.AddImplicitOutputAnnotationFile], Dependency[chisel3.stage.phases.AddImplicitOutputAnnotationFile],
classOf[chisel3.stage.phases.MaybeAspectPhase], Dependency[chisel3.stage.phases.MaybeAspectPhase],
classOf[chisel3.stage.phases.Emitter], Dependency[chisel3.stage.phases.Emitter],
classOf[chisel3.stage.phases.Convert], Dependency[chisel3.stage.phases.Convert],
classOf[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos], Dependency[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos],
classOf[freechips.rocketchip.stage.phases.AddDefaultTests], Dependency[freechips.rocketchip.stage.phases.AddDefaultTests],
classOf[chipyard.stage.phases.AddDefaultTests], Dependency[chipyard.stage.phases.AddDefaultTests],
classOf[chipyard.stage.phases.GenerateTestSuiteMakefrags], Dependency[chipyard.stage.phases.GenerateTestSuiteMakefrags],
classOf[freechips.rocketchip.stage.phases.GenerateArtefacts], Dependency[freechips.rocketchip.stage.phases.GenerateArtefacts],
) )
} }

8
generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala
View File

@@ -10,7 +10,7 @@ import chipsalliance.rocketchip.config.Parameters
import chisel3.stage.phases.Elaborate import chisel3.stage.phases.Elaborate
import firrtl.AnnotationSeq import firrtl.AnnotationSeq
import firrtl.annotations.{Annotation, NoTargetAnnotation} import firrtl.annotations.{Annotation, NoTargetAnnotation}
import firrtl.options.{Phase, PreservesAll} import firrtl.options.{Phase, PreservesAll, Dependency}
import firrtl.options.Viewer.view import firrtl.options.Viewer.view
import freechips.rocketchip.stage.RocketChipOptions import freechips.rocketchip.stage.RocketChipOptions
import freechips.rocketchip.stage.phases.{RocketTestSuiteAnnotation} import freechips.rocketchip.stage.phases.{RocketTestSuiteAnnotation}
@@ -23,9 +23,9 @@ class AddDefaultTests extends Phase with PreservesAll[Phase] with HasRocketChipS
// Make sure we run both after RocketChip's version of this phase, and Rocket Chip's annotation emission phase // 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). // because the RocketTestSuiteAnnotation is not serializable (but is not marked as such).
override val prerequisites = Seq( override val prerequisites = Seq(
classOf[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos], Dependency[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos],
classOf[freechips.rocketchip.stage.phases.AddDefaultTests]) Dependency[freechips.rocketchip.stage.phases.AddDefaultTests])
override val dependents = Seq(classOf[freechips.rocketchip.stage.phases.GenerateTestSuiteMakefrags]) override val dependents = Seq(Dependency[freechips.rocketchip.stage.phases.GenerateTestSuiteMakefrags])
private def addTestSuiteAnnotations(implicit p: Parameters): Seq[Annotation] = { private def addTestSuiteAnnotations(implicit p: Parameters): Seq[Annotation] = {
val annotations = mutable.ArrayBuffer[Annotation]() val annotations = mutable.ArrayBuffer[Annotation]()

6
generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala
View File

@@ -7,7 +7,7 @@ import scala.collection.mutable
import firrtl.AnnotationSeq import firrtl.AnnotationSeq
import firrtl.annotations.{Annotation, NoTargetAnnotation} import firrtl.annotations.{Annotation, NoTargetAnnotation}
import firrtl.options.{Phase, PreservesAll, StageOptions, Unserializable} import firrtl.options.{Phase, PreservesAll, StageOptions, Unserializable, Dependency}
import firrtl.options.Viewer.view import firrtl.options.Viewer.view
import freechips.rocketchip.stage.RocketChipOptions import freechips.rocketchip.stage.RocketChipOptions
import freechips.rocketchip.stage.phases.{RocketTestSuiteAnnotation} import freechips.rocketchip.stage.phases.{RocketTestSuiteAnnotation}
@@ -24,8 +24,8 @@ case class CustomMakefragSnippet(val toMakefrag: String) extends NoTargetAnnotat
class GenerateTestSuiteMakefrags extends Phase with PreservesAll[Phase] with HasRocketChipStageUtils { class GenerateTestSuiteMakefrags extends Phase with PreservesAll[Phase] with HasRocketChipStageUtils {
// Our annotations tend not to be serializable, but are not marked as such. // Our annotations tend not to be serializable, but are not marked as such.
override val prerequisites = Seq(classOf[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos], override val prerequisites = Seq(Dependency[freechips.rocketchip.stage.phases.GenerateFirrtlAnnos],
classOf[chipyard.stage.phases.AddDefaultTests]) Dependency[chipyard.stage.phases.AddDefaultTests])
override def transform(annotations: AnnotationSeq): AnnotationSeq = { override def transform(annotations: AnnotationSeq): AnnotationSeq = {
val targetDir = view[StageOptions](annotations).targetDir val targetDir = view[StageOptions](annotations).targetDir