riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

diplomacy: evaluate ResourceBindings only once

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-03-03 02:04:17 -08:00
parent 8e4f348dda
commit 0178248551
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/diplomacy/Resources.scala
View File

@ -126,9 +126,9 @@ trait BindingScope
protected[diplomacy] var resourceBindings: Seq[(Resource, Option[Device], ResourceValue)] = Nil protected[diplomacy] var resourceBindings: Seq[(Resource, Option[Device], ResourceValue)] = Nil
private case class ExpandedValue(path: Seq[String], labels: Seq[String], value: Seq[ResourceValue]) private case class ExpandedValue(path: Seq[String], labels: Seq[String], value: Seq[ResourceValue])
private def eval() { private lazy val eval: Unit = {
require (LazyModule.stack.isEmpty, "May not evaluate binding while still constructing LazyModules") require (LazyModule.stack.isEmpty, "May not evaluate binding while still constructing LazyModules")
parentScope.foreach { _.eval() } parentScope.foreach { _.eval }
resourceBindings = parentScope.map(_.resourceBindings).getOrElse(Nil) resourceBindings = parentScope.map(_.resourceBindings).getOrElse(Nil)
BindingScope.active = Some(this) BindingScope.active = Some(this)
resourceBindingFns.reverse.foreach { _() } resourceBindingFns.reverse.foreach { _() }
@ -142,7 +142,6 @@ trait BindingScope
val labels = values_p.flatMap(_.labels) val labels = values_p.flatMap(_.labels)
val keys = keys_p.groupBy(_.path.head).toList.map { case (key, seq) => val keys = keys_p.groupBy(_.path.head).toList.map { case (key, seq) =>
(key -> makeTree(seq.map { x => x.copy(path = x.path.tail) })) (key -> makeTree(seq.map { x => x.copy(path = x.path.tail) }))
// case ExpandedValue(keys, values) => ExpandedValue(keys.tail, values) }))
} }
if (keys.isEmpty) values else ResourceMap(SortedMap(keys:_*), labels) +: values if (keys.isEmpty) values else ResourceMap(SortedMap(keys:_*), labels) +: values
} }
@ -158,7 +157,7 @@ trait BindingScope
} }
def bindingTree: ResourceMap = { def bindingTree: ResourceMap = {
eval() eval
val map: Map[Device, ResourceBindings] = val map: Map[Device, ResourceBindings] =
resourceBindings.reverse.groupBy(_._1.owner).mapValues(seq => ResourceBindings( resourceBindings.reverse.groupBy(_._1.owner).mapValues(seq => ResourceBindings(
seq.groupBy(_._1.key).mapValues(_.map(z => Binding(z._2, z._3))))) seq.groupBy(_._1.key).mapValues(_.map(z => Binding(z._2, z._3)))))