diff options
Diffstat (limited to 'src/test/scala')
| -rw-r--r-- | src/test/scala/firrtlTests/CustomTransformSpec.scala | 9 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/LoweringCompilersSpec.scala | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/test/scala/firrtlTests/CustomTransformSpec.scala b/src/test/scala/firrtlTests/CustomTransformSpec.scala index 9141a9f7..3e5fd254 100644 --- a/src/test/scala/firrtlTests/CustomTransformSpec.scala +++ b/src/test/scala/firrtlTests/CustomTransformSpec.scala @@ -150,13 +150,6 @@ class CustomTransformSpec extends FirrtlFlatSpec { they should "run right before the emitter* when inputForm=LowForm" in { - val locationMap = Map( - Dependency[LowFirrtlEmitter] -> Dependency[LowFirrtlEmitter], - Dependency[MinimumVerilogEmitter] -> Dependency(ConvertAsserts), - Dependency[VerilogEmitter] -> Dependency(ConvertAsserts), - Dependency[SystemVerilogEmitter] -> Dependency[LegalizeAndReductionsTransform] - ) - Seq( Dependency[LowFirrtlEmitter], Dependency[MinimumVerilogEmitter], @@ -170,7 +163,7 @@ class CustomTransformSpec extends FirrtlFlatSpec { .flattenedTransformOrder .map(Dependency.fromTransform) .sliding(2) - .toList should contain (Seq(custom, locationMap(emitter))) + .toList should contain (Seq(custom, emitter)) } } diff --git a/src/test/scala/firrtlTests/LoweringCompilersSpec.scala b/src/test/scala/firrtlTests/LoweringCompilersSpec.scala index 7df621d3..854763f1 100644 --- a/src/test/scala/firrtlTests/LoweringCompilersSpec.scala +++ b/src/test/scala/firrtlTests/LoweringCompilersSpec.scala @@ -192,7 +192,8 @@ class LoweringCompilersSpec extends FlatSpec with Matchers { val tm = new TransformManager(Forms.LowFormMinimumOptimized, Forms.LowForm) val patches = Seq( Add(4, Seq(Dependency(firrtl.passes.ResolveFlows))), - Add(5, Seq(Dependency(firrtl.passes.ResolveKinds))) + Add(6, Seq(Dependency[firrtl.transforms.LegalizeAndReductionsTransform], + Dependency(firrtl.passes.ResolveKinds))) ) compare(legacyTransforms(new MinimumLowFirrtlOptimization), tm, patches) } @@ -204,7 +205,8 @@ class LoweringCompilersSpec extends FlatSpec with Matchers { val patches = Seq( Add(6, Seq(Dependency(firrtl.passes.ResolveFlows))), Add(7, Seq(Dependency(firrtl.passes.Legalize))), - Add(8, Seq(Dependency(firrtl.passes.ResolveKinds))) + Add(8, Seq(Dependency[firrtl.transforms.LegalizeAndReductionsTransform], + Dependency(firrtl.passes.ResolveKinds))) ) compare(legacyTransforms(new LowFirrtlOptimization), tm, patches) } |