riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

diplomacy: take names from the outermost common node

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-10-14 16:32:39 -07:00 committed by mwachs5
parent fee67c4abf
commit a807c922d0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/diplomacy/LazyModule.scala
View File

@ -25,9 +25,10 @@ abstract class LazyModule
(m.invoke(p) eq this) (m.invoke(p) eq this)
}.headOption.map(_.getName) }.headOption.map(_.getName)
} }
lazy val outerName = if (nodes.size != 1) None else nodes(0).gco.flatMap(_.lazyModule.valName)
def moduleName = className + valName.map("_" + _).getOrElse("") def moduleName = className + valName.orElse(outerName).map("_" + _).getOrElse("")
def instanceName = valName.getOrElse(className) def instanceName = valName.orElse(outerName).map(_ + "_").getOrElse("") + className
def name = valName.getOrElse(className) def name = valName.getOrElse(className)
def line = sourceLine(info) def line = sourceLine(info)