From 899387f4fb54279a8d5c0a16e543c2cc6e60f6b8 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Wed, 28 Dec 2022 13:11:18 -0800 Subject: [PATCH] Fix dump to dumpAnnos --- .../tapeout/transforms/GenerateTopAndHarness.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala b/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala index 4df6e799..12c416cf 100644 --- a/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala +++ b/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala @@ -7,7 +7,6 @@ import firrtl.ir._ import firrtl.options.{Dependency, InputAnnotationFileAnnotation, StageMain} import firrtl.passes.memlib.ReplSeqMemAnnotation import firrtl.stage.{FirrtlCircuitAnnotation, FirrtlStage, OutputFileAnnotation, RunFirrtlTransformAnnotation} -import firrtl.passes.{ConvertFixedToSInt} import firrtl.transforms.BlackBoxResourceFileNameAnno import logger.LazyLogging @@ -23,8 +22,8 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg }.toList // Dump firrtl and annotation files - protected def dump( - circuit: Circuit, + // Use global param outAnno + protected def dumpAnnos( annotations: AnnotationSeq ): Unit = { outAnno.foreach { annoPath => @@ -49,7 +48,7 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg annos.collectFirst { case FirrtlCircuitAnnotation(circuit) => circuit } match { case Some(circuit) => - dump(circuit, annos) + dumpAnnos(annos) case _ => throw new Exception(s"executeTop failed while executing FIRRTL!\n") } @@ -73,7 +72,7 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg val annos = new FirrtlStage().execute(Array.empty, generatorAnnotations) annos.collectFirst { case FirrtlCircuitAnnotation(circuit) => circuit } match { case Some(circuit) => - dump(circuit, annos) + dumpAnnos(annos) case _ => throw new Exception(s"executeTop failed while executing FIRRTL!\n") }