diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/firrtl/Emitter.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/CustomTransformSpec.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/LoweringCompilersSpec.scala | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/Emitter.scala b/src/main/scala/firrtl/Emitter.scala index 268841da..47d8c7d1 100644 --- a/src/main/scala/firrtl/Emitter.scala +++ b/src/main/scala/firrtl/Emitter.scala @@ -16,7 +16,7 @@ import Utils._ import MemPortUtils.{memPortField, memType} import firrtl.options.{Dependency, HasShellOptions, PhaseException, ShellOption, Unserializable} import firrtl.stage.{RunFirrtlTransformAnnotation, TransformManager} -import firrtl.transforms.formal.RemoveVerificationStatements +import firrtl.transforms.formal.{RemoveVerificationStatements, ConvertAsserts} // Datastructures import scala.collection.mutable.ArrayBuffer @@ -182,6 +182,7 @@ class VerilogEmitter extends SeqTransform with Emitter { def outputForm = LowForm override def prerequisites = + Dependency(ConvertAsserts) +: Dependency[RemoveVerificationStatements] +: Dependency[LegalizeAndReductionsTransform] +: firrtl.stage.Forms.LowFormOptimized @@ -1240,6 +1241,7 @@ class VerilogEmitter extends SeqTransform with Emitter { class MinimumVerilogEmitter extends VerilogEmitter with Emitter { override def prerequisites = + Dependency(ConvertAsserts) +: Dependency[RemoveVerificationStatements] +: Dependency[LegalizeAndReductionsTransform] +: firrtl.stage.Forms.LowFormMinimumOptimized diff --git a/src/test/scala/firrtlTests/CustomTransformSpec.scala b/src/test/scala/firrtlTests/CustomTransformSpec.scala index 677aa6ff..7a683ea9 100644 --- a/src/test/scala/firrtlTests/CustomTransformSpec.scala +++ b/src/test/scala/firrtlTests/CustomTransformSpec.scala @@ -10,7 +10,7 @@ import firrtl.stage.{FirrtlSourceAnnotation, FirrtlStage, Forms, RunFirrtlTransf import firrtl.options.Dependency import firrtl.transforms.{IdentityTransform, LegalizeAndReductionsTransform} import firrtl.testutils._ -import firrtl.transforms.formal.RemoveVerificationStatements +import firrtl.transforms.formal.{RemoveVerificationStatements, ConvertAsserts} import scala.reflect.runtime @@ -174,9 +174,11 @@ class CustomTransformSpec extends FirrtlFlatSpec { Seq( (Seq(Dependency[LowFirrtlEmitter]), Seq(low.last) ), (Seq(Dependency[LegalizeAndReductionsTransform], + Dependency(ConvertAsserts), Dependency[RemoveVerificationStatements], Dependency[MinimumVerilogEmitter]), Seq(lowMinOpt.last)), (Seq(Dependency[LegalizeAndReductionsTransform], + Dependency(ConvertAsserts), Dependency[RemoveVerificationStatements], Dependency[VerilogEmitter]), Seq(lowOpt.last) ), (Seq(Dependency[LegalizeAndReductionsTransform], diff --git a/src/test/scala/firrtlTests/LoweringCompilersSpec.scala b/src/test/scala/firrtlTests/LoweringCompilersSpec.scala index 75f2ea02..82750fdf 100644 --- a/src/test/scala/firrtlTests/LoweringCompilersSpec.scala +++ b/src/test/scala/firrtlTests/LoweringCompilersSpec.scala @@ -354,6 +354,7 @@ class LoweringCompilersSpec extends FlatSpec with Matchers { val tm = (new TransformManager(Seq(Dependency[firrtl.MinimumVerilogEmitter], Dependency[Transforms.LowToLow]))) val patches = Seq( Add(63, Seq( + Dependency(firrtl.transforms.formal.ConvertAsserts), Dependency[firrtl.transforms.formal.RemoveVerificationStatements], Dependency[firrtl.transforms.LegalizeAndReductionsTransform])) ) @@ -367,6 +368,7 @@ class LoweringCompilersSpec extends FlatSpec with Matchers { val tm = (new TransformManager(Seq(Dependency[firrtl.VerilogEmitter], Dependency[Transforms.LowToLow]))) val patches = Seq( Add(70, Seq( + Dependency(firrtl.transforms.formal.ConvertAsserts), Dependency[firrtl.transforms.formal.RemoveVerificationStatements], Dependency[firrtl.transforms.LegalizeAndReductionsTransform])) ) |
