Fix Uniquify bug and improve ReplaceSeqMems transforms (#1855)

* Fix bug in Uniquify clobbering DefInstance types

* Change ReplaceMemTransform to not run Uniquify nor fixups

Use invalidation as mechanism for rerunning resolution passes

3 files changed, 28 insertions, 9 deletions

diff --git a/src/main/scala/firrtl/passes/Uniquify.scala b/src/main/scala/firrtl/passes/Uniquify.scala
index 10198b33..bc48ebbc 100644
--- a/src/main/scala/firrtl/passes/Uniquify.scala
+++ b/src/main/scala/firrtl/passes/Uniquify.scala
@@ -329,7 +329,7 @@ object Uniquify extends Transform with DependencyAPIMigration {
             sinfo = sx.info
             if (nameMap.contains(sx.name)) {
               val node = nameMap(sx.name)
-              val newType = portTypeMap(m.name)
+              val newType = portTypeMap(sx.module)
               (Utils.create_exps(sx.name, sx.tpe).zip(Utils.create_exps(node.name, newType))).foreach {
                 case (from, to) => renames.rename(from.serialize, to.serialize)
               }
diff --git a/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala b/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala
index 79e07640..c88d6ba7 100644
--- a/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala
+++ b/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala
@@ -116,7 +116,10 @@ class ReplSeqMem extends Transform with HasShellOptions with DependencyAPIMigrat
   override def prerequisites = Forms.MidForm
   override def optionalPrerequisites = Seq.empty
   override def optionalPrerequisiteOf = Forms.MidEmitters
-  override def invalidates(a: Transform) = false
+  override def invalidates(a: Transform) = a match {
+    case InferTypes | ResolveKinds | ResolveFlows | LowerTypes => true
+    case _                                                     => false
+  }
 
   val options = Seq(
     new ShellOption[String](
@@ -138,13 +141,7 @@ class ReplSeqMem extends Transform with HasShellOptions with DependencyAPIMigrat
       new ResolveMemoryReference,
       new CreateMemoryAnnotations(inConfigFile),
       new ReplaceMemMacros(outConfigFile),
-      new WiringTransform,
-      new SimpleMidTransform(RemoveEmpty),
-      new SimpleMidTransform(CheckInitialization),
-      new SimpleMidTransform(InferTypes),
-      Uniquify,
-      new SimpleMidTransform(ResolveKinds),
-      new SimpleMidTransform(ResolveFlows)
+      new WiringTransform
     )
 
   def execute(state: CircuitState): CircuitState = {
diff --git a/src/test/scala/firrtlTests/ReplSeqMemTests.scala b/src/test/scala/firrtlTests/ReplSeqMemTests.scala
index 17f4dcfd..13eb63e2 100644
--- a/src/test/scala/firrtlTests/ReplSeqMemTests.scala
+++ b/src/test/scala/firrtlTests/ReplSeqMemTests.scala
@@ -530,4 +530,26 @@ circuit Top :
     }
   }
 
+  "ReplSeqMem" should "not run a buggy Uniquify" in {
+    val input =
+      """circuit test :
+        |  extmodule foo :
+        |    input in : UInt<8>
+        |    output y : UInt<8>
+        |
+        |  module test :
+        |    input in : UInt<8>
+        |    output out : UInt<8>
+        |
+        |    inst f of foo
+        |    node f_in = and(in, UInt(123))
+        |    f.in <= f_in
+        |    out <= f.y""".stripMargin
+    val confLoc = "ReplSeqMemTests.confTEMP"
+    val annos = Seq(ReplSeqMemAnnotation.parse("-c:test:-o:" + confLoc))
+    // Just check that it doesn't crash
+    compileAndEmit(CircuitState(parse(input), ChirrtlForm, annos))
+    (new java.io.File(confLoc)).delete()
+  }
+
 }