From 227a523c327c63144544312aab01c164a67c2a94 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Wed, 2 May 2018 13:09:53 -0400 Subject: Deprecate old WiringUtils methods/classes (#801) The following are deprecated in favor of DiGraph/InstanceGraph: - firrtl.passes.wiring.Lineage - firrtl.passes.wiring.WiringUtils.ChildrenMap - firrtl.passes.wiring.WiringUtils.getChildrenMap - firrtl.passes.wiring.WiringUtils.getLineage Signed-off-by: Schuyler Eldridge --- src/main/scala/firrtl/passes/wiring/WiringUtils.scala | 4 ++++ src/main/scala/firrtl/transforms/DeadCodeElimination.scala | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/scala/firrtl/passes/wiring/WiringUtils.scala b/src/main/scala/firrtl/passes/wiring/WiringUtils.scala index 117a3824..b89649d3 100644 --- a/src/main/scala/firrtl/passes/wiring/WiringUtils.scala +++ b/src/main/scala/firrtl/passes/wiring/WiringUtils.scala @@ -36,6 +36,7 @@ case class Modifications( /** A lineage tree representing the instance hierarchy in a design */ +@deprecated("Use DiGraph/InstanceGraph", "1.1.1") case class Lineage( name: String, children: Seq[(String, Lineage)] = Seq.empty, @@ -74,11 +75,13 @@ case class Lineage( } object WiringUtils { + @deprecated("Use DiGraph/InstanceGraph", "1.1.1") type ChildrenMap = mutable.HashMap[String, Seq[(String, String)]] /** Given a circuit, returns a map from module name to children * instance/module names */ + @deprecated("Use DiGraph/InstanceGraph", "1.1.1") def getChildrenMap(c: Circuit): ChildrenMap = { val childrenMap = new ChildrenMap() def getChildren(mname: String)(s: Statement): Statement = s match { @@ -99,6 +102,7 @@ object WiringUtils { /** Returns a module's lineage, containing all children lineages as well */ + @deprecated("Use DiGraph/InstanceGraph", "1.1.1") def getLineage(childrenMap: ChildrenMap, module: String): Lineage = Lineage(module, childrenMap(module) map { case (i, m) => (i, getLineage(childrenMap, m)) } ) diff --git a/src/main/scala/firrtl/transforms/DeadCodeElimination.scala b/src/main/scala/firrtl/transforms/DeadCodeElimination.scala index ecfa7393..8a3d0a4f 100644 --- a/src/main/scala/firrtl/transforms/DeadCodeElimination.scala +++ b/src/main/scala/firrtl/transforms/DeadCodeElimination.scala @@ -11,7 +11,6 @@ import firrtl.Mappers._ import firrtl.WrappedExpression._ import firrtl.Utils.{throwInternalError, toWrappedExpression, kind} import firrtl.MemoizedHash._ -import wiring.WiringUtils.getChildrenMap import collection.mutable import java.io.{File, FileWriter} -- cgit v1.2.3