[FIRRTL] Put layer collateral in testbench dir #6741
Conversation
| prefix + "\n" + | ||
| "`define " + prefix) | ||
| ->setAttr("output_file", outputFileAttr); | ||
| setOutputFile(builder.create<sv::VerbatimOp>( |
There was a problem hiding this comment.
Please consider using the emit::File and emit::Verbatim operations, they are active & supported.
There was a problem hiding this comment.
I can switch over to these now that they are available. Thanks!
There was a problem hiding this comment.
I'd like to handle this in a cleanup pass if that's alright.
|
Does thin mean we cannot use layers for non-testbench parts at least until it's replaced with.a better ABI? Not having any actual use case for non-testbench but just curios. |
seldridge
force-pushed
the
dev/seldridge/lower-layers-directories
branch
2 times, most recently
from
effbce8 to
31ab823
Compare
seldridge
force-pushed
the
dev/seldridge/lower-layers-directories
branch
from
31ab823 to
4ae9ac5
Compare
| continue; | ||
| auto dir = anno.getMember<StringAttr>("dirname"); | ||
| assert(dir && "invalid test bench annotation"); | ||
| testBenchDir = dir.getValue(); |
There was a problem hiding this comment.
Last annotation wins works for me.
There was a problem hiding this comment.
There's a bunch of scattered opinion on this type of thing throughout the passes. There is a stalled effort on making the annotations more first-class. The incompletely rolled out stop-gap is to have dedicated annotation "extractors" which get the information out of a might-exist annotation, while also checking that the annotation is correct. Cf.
There's a missing function/piece of infrastructure that you tell it what you want to pull out of an array of annotations and it does it and the validation.
All that said, moving towards first-class support where the annotations are actually validated in IR and not when used is much better.
|
I'll let CI pass, then rebase and land. |
Fix a bug in LowerToHW where a '#hw.output_file' would be incorrectly set on a module that already has one. This could result in behavior where an earlier pass sets up an output structure which is then changed by LowerToHW due to the location of the module in the instance graph. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Change LowerToHW to not count bound instances as being under the DUT. This is done as a stopgap measure to align FIRRTL layers with the existing, legacy directory structure that CIRCT uses when provided with both a MarkDUTAnnotation and a TestBenchDirAnnotation. Namely, anything instantiated by the DUT is put in the default output directory and anything instantiated only by other users (Grand Central, Test Harness, etc.) is allowed to move into one of the directories that those other users handle. With this change, this will no longer cause layer-derived modules or modules instantiated under layers exclusively to be moved into the main output directory. This is intended to be replaced with filelists/manifests where the build system driving CIRCT is responsible for moving things into separate directories after CIRCT finishes. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Change the LowerLayers pass to put generated modules inside the testbench directory if one is specified and a DUT is present. This is a stopgap measure that keeps layers aligned with existing CIRCT compilation of FIRRTL. This is intended to be replaced with a better FIRRTL ABI based on filelists in the future. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Fix a bug involving interactions of Grand Central and layers output directories. When compiling a design that has a DUT and a testbench directory, treat modules that are instantiated by Grand Central and under a bound module (which is lowered from a layer) as belonging to Grand Central and should be placed in its output directory. This will be revisited in the future as the FIRRTL ABI moves more towards filelists or manifests. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
seldridge
force-pushed
the
dev/seldridge/lower-layers-directories
branch
from
fb80c1b to
679737a
Compare
Change the LowerLayers pass to put generated modules inside the testbench directory if one is specified and a DUT is present. This is a stopgap measure that keeps layers aligned with existing CIRCT compilation of FIRRTL. This is intended to be replaced with a better FIRRTL ABI based on filelists in the future.
This is currently missing handling of instances instantiated by the layer. Those need to also get moved to the testbench area. I'll mark this non-draft once it's fully working.