Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix TesterDriver.scala regression #1481 #1496

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Fix TesterDriver.scala regression #1481 #1496

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09c95a5
Add missing finishWrapper call in TesterDriver
seldridge Jun 24, 2020
edf911f
Merge branch 'master' into revert-TesterDriver
mergify[bot] Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/chisel3/testers/TesterDriver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object TesterDriver extends BackendCompilationUtilities {
Dependency[Emitter],
Dependency[Convert]))

val annotationsx = pm.transform(ChiselGeneratorAnnotation(t) +: annotations)
val annotationsx = pm.transform(ChiselGeneratorAnnotation(finishWrapper(t)) +: annotations)

val target: String = annotationsx.collectFirst { case FirrtlCircuitAnnotation(cir) => cir.main }.get
val path = annotationsx.collectFirst { case TargetDirAnnotation(dir) => dir }.map(new File(_)).get
Expand Down