Convert PreservesAll to explicit invalidates=false

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

4 files changed, 44 insertions, 38 deletions

diff --git a/src/test/scala/firrtl/testutils/FirrtlSpec.scala b/src/test/scala/firrtl/testutils/FirrtlSpec.scala
index 09abf547..75739147 100644
--- a/src/test/scala/firrtl/testutils/FirrtlSpec.scala
+++ b/src/test/scala/firrtl/testutils/FirrtlSpec.scala
@@ -13,7 +13,7 @@ import org.scalatestplus.scalacheck._
 import firrtl._
 import firrtl.ir._
 import firrtl.Parser.UseInfo
-import firrtl.options.{Dependency, PreservesAll}
+import firrtl.options.Dependency
 import firrtl.stage.{FirrtlFileAnnotation, InfoModeAnnotation, RunFirrtlTransformAnnotation}
 import firrtl.analyses.{GetNamespace, ModuleNamespaceAnnotation}
 import firrtl.annotations._
@@ -33,9 +33,10 @@ class CheckLowForm extends SeqTransform {
 
 case class RenameTopAnnotation(newTopName: String) extends NoTargetAnnotation
 
-object RenameTop extends Transform with PreservesAll[Transform] {
+object RenameTop extends Transform {
   def inputForm = UnknownForm
   def outputForm = UnknownForm
+  override def invalidates(a: Transform) = false
 
   override val optionalPrerequisites = Seq(Dependency[RenameModules])
 
diff --git a/src/test/scala/firrtlTests/InferReadWriteSpec.scala b/src/test/scala/firrtlTests/InferReadWriteSpec.scala
index 21228c27..e8be70ad 100644
--- a/src/test/scala/firrtlTests/InferReadWriteSpec.scala
+++ b/src/test/scala/firrtlTests/InferReadWriteSpec.scala
@@ -4,7 +4,6 @@ package firrtlTests
 
 import firrtl._
 import firrtl.ir._
-import firrtl.options.PreservesAll
 import firrtl.passes._
 import firrtl.stage.Forms
 import firrtl.testutils._
@@ -14,10 +13,11 @@ class InferReadWriteSpec extends SimpleTransformSpec {
   class InferReadWriteCheckException extends PassException(
     "Readwrite ports are not found!")
 
-  object InferReadWriteCheck extends Pass with PreservesAll[Transform] {
+  object InferReadWriteCheck extends Pass {
     override def prerequisites = Forms.MidForm
     override def optionalPrerequisites = Seq.empty
     override def optionalPrerequisiteOf = Forms.MidEmitters
+    override def invalidates(a: Transform) = false
 
     def findReadWrite(s: Statement): Boolean = s match {
       case s: DefMemory if s.readLatency > 0 && s.readwriters.size == 1 =>
diff --git a/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala b/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala
index 5f796b4f..d8422cb9 100644
--- a/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala
+++ b/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala
@@ -4,7 +4,7 @@ package firrtlTests.options
 
 
 import firrtl.AnnotationSeq
-import firrtl.options.{DependencyManagerException, Phase, PhaseManager, PreservesAll, Dependency}
+import firrtl.options.{DependencyManagerException, Phase, PhaseManager, Dependency}
 
 import java.io.{File, PrintWriter}
 
@@ -16,6 +16,10 @@ trait IdentityPhase extends Phase {
   def transform(annotations: AnnotationSeq): AnnotationSeq = annotations
 }
 
+trait PreservesAll { this: Phase =>
+  override def invalidates(phase: Phase) = false
+}
+
 /** Default [[Phase]] that has no prerequisites and invalidates nothing */
 class A extends IdentityPhase {
 
@@ -68,11 +72,11 @@ class G extends IdentityPhase {
   }
 }
 
-class CyclicA extends IdentityPhase with PreservesAll[Phase] {
+class CyclicA extends IdentityPhase with PreservesAll {
   override def prerequisites = Seq(Dependency[CyclicB])
 }
 
-class CyclicB extends IdentityPhase with PreservesAll[Phase] {
+class CyclicB extends IdentityPhase with PreservesAll {
   override def prerequisites = Seq(Dependency[CyclicA])
 }
 
@@ -236,22 +240,22 @@ object UnrelatedFixture {
   }
 
   class B0 extends IdentityPhase with InvalidatesB8Dep
-  class B1 extends IdentityPhase with PreservesAll[Phase]
-  class B2 extends IdentityPhase with PreservesAll[Phase]
-  class B3 extends IdentityPhase with PreservesAll[Phase]
-  class B4 extends IdentityPhase with PreservesAll[Phase]
-  class B5 extends IdentityPhase with PreservesAll[Phase]
-  class B6 extends IdentityPhase with PreservesAll[Phase]
-  class B7 extends IdentityPhase with PreservesAll[Phase]
-
-  class B8 extends IdentityPhase with PreservesAll[Phase]
-  class B9 extends IdentityPhase with PreservesAll[Phase]
-  class B10 extends IdentityPhase with PreservesAll[Phase]
-  class B11 extends IdentityPhase with PreservesAll[Phase]
-  class B12 extends IdentityPhase with PreservesAll[Phase]
-  class B13 extends IdentityPhase with PreservesAll[Phase]
-  class B14 extends IdentityPhase with PreservesAll[Phase]
-  class B15 extends IdentityPhase with PreservesAll[Phase]
+  class B1 extends IdentityPhase with PreservesAll
+  class B2 extends IdentityPhase with PreservesAll
+  class B3 extends IdentityPhase with PreservesAll
+  class B4 extends IdentityPhase with PreservesAll
+  class B5 extends IdentityPhase with PreservesAll
+  class B6 extends IdentityPhase with PreservesAll
+  class B7 extends IdentityPhase with PreservesAll
+
+  class B8 extends IdentityPhase with PreservesAll
+  class B9 extends IdentityPhase with PreservesAll
+  class B10 extends IdentityPhase with PreservesAll
+  class B11 extends IdentityPhase with PreservesAll
+  class B12 extends IdentityPhase with PreservesAll
+  class B13 extends IdentityPhase with PreservesAll
+  class B14 extends IdentityPhase with PreservesAll
+  class B15 extends IdentityPhase with PreservesAll
 
   class B6Sub extends B6 {
     override def prerequisites = Seq(Dependency[B6])
@@ -300,29 +304,29 @@ object UnrelatedFixture {
 
 object CustomAfterOptimizationFixture {
 
-  class Root extends IdentityPhase with PreservesAll[Phase]
+  class Root extends IdentityPhase with PreservesAll
 
-  class OptMinimum extends IdentityPhase with PreservesAll[Phase] {
+  class OptMinimum extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root])
     override def optionalPrerequisiteOf = Seq(Dependency[AfterOpt])
   }
 
-  class OptFull extends IdentityPhase with PreservesAll[Phase] {
+  class OptFull extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root], Dependency[OptMinimum])
     override def optionalPrerequisiteOf = Seq(Dependency[AfterOpt])
   }
 
-  class AfterOpt extends IdentityPhase with PreservesAll[Phase]
+  class AfterOpt extends IdentityPhase with PreservesAll
 
-  class DoneMinimum extends IdentityPhase with PreservesAll[Phase] {
+  class DoneMinimum extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[OptMinimum])
   }
 
-  class DoneFull extends IdentityPhase with PreservesAll[Phase] {
+  class DoneFull extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[OptFull])
   }
 
-  class Custom extends IdentityPhase with PreservesAll[Phase] {
+  class Custom extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root], Dependency[AfterOpt])
     override def optionalPrerequisiteOf = Seq(Dependency[DoneMinimum], Dependency[DoneFull])
   }
@@ -333,23 +337,23 @@ object OptionalPrerequisitesFixture {
 
   class Root extends IdentityPhase
 
-  class OptMinimum extends IdentityPhase with PreservesAll[Phase] {
+  class OptMinimum extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root])
   }
 
-  class OptFull extends IdentityPhase with PreservesAll[Phase] {
+  class OptFull extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root], Dependency[OptMinimum])
   }
 
-  class DoneMinimum extends IdentityPhase with PreservesAll[Phase] {
+  class DoneMinimum extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[OptMinimum])
   }
 
-  class DoneFull extends IdentityPhase with PreservesAll[Phase] {
+  class DoneFull extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[OptFull])
   }
 
-  class Custom extends IdentityPhase with PreservesAll[Phase] {
+  class Custom extends IdentityPhase with PreservesAll {
     override def prerequisites = Seq(Dependency[Root])
     override def optionalPrerequisites = Seq(Dependency[OptMinimum], Dependency[OptFull])
     override def optionalPrerequisiteOf = Seq(Dependency[DoneMinimum], Dependency[DoneFull])
@@ -359,7 +363,7 @@ object OptionalPrerequisitesFixture {
 
 object OrderingFixture {
 
-  class A extends IdentityPhase with PreservesAll[Phase]
+  class A extends IdentityPhase with PreservesAll
 
   class B extends IdentityPhase {
     override def invalidates(phase: Phase): Boolean = phase match {
diff --git a/src/test/scala/firrtlTests/stage/phases/CompilerSpec.scala b/src/test/scala/firrtlTests/stage/phases/CompilerSpec.scala
index 30574536..0446d4a3 100644
--- a/src/test/scala/firrtlTests/stage/phases/CompilerSpec.scala
+++ b/src/test/scala/firrtlTests/stage/phases/CompilerSpec.scala
@@ -6,7 +6,7 @@ package firrtlTests.stage.phases
 import scala.collection.mutable
 
 import firrtl.{Compiler => _, _}
-import firrtl.options.{Phase, PreservesAll}
+import firrtl.options.Phase
 import firrtl.stage.{CompilerAnnotation, FirrtlCircuitAnnotation, Forms, RunFirrtlTransformAnnotation}
 import firrtl.stage.phases.Compiler
 import org.scalatest.flatspec.AnyFlatSpec
@@ -160,10 +160,11 @@ object CompilerSpec {
 
   private[CompilerSpec] val globalState: mutable.Queue[Class[_ <: Transform]] = mutable.Queue.empty[Class[_ <: Transform]]
 
-  class LoggingTransform extends Transform with PreservesAll[Transform] {
+  class LoggingTransform extends Transform {
     override def inputForm = UnknownForm
     override def outputForm = UnknownForm
     override def prerequisites = Forms.HighForm
+    override def invalidates(a: Transform) = false
     def execute(c: CircuitState): CircuitState = {
       globalState += this.getClass
       c