From 82636b3ff43ecf6a0f0a7d46ebc2456b31e9703f Mon Sep 17 00:00:00 2001
From: John Wright <johnwright@eecs.berkeley.edu>
Date: Tue, 5 Mar 2019 15:01:44 -0800
Subject: [PATCH] Upstream MemConf and use it (with some slight tweaks)

---
 macros/src/main/scala/MemConf.scala | 59 -----------------------------
 macros/src/main/scala/Utils.scala   |  4 +-
 mdf                                 |  2 +-
 3 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 macros/src/main/scala/MemConf.scala

diff --git a/macros/src/main/scala/MemConf.scala b/macros/src/main/scala/MemConf.scala
deleted file mode 100644
index 0d13c5a8..00000000
--- a/macros/src/main/scala/MemConf.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-// See LICENSE for license details.
-
-package barstools.macros
-
-import scala.util.matching._
-
-sealed abstract class MemPort(val name: String) { override def toString = name }
-
-case object ReadPort extends MemPort("read")
-case object WritePort extends MemPort("write")
-case object MaskedWritePort extends MemPort("mwrite")
-case object ReadWritePort extends MemPort("rw")
-case object MaskedReadWritePort extends MemPort("mrw")
-
-object MemPort {
-
-  val all = Set(ReadPort, WritePort, MaskedWritePort, ReadWritePort, MaskedReadWritePort)
-
-  def apply(s: String): Option[MemPort] = MemPort.all.find(_.name == s)
-
-  def fromString(s: String): Seq[MemPort] = {
-    s.split(",").toSeq.map(MemPort.apply).map(_ match {
-      case Some(x) => x
-      case _ => throw new Exception(s"Error parsing MemPort string : ${s}")
-    })
-  }
-}
-
-// This is based on firrtl.passes.memlib.ConfWriter
-// TODO standardize this in FIRRTL
-case class MemConf(
-  name: String,
-  depth: BigInt,
-  width: Int,
-  ports: Seq[MemPort],
-  maskGranularity: Option[Int]
-) {
-
-  private def portsStr = ports.map(_.name).mkString(",")
-  private def maskGranStr = maskGranularity.map((p) => s"mask_gran $p").getOrElse("")
-
-  override def toString() = s"name ${name} depth ${depth} width ${width} ports ${portsStr} ${maskGranStr} "
-}
-
-object MemConf {
-
-  val regex = raw"\s*name\s+(\w+)\s+depth\s+(\d+)\s+width\s+(\d+)\s+ports\s+([^\s]+)\s+(?:mask_gran\s+(\d+))?\s*".r
-
-  def fromString(s: String): Seq[MemConf] = {
-    if (s.isEmpty) {
-      Seq[MemConf]()
-    } else {
-      s.split("\n").toSeq.map(_ match {
-        case MemConf.regex(name, depth, width, ports, maskGran) => MemConf(name, BigInt(depth), width.toInt, MemPort.fromString(ports), Option(maskGran).map(_.toInt))
-        case _ => throw new Exception(s"Error parsing MemConf string : ${s}")
-      })
-    }
-  }
-}
diff --git a/macros/src/main/scala/Utils.scala b/macros/src/main/scala/Utils.scala
index ad19c917..ba8c664d 100644
--- a/macros/src/main/scala/Utils.scala
+++ b/macros/src/main/scala/Utils.scala
@@ -5,6 +5,7 @@ package barstools.macros
 import firrtl._
 import firrtl.ir._
 import firrtl.PrimOps
+import firrtl.passes.memlib.{MemConf, MemPort, ReadPort, WritePort, ReadWritePort, MaskedWritePort, MaskedReadWritePort}
 import firrtl.Utils.{ceilLog2, BoolType}
 import mdf.macrolib.{Constant, MacroPort, SRAMMacro}
 import mdf.macrolib.{PolarizedPort, PortPolarity, ActiveLow, ActiveHigh, NegativeEdge, PositiveEdge, MacroExtraPort}
@@ -78,7 +79,8 @@ object Utils {
   }
   def readConfFromString(str: String): Seq[mdf.macrolib.Macro] = {
     MemConf.fromString(str).map { m:MemConf =>
-      SRAMMacro(m.name, m.width, m.depth, Utils.portSpecToFamily(m.ports), Utils.portSpecToMacroPort(m.width, m.depth, m.maskGranularity, m.ports))
+      val ports = m.ports.map { case (port, num) => Seq.fill(num)(port) } reduce (_ ++ _)
+      SRAMMacro(m.name, m.width, m.depth, Utils.portSpecToFamily(ports), Utils.portSpecToMacroPort(m.width, m.depth, m.maskGranularity, ports))
     }
   }
   def portSpecToFamily(ports: Seq[MemPort]): String = {
diff --git a/mdf b/mdf
index c8478e74..515dda51 160000
--- a/mdf
+++ b/mdf
@@ -1 +1 @@
-Subproject commit c8478e74a2a2aed66e8ac3207174d4142f1a45e1
+Subproject commit 515dda51206eb40bcbe902700abc8ca36b141c0d