Merge pull request #1908 from freechipsproject/fix-direct-mem-to-mem-conns

VerilogMemDelays: fix lowering of direct mem-to-mem connections

2 files changed, 56 insertions, 14 deletions

diff --git a/src/main/scala/firrtl/passes/memlib/VerilogMemDelays.scala b/src/main/scala/firrtl/passes/memlib/VerilogMemDelays.scala
index 1cecf543..8fb2dc88 100644
--- a/src/main/scala/firrtl/passes/memlib/VerilogMemDelays.scala
+++ b/src/main/scala/firrtl/passes/memlib/VerilogMemDelays.scala
@@ -110,7 +110,7 @@ class MemDelayAndReadwriteTransformer(m: DefModule) {
 
       val readStmts = (mem.readers ++ mem.readwriters).map {
         case r =>
-          def oldDriver(f: String) = netlist(we(memPortField(mem, r, f)))
+          def oldDriver(f: String) = swapMemRefs(netlist(we(memPortField(mem, r, f))))
           def newField(f:  String) = memPortField(newMem, rMap.getOrElse(r, r), f)
           val clk = oldDriver("clk")
 
@@ -139,7 +139,7 @@ class MemDelayAndReadwriteTransformer(m: DefModule) {
 
       val writeStmts = (mem.writers ++ mem.readwriters).map {
         case w =>
-          def oldDriver(f: String) = netlist(we(memPortField(mem, w, f)))
+          def oldDriver(f: String) = swapMemRefs(netlist(we(memPortField(mem, w, f))))
           def newField(f:  String) = memPortField(newMem, wMap.getOrElse(w, w), f)
           val clk = oldDriver("clk")
 
diff --git a/src/test/scala/firrtlTests/VerilogMemDelaySpec.scala b/src/test/scala/firrtlTests/VerilogMemDelaySpec.scala
index 66b2cf9e..7611dec9 100644
--- a/src/test/scala/firrtlTests/VerilogMemDelaySpec.scala
+++ b/src/test/scala/firrtlTests/VerilogMemDelaySpec.scala
@@ -5,10 +5,19 @@ package firrtlTests
 import firrtl._
 import firrtl.passes.memlib.VerilogMemDelays
 import firrtl.passes.CheckHighForm
+import firrtl.stage.{FirrtlCircuitAnnotation, FirrtlSourceAnnotation, FirrtlStage}
+
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers
 
 class VerilogMemDelaySpec extends AnyFreeSpec with Matchers {
+
+  private def compileTwice(input: String): Unit = {
+    val result1 = (new FirrtlStage).transform(Seq(FirrtlSourceAnnotation(input))).toSeq.collectFirst {
+      case fca: FirrtlCircuitAnnotation => (new FirrtlStage).transform(Seq(fca))
+    }
+  }
+
   "The following low FIRRTL should be parsed by VerilogMemDelays" in {
     val input =
       """
@@ -42,13 +51,7 @@ class VerilogMemDelaySpec extends AnyFreeSpec with Matchers {
         |    m.write.data <= w
       """.stripMargin
 
-    val circuit = Parser.parse(input)
-    val compiler = new LowFirrtlCompiler
-
-    val result = compiler.compile(CircuitState(circuit, ChirrtlForm), Seq.empty)
-    val result2 = VerilogMemDelays.run(result.circuit)
-    CheckHighForm.run(result2)
-    //result.circuit.serialize.length > 0 should be (true)
+    compileTwice(input)
   }
 
   "Using a read-first memory should be allowed in VerilogMemDelays" in {
@@ -92,11 +95,50 @@ class VerilogMemDelaySpec extends AnyFreeSpec with Matchers {
         |    rw_rdata <= m.rw.rdata
       """.stripMargin
 
-    val circuit = Parser.parse(input)
-    val compiler = new LowFirrtlCompiler
+    compileTwice(input)
+  }
+
+  "Chained memories should generate correct FIRRTL" in {
+    val input =
+      """
+        |circuit Test :
+        |  module Test :
+        |    input clock : Clock
+        |    input addr : UInt<5>
+        |    input wdata : UInt<32>
+        |    input wmode : UInt<1>
+        |    output rdata : UInt<32>
+        |    mem m1 :
+        |      data-type => UInt<32>
+        |      depth => 32
+        |      read-latency => 1
+        |      write-latency => 1
+        |      read-under-write => old
+        |      readwriter => rw
+        |    m1.rw.clk <= clock
+        |    m1.rw.en <= UInt<1>(1)
+        |    m1.rw.addr <= addr
+        |    m1.rw.wmode <= wmode
+        |    m1.rw.wmask <= UInt<1>(1)
+        |    m1.rw.wdata <= wdata
+        |
+        |    mem m2 :
+        |      data-type => UInt<32>
+        |      depth => 32
+        |      read-latency => 1
+        |      write-latency => 1
+        |      read-under-write => old
+        |      readwriter => rw
+        |    m2.rw.clk <= clock
+        |    m2.rw.en <= UInt<1>(1)
+        |    m2.rw.addr <= addr
+        |    m2.rw.wmode <= wmode
+        |    m2.rw.wmask <= UInt<1>(1)
+        |    m2.rw.wdata <= m1.rw.rdata
+        |
+        |    rdata <= m2.rw.rdata
+        |""".stripMargin
 
-    val result = compiler.compile(CircuitState(circuit, ChirrtlForm), Seq.empty)
-    val result2 = VerilogMemDelays.run(result.circuit)
-    CheckHighForm.run(result2)
+    compileTwice(input)
   }
 }