From e3c822709be39090ea9dad74d55239d5fc560d25 Mon Sep 17 00:00:00 2001 From: Albert Magyar Date: Mon, 29 Jul 2019 20:39:07 -0700 Subject: [PATCH] Filter all EmittedAnnotations from JSON emission (#64) * Filter all EmittedAnnotations from JSON emission * Filter more annotations --- tapeout/src/main/scala/transforms/Generate.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tapeout/src/main/scala/transforms/Generate.scala b/tapeout/src/main/scala/transforms/Generate.scala index 32deb203..ce261a31 100644 --- a/tapeout/src/main/scala/transforms/Generate.scala +++ b/tapeout/src/main/scala/transforms/Generate.scala @@ -3,6 +3,7 @@ package barstools.tapeout.transforms import firrtl._ import firrtl.ir._ import firrtl.annotations._ +import firrtl.stage.FirrtlCircuitAnnotation import firrtl.passes.Pass import java.io.File @@ -159,7 +160,8 @@ sealed trait GenerateTopAndHarnessApp extends LazyLogging { this: App => tapeoutOptions.topAnnoOut.foreach { annoFile => val outputFile = new java.io.PrintWriter(annoFile) outputFile.write(JsonProtocol.serialize(x.circuitState.annotations.filter(_ match { - case EmittedVerilogCircuitAnnotation(_) => false + case ea: EmittedAnnotation[_] => false + case fca: FirrtlCircuitAnnotation => false case _ => true }))) outputFile.close() @@ -188,7 +190,8 @@ sealed trait GenerateTopAndHarnessApp extends LazyLogging { this: App => tapeoutOptions.harnessAnnoOut.foreach { annoFile => val outputFile = new java.io.PrintWriter(annoFile) outputFile.write(JsonProtocol.serialize(x.circuitState.annotations.filter(_ match { - case EmittedVerilogCircuitAnnotation(_) => false + case ea: EmittedAnnotation[_] => false + case fca: FirrtlCircuitAnnotation => false case _ => true }))) outputFile.close()