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

Fix cost metric for non Compiler libs

Browse Source 
Also a small fix from reviewer
This commit is contained in:
Colin Schmidt
2019-03-17 14:05:51 -07:00
committed by Colin Schmidt
parent 6cdf978a6d
commit 44e97826d4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
macros/src/main/scala/CostMetric.scala
View File

@@ -122,7 +122,16 @@ object DefaultMetric extends CostMetric with CostMetricCompanion {
} }
val depthCost = (mem.src.depth.toDouble / lib.src.depth.toDouble) val depthCost = (mem.src.depth.toDouble / lib.src.depth.toDouble)
val widthCost = (memWidth.toDouble / lib.src.width.toDouble) val widthCost = (memWidth.toDouble / lib.src.width.toDouble)
return Some(depthCost * widthCost) val bitsCost = (lib.src.depth * lib.src.width)
// The most complicated case occurs when you have a 1x1 lib and a 1Mx1M lib and a third sane lib.
// In this case you want to ensure that a lib slightly smaller or larger than mem as the third lib
// will always be selected over the stupid libs.
if(widthCost < 1 && depthCost < 1) Some(bitsCost) // If the lib is bigger than pick the smallest lib
// If its not bigger in both dimensions pick the smallest in the dimension that the lib is larger in
else if(widthCost < 1) Some(depthCost * lib.src.width)
else if(depthCost < 1) Some(widthCost * lib.src.depth)
// If the lib is equal or smaller than source mem pick the largest lib
else Some(depthCost * widthCost)
} }
override def commandLineParams = Map() override def commandLineParams = Map()

1
macros/src/main/scala/MacroCompiler.scala
View File

@@ -569,7 +569,6 @@ class MacroCompilerPass(mems: Option[Seq[Macro]],
val memMask = mem.ports map (_.maskGran) find (_.isDefined) map (_.get) val memMask = mem.ports map (_.maskGran) find (_.isDefined) map (_.get)
val libMask = group.ports map (_.maskGran) find (_.isDefined) map (_.get) val libMask = group.ports map (_.maskGran) find (_.isDefined) map (_.get)
(memMask, libMask) match { (memMask, libMask) match {
case (_, Some(1)) => true
case (None, _) => true case (None, _) => true
case (Some(_), None) => false case (Some(_), None) => false
case (Some(m), Some(l)) => l <= m //Ignore memories that don't have nice mask case (Some(m), Some(l)) => l <= m //Ignore memories that don't have nice mask