Merge pull request #106 from ucb-bar/fix_harness_fir

Fix harness .fir file output location
This commit is contained in:
John Wright
2021-07-20 14:08:38 -07:00
committed by GitHub

View File

@@ -15,6 +15,7 @@ import logger.LazyLogging
private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogging {
val synTop: Option[String] = annotations.collectFirst { case SynTopAnnotation(s) => s }
val topFir: Option[String] = annotations.collectFirst { case TopFirAnnotation(s) => s }
val harnessFir: Option[String] = annotations.collectFirst { case HarnessFirAnnotation(s) => s }
val topAnnoOut: Option[String] = annotations.collectFirst { case TopAnnoOutAnnotation(s) => s }
val harnessAnnoOut: Option[String] = annotations.collectFirst { case HarnessAnnoOutAnnotation(s) => s }
val harnessTop: Option[String] = annotations.collectFirst { case HarnessTopAnnotation(h) => h }
@@ -111,7 +112,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, topFir, harnessAnnoOut)
dump(circuit, annos, harnessFir, harnessAnnoOut)
case _ =>
throw new Exception(s"executeTop failed while executing FIRRTL!\n")
}