Get topAnnos into the mix
This commit is contained in:
@@ -27,12 +27,6 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg
|
|||||||
case _ => None
|
case _ => None
|
||||||
}.toList
|
}.toList
|
||||||
|
|
||||||
// order is determined by DependencyAPIMigration
|
|
||||||
val topTransforms = Seq(
|
|
||||||
new ReParentCircuit,
|
|
||||||
new RemoveUnusedModules
|
|
||||||
)
|
|
||||||
|
|
||||||
lazy val rootCircuitTarget = CircuitTarget(harnessTop.get)
|
lazy val rootCircuitTarget = CircuitTarget(harnessTop.get)
|
||||||
|
|
||||||
val topAnnos = synTop.map(st => ReParentCircuitAnnotation(rootCircuitTarget.module(st))) ++
|
val topAnnos = synTop.map(st => ReParentCircuitAnnotation(rootCircuitTarget.module(st))) ++
|
||||||
@@ -65,10 +59,14 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg
|
|||||||
|
|
||||||
// Top Generation
|
// Top Generation
|
||||||
def executeTop(): Seq[ExtModule] = {
|
def executeTop(): Seq[ExtModule] = {
|
||||||
val annos = new FirrtlStage().execute(Array.empty, annotations ++ Seq(
|
val annos = new FirrtlStage().execute(
|
||||||
RunFirrtlTransformAnnotation(Dependency[ReParentCircuit]),
|
Array.empty,
|
||||||
RunFirrtlTransformAnnotation(Dependency[RemoveUnusedModules])
|
annotations ++ Seq(
|
||||||
))
|
RunFirrtlTransformAnnotation(Dependency[ReParentCircuit]),
|
||||||
|
RunFirrtlTransformAnnotation(Dependency[RemoveUnusedModules])
|
||||||
|
) ++
|
||||||
|
topAnnos
|
||||||
|
)
|
||||||
annos.collectFirst { case FirrtlCircuitAnnotation(circuit) => circuit } match {
|
annos.collectFirst { case FirrtlCircuitAnnotation(circuit) => circuit } match {
|
||||||
case Some(circuit) =>
|
case Some(circuit) =>
|
||||||
dump(circuit, annos, topFir, topAnnoOut)
|
dump(circuit, annos, topFir, topAnnoOut)
|
||||||
|
|||||||
Reference in New Issue
Block a user