wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix another name collision

Browse Source
This commit is contained in:
Edward Wang
2017-07-26 10:34:31 -07:00
committed by edwardcwang
parent 79f73311d8
commit ae139ede44
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
macros/src/test/scala/SimpleSplitDepth.scala
View File

@@ -18,6 +18,7 @@ trait HasSimpleDepthTestGenerator {
def mem_maskGran: Option[Int] = None def mem_maskGran: Option[Int] = None
def lib_maskGran: Option[Int] = None def lib_maskGran: Option[Int] = None
def extraPorts: Seq[mdf.macrolib.MacroExtraPort] = List() def extraPorts: Seq[mdf.macrolib.MacroExtraPort] = List()
def extraTag: String = ""
require (mem_depth >= lib_depth) require (mem_depth >= lib_depth)
@@ -34,9 +35,11 @@ trait HasSimpleDepthTestGenerator {
val memTag = (if (memHasMask) "m" else "") + "rw" + (if (mem_maskGran.nonEmpty) s"_gran${mem_maskGran.get}" else "") val memTag = (if (memHasMask) "m" else "") + "rw" + (if (mem_maskGran.nonEmpty) s"_gran${mem_maskGran.get}" else "")
val libTag = (if (libHasMask) "m" else "") + "rw" + (if (lib_maskGran.nonEmpty) s"_gran${lib_maskGran.get}" else "") val libTag = (if (libHasMask) "m" else "") + "rw" + (if (lib_maskGran.nonEmpty) s"_gran${lib_maskGran.get}" else "")
val mem = s"mem-${mem_depth}x${width}-${memTag}.json" val extraTagPrefixed = if (extraTag == "") "" else ("-" + extraTag)
val lib = s"lib-${lib_depth}x${width}-${libTag}.json"
val v = s"split_depth_${mem_depth}x${width}_${memTag}.v" val mem = s"mem-${mem_depth}x${width}-${memTag}${extraTagPrefixed}.json"
val lib = s"lib-${lib_depth}x${width}-${libTag}${extraTagPrefixed}.json"
val v = s"split_depth_${mem_depth}x${width}_${memTag}${extraTagPrefixed}.v"
val mem_name = "target_memory" val mem_name = "target_memory"
val mem_addr_width = ceilLog2(mem_depth) val mem_addr_width = ceilLog2(mem_depth)
@@ -403,6 +406,7 @@ class SplitDepth2048x8_extraPort extends MacroCompilerSpec with HasSRAMGenerator
override lazy val extraPorts = List( override lazy val extraPorts = List(
MacroExtraPort(name="extra_port", width=8, portType=Constant, value=0xff) MacroExtraPort(name="extra_port", width=8, portType=Constant, value=0xff)
) )
override lazy val extraTag = "extraPort"
val outputCustom = val outputCustom =
""" """