From 63611adfa39f5082dd0ab0eb4a3d16a80d5636e2 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Fri, 6 Dec 2019 13:11:46 -0500 Subject: Move --no-dedup from stage-global to firrtl-local (#1265) This moves the --no-dedup option to be FIRRTL-stage specific as opposed to a global option common to all stages. Signed-off-by: Schuyler Eldridge --- src/main/scala/firrtl/options/Shell.scala | 4 +--- src/main/scala/firrtl/stage/FirrtlCli.scala | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/scala/firrtl/options/Shell.scala b/src/main/scala/firrtl/options/Shell.scala index 7e338332..28c0554a 100644 --- a/src/main/scala/firrtl/options/Shell.scala +++ b/src/main/scala/firrtl/options/Shell.scala @@ -3,7 +3,6 @@ package firrtl.options import firrtl.AnnotationSeq -import firrtl.transforms.NoCircuitDedupAnnotation import logger.{LogLevelAnnotation, ClassLogLevelAnnotation, LogFileAnnotation, LogClassNamesAnnotation} @@ -65,8 +64,7 @@ class Shell(val applicationName: String) { ProgramArgsAnnotation.addOptions(parser) Seq( TargetDirAnnotation, InputAnnotationFileAnnotation, - OutputAnnotationFileAnnotation, - NoCircuitDedupAnnotation) + OutputAnnotationFileAnnotation ) .foreach(_.addOptions(parser)) parser.opt[Unit]("show-registrations") diff --git a/src/main/scala/firrtl/stage/FirrtlCli.scala b/src/main/scala/firrtl/stage/FirrtlCli.scala index 15c9069e..be1100c3 100644 --- a/src/main/scala/firrtl/stage/FirrtlCli.scala +++ b/src/main/scala/firrtl/stage/FirrtlCli.scala @@ -3,6 +3,7 @@ package firrtl.stage import firrtl.options.Shell +import firrtl.transforms.NoCircuitDedupAnnotation /** [[firrtl.options.Shell Shell]] mixin that provides command line options for FIRRTL. This does not include any * [[firrtl.options.RegisteredLibrary RegisteredLibrary]] or [[firrtl.options.RegisteredTransform RegisteredTransform]] @@ -17,7 +18,8 @@ trait FirrtlCli { this: Shell => CompilerAnnotation, RunFirrtlTransformAnnotation, firrtl.EmitCircuitAnnotation, - firrtl.EmitAllModulesAnnotation ) + firrtl.EmitAllModulesAnnotation, + NoCircuitDedupAnnotation ) .map(_.addOptions(parser)) phases.DriverCompatibility.TopNameAnnotation.addOptions(parser) -- cgit v1.2.3