From 85baeda249e59c7d9d9f159aaf29ff46d685cf02 Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Mon, 17 Oct 2016 18:53:19 -0700
Subject: Reorganized memory blackboxing (#336)

* Reorganized memory blackboxing

Moved to new package memlib
Added comments
Moved utility functions around
Removed unused AnnotateValidMemConfigs.scala

* Fixed tests to pass

* Use DefAnnotatedMemory instead of AppendableInfo

* Broke passes up into simpler passes

AnnotateMemMacros ->
  (ToMemIR, ResolveMaskGranularity)
UpdateDuplicateMemMacros ->
  (RenameAnnotatedMemoryPorts, ResolveMemoryReference)

* Fixed to make tests run

* Minor changes from code review

* Removed vim comments and renamed ReplSeqMem
---
 src/test/scala/firrtlTests/ReplSeqMemTests.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/test')

diff --git a/src/test/scala/firrtlTests/ReplSeqMemTests.scala b/src/test/scala/firrtlTests/ReplSeqMemTests.scala
index 8aeafc9e..277623cf 100644
--- a/src/test/scala/firrtlTests/ReplSeqMemTests.scala
+++ b/src/test/scala/firrtlTests/ReplSeqMemTests.scala
@@ -2,6 +2,7 @@ package firrtlTests
 
 import firrtl._
 import firrtl.passes._
+import firrtl.passes.memlib._
 import Annotations._
 
 class ReplSeqMemSpec extends SimpleTransformSpec {
@@ -13,7 +14,7 @@ class ReplSeqMemSpec extends SimpleTransformSpec {
     new ResolveAndCheck(),
     new HighFirrtlToMiddleFirrtl(),
     new passes.InferReadWrite(TransID(-1)),
-    new passes.ReplSeqMem(TransID(-2)),
+    new passes.memlib.ReplSeqMem(TransID(-2)),
     new MiddleFirrtlToLowFirrtl(),
     (new Transform with SimpleRun {
      def execute(c: ir.Circuit, a: AnnotationMap) = run(c, passSeq) } ),
@@ -107,7 +108,7 @@ circuit Top :
       val circuit = InferTypes.run(ToWorkingIR.run(parse(input)))
       val m = circuit.modules.head.asInstanceOf[ir.Module]
       val connects = AnalysisUtils.getConnects(m)
-      val calculatedOrigin = AnalysisUtils.getConnectOrigin(connects)("f").serialize 
+      val calculatedOrigin = AnalysisUtils.getOrigin(connects, "f").serialize 
       require(calculatedOrigin == origin, s"getConnectOrigin returns incorrect origin $calculatedOrigin !")
     }
 
-- 
cgit v1.2.3