diff --git a/build.sbt b/build.sbt index 214f3902e58..8a121f79f36 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,12 @@ lazy val warningSuppression = Seq( // This is deprecated and planned to be removed "cat=deprecation&origin=chisel3\\.aop\\.injecting.*:s", "cat=deprecation&origin=chisel3\\.stage\\.phases\\.MaybeInjectingPhase:s", - "cat=deprecation&origin=chisel3\\.ModuleAspect:s" + "cat=deprecation&origin=chisel3\\.ModuleAspect:s", + "cat=deprecation&origin=chisel3\\.aop\\.inspecting.*:s", + "cat=deprecation&origin=chisel3\\.aop\\.Aspect:s", + "cat=deprecation&origin=chisel3\\.aop\\.Aspect$:s", + "cat=deprecation&origin=chisel3\\.stage\\.phases.AspectPhase:s", + "cat=deprecation&origin=chisel3\\.stage\\.phases.MaybeAspectPhase:s" ).mkString(",") ) diff --git a/core/src/main/scala/chisel3/aop/Aspect.scala b/core/src/main/scala/chisel3/aop/Aspect.scala index 456be37c4e0..8c8867a82ed 100644 --- a/core/src/main/scala/chisel3/aop/Aspect.scala +++ b/core/src/main/scala/chisel3/aop/Aspect.scala @@ -11,6 +11,7 @@ import firrtl.AnnotationSeq * what behavior should be done to instance, via the FIRRTL Annotation Mechanism * @tparam T Type of top-level module */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") abstract class Aspect[T <: RawModule] extends Annotation with Unserializable with NoTargetAnnotation { /** variable to save [[AnnotationSeq]] from [[chisel3.stage.phases.AspectPhase]] @@ -35,12 +36,14 @@ abstract class Aspect[T <: RawModule] extends Annotation with Unserializable wit } /** Holds utility functions for Aspect stuff */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") object Aspect { /** Converts elaborated Chisel components to FIRRTL modules * @param chiselIR * @return */ + @deprecated("aspects are being removed in Chisel 7", "6.6.0") def getFirrtl(chiselIR: chisel3.internal.firrtl.ir.Circuit): firrtl.ir.Circuit = { chisel3.internal.firrtl.Converter.convert(chiselIR) } diff --git a/src/main/scala/chisel3/aop/AspectLibrary.scala b/src/main/scala/chisel3/aop/AspectLibrary.scala index 0171eb002f6..203d76027e3 100644 --- a/src/main/scala/chisel3/aop/AspectLibrary.scala +++ b/src/main/scala/chisel3/aop/AspectLibrary.scala @@ -8,6 +8,7 @@ import firrtl.options.{OptionsException, RegisteredLibrary, ShellOption} /** Enables adding aspects to a design from the commandline, e.g. * sbt> runMain chisel3.stage.ChiselMain --module --with-aspect */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") final class AspectLibrary() extends RegisteredLibrary { val name = "AspectLibrary" diff --git a/src/main/scala/chisel3/aop/inspecting/InspectingAspect.scala b/src/main/scala/chisel3/aop/inspecting/InspectingAspect.scala index 1340f253822..23d37f6178b 100644 --- a/src/main/scala/chisel3/aop/inspecting/InspectingAspect.scala +++ b/src/main/scala/chisel3/aop/inspecting/InspectingAspect.scala @@ -11,6 +11,7 @@ import firrtl.AnnotationSeq * @param inspect Given top-level design, print things and return nothing * @tparam T Type of top-level module */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") case class InspectingAspect[T <: RawModule](inspect: T => Unit) extends InspectorAspect[T](inspect) /** Extend to make custom inspections of an elaborated design and printing out results @@ -18,6 +19,7 @@ case class InspectingAspect[T <: RawModule](inspect: T => Unit) extends Inspecto * @param inspect Given top-level design, print things and return nothing * @tparam T Type of top-level module */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") abstract class InspectorAspect[T <: RawModule](inspect: T => Unit) extends Aspect[T] { override def toAnnotation(top: T): AnnotationSeq = { inspect(top) diff --git a/src/main/scala/chisel3/stage/phases/AspectPhase.scala b/src/main/scala/chisel3/stage/phases/AspectPhase.scala index 4aad45acf15..31dcddda203 100644 --- a/src/main/scala/chisel3/stage/phases/AspectPhase.scala +++ b/src/main/scala/chisel3/stage/phases/AspectPhase.scala @@ -14,6 +14,7 @@ import scala.collection.mutable * * Consumes the [[chisel3.stage.DesignAnnotation]] and converts every `Aspect` into their annotations prior to executing FIRRTL */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") class AspectPhase extends Phase { def transform(annotations: AnnotationSeq): AnnotationSeq = { var dut: Option[RawModule] = None diff --git a/src/main/scala/chisel3/stage/phases/MaybeAspectPhase.scala b/src/main/scala/chisel3/stage/phases/MaybeAspectPhase.scala index dcd0dfe02c3..89eeabf4b3d 100644 --- a/src/main/scala/chisel3/stage/phases/MaybeAspectPhase.scala +++ b/src/main/scala/chisel3/stage/phases/MaybeAspectPhase.scala @@ -8,6 +8,7 @@ import firrtl.options.{Dependency, Phase} /** Run [[AspectPhase]] if a [[chisel3.aop.Aspect]] is present. */ +@deprecated("aspects are being removed in Chisel 7", "6.6.0") class MaybeAspectPhase extends Phase { override def prerequisites = Seq(Dependency[Elaborate])