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

Merge pull request #104 from ucb-bar/harness_anno_fix

Browse Source 
Restore proper naming of harness annotation file
This commit is contained in:
John Wright
2021-07-11 18:23:34 -07:00
committed by GitHub
parent ea7663df06 61ab39f829
commit f196c38c7f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tapeout/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala
View File

@@ -16,6 +16,7 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg
val synTop: Option[String] = annotations.collectFirst { case SynTopAnnotation(s) => s } val synTop: Option[String] = annotations.collectFirst { case SynTopAnnotation(s) => s }
val topFir: Option[String] = annotations.collectFirst { case TopFirAnnotation(s) => s } val topFir: Option[String] = annotations.collectFirst { case TopFirAnnotation(s) => s }
val topAnnoOut: Option[String] = annotations.collectFirst { case TopAnnoOutAnnotation(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 } val harnessTop: Option[String] = annotations.collectFirst { case HarnessTopAnnotation(h) => h }
val harnessConf: Option[String] = annotations.collectFirst { case HarnessConfAnnotation(h) => h } val harnessConf: Option[String] = annotations.collectFirst { case HarnessConfAnnotation(h) => h }
val harnessOutput: Option[String] = annotations.collectFirst { case HarnessOutputAnnotation(h) => h } val harnessOutput: Option[String] = annotations.collectFirst { case HarnessOutputAnnotation(h) => h }
@@ -110,7 +111,7 @@ private class GenerateTopAndHarness(annotations: AnnotationSeq) extends LazyLogg
val annos = new FirrtlStage().execute(Array.empty, generatorAnnotations) val annos = new FirrtlStage().execute(Array.empty, generatorAnnotations)
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, harnessAnnoOut)
case _ => case _ =>
throw new Exception(s"executeTop failed while executing FIRRTL!\n") throw new Exception(s"executeTop failed while executing FIRRTL!\n")
} }