diplomacy: base instance names on ValName and module names on className

src/main/scala/diplomacy/LazyModule.scala

@@ -25,50 +25,30 @@ abstract class LazyModule()(implicit val p: Parameters)
   parent.foreach(p => p.children = this :: p.children)
 
   // suggestedName accumulates Some(names), taking the final one. Nones are ignored.
-  private var suggestedName: Option[String] = None
+  private var suggestedNameVar: Option[String] = None
   def suggestName(x: String): this.type = suggestName(Some(x))
   def suggestName(x: Option[String]): this.type = {
-    x.foreach { n => suggestedName = Some(n) }
+    x.foreach { n => suggestedNameVar = Some(n) }
     this
   }
 
-  private lazy val childNames =
-    getClass.getMethods.filter { m =>
-      m.getParameterTypes.isEmpty &&
-      !java.lang.reflect.Modifier.isStatic(m.getModifiers) &&
-      m.getName != "children" &&
-      m.getName != "getChildren"
-    }.flatMap { m =>
-      if (classOf[LazyModule].isAssignableFrom(m.getReturnType)) {
-        val obj = m.invoke(this)
-        if (obj eq null) Seq() else Seq((m.getName, obj))
-      } else if (classOf[Seq[LazyModule]].isAssignableFrom(m.getReturnType)) {
-        val obj = m.invoke(this)
-        if (obj eq null) Seq() else {
-          val seq = try { obj.asInstanceOf[Seq[Object]] } catch { case _: Throwable => null }
-          if (seq eq null) Seq() else {
-            seq.zipWithIndex.map { case (l, i) => (m.getName + "_"  + i, l) }
-          }
-        }
-      } else Seq()
-    }
-  private def findValName =
-    parent.flatMap(_.childNames.find(_._2 eq this)).map(_._1)
-
   private def findClassName(c: Class[_]): String = {
     val n = c.getName.split('.').last
     if (n.contains('$')) findClassName(c.getSuperclass) else n
   }
 
   lazy val className = findClassName(getClass)
-  lazy val valName = suggestedName.orElse(findValName)
+  lazy val suggestedName = suggestedNameVar.getOrElse(className)
-  lazy val outerName = if (nodes.size != 1) None else nodes(0).gco.flatMap(_.lazyModule.valName)
+  lazy val desiredName = className // + hashcode?
 
-  def moduleName = className + valName.orElse(outerName).map("_" + _).getOrElse("")
+  def name = suggestedName // className + suggestedName ++ hashcode ?
-  def instanceName = valName.getOrElse(outerName.map(_ + "_").getOrElse("") + className)
-  def name = valName.getOrElse(className)
   def line = sourceLine(info)
 
+  // Accessing these names can only be done after circuit elaboration!
+  lazy val moduleName = module.name // The final Verilog Module name
+  lazy val pathName = module.pathName
+  lazy val instanceName = pathName.split('.').last // The final Verilog instance name
+
   def instantiate() { } // a hook for running things in module scope (after children exist, but before dangles+auto exists)
   def module: LazyModuleImpLike
 
@@ -149,6 +129,7 @@ object LazyModule
     require (scope.get eq bc, s"LazyModule() applied to ${bc.name} before ${scope.get.name} ${sourceLine(sourceInfo)}")
     scope = bc.parent
     bc.info = sourceInfo
+    if (!bc.suggestedNameVar.isDefined) bc.suggestName(valName.name)
     bc
   }
 }
@@ -162,8 +143,8 @@ sealed trait LazyModuleImpLike extends BaseModule
   // .module had better not be accessed while LazyModules are still being built!
   require (!LazyModule.scope.isDefined, s"${wrapper.name}.module was constructed before LazyModule() was run on ${LazyModule.scope.get.name}")
 
-  override def desiredName = wrapper.moduleName
+  override def desiredName = wrapper.desiredName
-  suggestName(wrapper.instanceName)
+  suggestName(wrapper.suggestedName)
 
   implicit val p = wrapper.p
 
@@ -186,7 +167,7 @@ sealed trait LazyModuleImpLike extends BaseModule
     val auto = IO(new AutoBundle(forward.map { d => (d.name, d.data, d.flipped) }:_*))
     val dangles = (forward zip auto.elements) map { case (d, (_, io)) =>
       if (d.flipped) { d.data <> io } else { io <> d.data }
-      d.copy(data = io, name = wrapper.valName.getOrElse("anon") + "_" + d.name)
+      d.copy(data = io, name = wrapper.suggestedName + "_" + d.name)
     }
     wrapper.instantiate()
     (auto, dangles)

src/main/scala/diplomacy/Nodes.scala

@@ -32,7 +32,6 @@ trait InwardNodeImp[DI, UI, EI, BI <: Data]
 
   // optional methods to track node graph
   def mixI(pu: UI, node: InwardNode[DI, UI, BI]): UI = pu // insert node into parameters
-  def getO(pu: UI): Option[BaseNode] = None // most-outward common node
 }
 
 // DO = Downwards flowing Parameters generated by the outer side of the node
@@ -91,8 +90,6 @@ abstract class BaseNode(implicit val valName: ValName)
     if (name.isEmpty) "" else name + "_"
   }
 
-  protected[diplomacy] def gci: Option[BaseNode] // greatest common inner
-  protected[diplomacy] def gco: Option[BaseNode] // greatest common outer
   def inputs:  Seq[(BaseNode, RenderedEdge)]
   def outputs: Seq[(BaseNode, RenderedEdge)]
 
@@ -322,9 +319,6 @@ sealed abstract class MixedNode[DI, UI, EI, BI <: Data, DO, UO, EO, BO <: Data](
     }
   }
 
-  protected[diplomacy] def gco = if (uiParams.size != 1) None else inner.getO(uiParams(0))
-  protected[diplomacy] def gci = if (doParams.size != 1) None else outer.getI(doParams(0))
-
   protected[diplomacy] lazy val edgesOut = (oPorts zip doParams).map { case ((i, n, p, s), o) => outer.edgeO(o, n.uiParams(i), p, s) }
   protected[diplomacy] lazy val edgesIn  = (iPorts zip uiParams).map { case ((o, n, p, s), i) => inner.edgeI(n.doParams(o), i, p, s) }
 

src/main/scala/tilelink/Nodes.scala

@@ -30,18 +30,6 @@ object TLImp extends NodeImp[TLClientPortParameters, TLManagerPortParameters, TL
     pd.copy(clients  = pd.clients.map  { c => c.copy (nodePath = node +: c.nodePath) })
   override def mixI(pu: TLManagerPortParameters, node: InwardNode[TLClientPortParameters, TLManagerPortParameters, TLBundle]): TLManagerPortParameters =
     pu.copy(managers = pu.managers.map { m => m.copy (nodePath = node +: m.nodePath) })
-  override def getO(pu: TLManagerPortParameters): Option[BaseNode] = {
-    val head = pu.managers.map(_.nodePath.headOption)
-    if (head.exists(!_.isDefined) || head.map(_.get).distinct.size != 1) {
-      None
-    } else {
-      val subproblem = pu.copy(managers = pu.managers.map(m => m.copy(nodePath = m.nodePath.tail)))
-      getO(subproblem) match {
-        case Some(x) => Some(x)
-        case None => Some(head(0).get)
-      }
-    }
-  }
 }
 
 case class TLClientNode(portParams: Seq[TLClientPortParameters])(implicit valName: ValName) extends SourceNode(TLImp)(portParams)