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

Merge pull request #105 from ucb-bar/fix_reparent_circuit

Browse Source 
Fix InstanceTarget annotations in ReParentCircuit
This commit is contained in:
John Wright
2021-07-20 12:33:18 -07:00
committed by GitHub
parent 731a529193 53a2d698e5
commit 09719205cf
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala
View File

@@ -7,6 +7,7 @@ import firrtl.annotations._
import firrtl.options.Dependency
import firrtl.stage.Forms
import firrtl.stage.TransformManager.TransformDependency
import firrtl.annotations.TargetToken.{Instance, OfModule}
case class ReParentCircuitAnnotation(target: ModuleTarget) extends SingleTargetAnnotation[ModuleTarget] {
def duplicate(n: ModuleTarget) = this.copy(n)
@@ -32,6 +33,35 @@ class ReParentCircuit extends Transform with DependencyAPIMigration {
rmap.record(CircuitTarget(c.main), CircuitTarget(s))
rmap
}
state.copy(circuit = newCircuit, renames = mainRename)
val newAnnotations = newTopName.map({ topName =>
// Update InstanceTargets and ReferenceTargets
// Yes, these are identical functions, but the copy methods force separate implementations
def updateInstance(t: InstanceTarget): Option[InstanceTarget] = {
val idx = t.path.lastIndexWhere(_._2.value == topName)
if (idx == -1) Some(t.copy(circuit=topName)) else Some(t.copy(circuit=topName, module=topName, path=t.path.drop(idx+1)))
}
def updateReference(t: ReferenceTarget): Option[ReferenceTarget] = {
val idx = t.path.lastIndexWhere(_._2.value == topName)
if (idx == -1) Some(t.copy(circuit=topName)) else Some(t.copy(circuit=topName, module=topName, path=t.path.drop(idx+1)))
}
AnnotationSeq(state.annotations.toSeq.map({
case x: SingleTargetAnnotation[InstanceTarget] if x.target.isInstanceOf[InstanceTarget] =>
updateInstance(x.target).map(y => x.duplicate(y))
case x: SingleTargetAnnotation[ReferenceTarget] if x.target.isInstanceOf[ReferenceTarget] =>
updateReference(x.target).map(y => x.duplicate(y))
case x: MultiTargetAnnotation =>
val newTargets: Seq[Seq[Option[Target]]] = x.targets.map(_.map({
case y: InstanceTarget => updateInstance(y)
case y: ReferenceTarget => updateReference(y)
case y => Some(y)
}))
if (newTargets.flatten.forall(_.isDefined)) Some(x.duplicate(newTargets.map(_.map(_.get)))) else None
case x => Some(x)
}).filter(_.isDefined).map(_.get))
}).getOrElse(state.annotations)
state.copy(circuit = newCircuit, renames = mainRename, annotations = newAnnotations)
}
}