From a9f9068baf5ecf3aa3c37980738971036e411731 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Mon, 20 Feb 2023 23:58:46 -0800 Subject: [PATCH] remove duplicate compiler annotation --- .../transforms/GenerateModelStageMain.scala | 9 +-------- .../transforms/stage/TapeoutStage.scala | 20 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala b/src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala index 706e8606..08cd8d04 100644 --- a/src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala +++ b/src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala @@ -36,14 +36,7 @@ private class GenerateModelStageMain(annotations: AnnotationSeq) extends LazyLog } def executeStageMain(): Unit = { - val appendedAnnotations = annotations.filter(_ match { - case CompilerNameAnnotation(_) => true - case _ => false - }).map(_ match { - case CompilerNameAnnotation("low") => Some(RunFirrtlTransformAnnotation(Dependency[ExtraLowTransforms])) - case _ => None - }).flatten - val annos = new FirrtlStage().execute(Array.empty, annotations ++ appendedAnnotations) + val annos = new FirrtlStage().execute(Array.empty, annotations) annos.collectFirst { case FirrtlCircuitAnnotation(circuit) => circuit } match { case Some(circuit) => diff --git a/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala b/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala index 8f3af9e3..14b57e3e 100644 --- a/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala +++ b/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala @@ -28,32 +28,12 @@ object OutAnnoAnnotation extends HasShellOptions { ) } -case class CompilerNameAnnotation(name: String) extends NoTargetAnnotation with TapeoutOption - -// duplicate of firrtl.stage.CompilerAnnotation but needed so that you can have a -// CompilerAnnotation to match on when adding new transforms -object DuplicateCompilerAnnotation extends HasShellOptions { - val options: Seq[ShellOption[_]] = Seq( - new ShellOption[String]( - longOption = "duplicate-compiler", - shortOption = Some("DX"), - toAnnotationSeq = (s: String) => { - Seq( - CompilerNameAnnotation(s)) - }, - helpText = "duplicate-compiler", - helpValueName = Some("same as --compiler FIRRTL flag") - ) - ) -} - trait TapeoutCli { this: Shell => parser.note("Tapeout specific options") Seq( OutAnnoAnnotation, - DuplicateCompilerAnnotation ).foreach(_.addOptions(parser)) }