Revert "[stevo]: add custom analog annotation" (#21)

* Revert "[stevo]: add custom analog annotation (#20)"

This reverts commit 7ad088503f.

tapeout/src/main/scala/transforms/AnalogAnnotation.scala

@@ -1,81 +0,0 @@
-// See LICENSE for license details
-
-package barstools.tapeout.transforms
-
-import chisel3._
-import chisel3.experimental.ChiselAnnotation
-import chisel3.util._
-import chisel3.testers.BasicTester
-import chisel3.experimental.{Analog, attach}
-import firrtl.ir.{AnalogType, Circuit, DefModule, Expression, HasName, Port, Statement, Type}
-import firrtl.{CircuitForm, CircuitState, LowForm, Transform}
-import firrtl.annotations.{Annotation, ModuleName, Named, ComponentName}
-import firrtl.Mappers._
-
-object AnalogRenamerAnnotation {
-  def apply(target: Named, value: String): Annotation =
-    Annotation(target, classOf[AnalogRenamer], value)
-
-  def unapply(a: Annotation): Option[(ComponentName, String)] = a match {
-    case Annotation(named, t, value) if t == classOf[AnalogRenamer] => named match {
-      case c: ComponentName => Some((c, value))
-      case _ => None
-    }
-    case _ => None
-  }
-}
-
-class AnalogRenamer extends Transform {
-  override def inputForm: CircuitForm  = LowForm
-  override def outputForm: CircuitForm = LowForm
-
-  override def execute(state: CircuitState): CircuitState = {
-    getMyAnnotations(state) match {
-      case Nil => state
-      case annos =>
-        val analogs = annos.collect { case AnalogRenamerAnnotation(ana, name) => (ana, name) }
-        state.copy(circuit = run(state.circuit, analogs))
-    }
-  }
-
-  def run(circuit: Circuit, annos: Seq[(ComponentName, String)]): Circuit = {
-    circuit map walkModule(annos)
-  }
-  def walkModule(annos: Seq[(ComponentName, String)])(m: DefModule): DefModule = {
-    val filteredAnnos = Map(annos.filter(a => a._1.module.name == m.name).map {
-      case (c, s) => c.name.replace(".", "_") -> s
-    }: _*)
-    m map walkStatement(filteredAnnos) map walkPort(filteredAnnos)
-  }
-  def walkStatement(annos: Map[String, String])(s: Statement): Statement = {
-    s map walkExpression(annos)
-  }
-  def walkPort(annos: Map[String, String])(p: Port): Port = {
-    if (annos.contains(p.name)) {
-      updateAnalogVerilog(annos(p.name))(p.tpe)
-    }
-    p
-  }
-  def walkExpression(annos: Map[String, String])(e: Expression): Expression = {
-    e match {
-      case h: HasName =>
-        if (annos.contains(h.name)) e mapType updateAnalogVerilog(annos(h.name))
-      case _ =>
-    }
-    e
-  }
-  def updateAnalogVerilog(value: String)(tpe: Type): Type = {
-    tpe match {
-      case a: AnalogType =>
-        a.verilogTpe = value
-        a
-      case t => t
-    }
-  }
-}
-
-trait AnalogAnnotator { self: Module =>
-  def renameAnalog(component: Analog, value: String): Unit = {
-    annotate(ChiselAnnotation(component, classOf[AnalogRenamer], value))
-  }
-}

tapeout/src/main/scala/transforms/Generate.scala

@@ -110,7 +110,6 @@ sealed trait GenerateTopAndHarnessApp extends App with LazyLogging {
     val post = if (top) { Seq(
       new passes.memlib.InferReadWrite(),
       new passes.memlib.ReplSeqMem(),
-      new AnalogRenamer(),
       new passes.clocklist.ClockListTransform()
     ) } else Seq()
 
@@ -152,28 +151,12 @@ sealed trait GenerateTopAndHarnessApp extends App with LazyLogging {
     Seq(
       new ConvertToExtMod((m) => m.name == synTop.get),
       new RemoveUnusedModules,
-      new RenameModulesAndInstances((m) => AllModules.rename(m)),
-      new AnalogRenamer()
+      new RenameModulesAndInstances((m) => AllModules.rename(m))
     )
   }
 
   // always the same for now
-  private def getSecondPhaseAnnotations: AnnotationMap = {
-    //Load annotations from file
-    val annotationArray = annoFile match {
-      case None => Array[Annotation]()
-      case Some(fileName) => {
-        val annotations = new File(fileName)
-        if(annotations.exists) {
-          val annotationsYaml = io.Source.fromFile(annotations).getLines().mkString("\n").parseYaml
-          annotationsYaml.convertTo[Array[Annotation]]
-        } else {
-          Array[Annotation]()
-        }
-      }
-    }
-    AnnotationMap(annotationArray)
-  }
+  private def getSecondPhaseAnnotations: AnnotationMap = AnnotationMap(Seq.empty)
 
   // Top Generation
   protected def firstPhase(top: Boolean, harness: Boolean): Unit = {