[FIRRTL] Use symbols in ResolveTraces verbatims #5752
Conversation
seldridge
force-pushed
the
dev/seldridge/fix-resolve-traces
branch
from
f8f1acb
to
ddfa83b
Compare
|
CC: @sequencer: Without this, on CIRCT 1.48 or earlier, you could get incorrect names (e.g., colliding names and some names that are wrong in Chisel tests). Without this, on CIRCT top-of-tree, you can get totally wrong names that point to nothing in the design. 😬 This will be in CIRCT 1.49 (probably next week). |
|
Thanks for mention! I'll bump to 1.49 when it comes. |
seldridge
force-pushed
the
dev/seldridge/fix-resolve-traces
branch
from
ddfa83b
to
1c63a13
Compare
Add unused "<<" operators for AnnoPathValue, OpAnnoTarget, PortAnnoTarget, and AnnoTarget. These facilitate debugging in FIRRTL passes. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Change the ResolveTraces pass to use symbols instead of hard-coded names. Previously, the pass used hard-coded names derived from the hierpath op symbols (which was mega-jank! I'm sorry!). Correct all this by using symbols with substitutions. Update the end-to-end test to use a test case which uncovered this error (because it uses an instance path). Update the pass unit tests to use the new format. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
seldridge
force-pushed
the
dev/seldridge/fix-resolve-traces
branch
from
1c63a13
to
6f9c745
Compare
| newTarget.append(">"); | ||
| auto innerSym = | ||
| TypeSwitch<AnnoTarget, hw::InnerSymAttr>(path.ref) | ||
| .Case<PortAnnoTarget>([&](PortAnnoTarget portTarget) { |
There was a problem hiding this comment.
Is it known/required these already have inner symbols on them? (I'm guessing "yes")?
(and is this why not using, e.g., AnnoTarget::getInnerSym?)
|
|
||
| auto type = dyn_cast<FIRRTLBaseType>(path.ref.getType()); | ||
| assert(type && "expected a FIRRTLBaseType"); | ||
| auto targetFieldID = path.fieldIdx; |
There was a problem hiding this comment.
Note-to-self: Revisit this to actually put the symbol on the target wanting to be tracked (+field-id), instead of on root + generating indexing suffix that we hope will be valid (we do this elsewhere).
This is the sort of thing we do presently, until ... well pipeline is fixed to handle all of this.
| hw::HierPathOp path = nlaTable->getNLA(nla.getAttr()); | ||
| for (auto part : path.getNamepath().getValue().drop_back()) { | ||
| auto inst = cast<hw::InnerRefAttr>(part); | ||
| instances.push_back(dyn_cast<InstanceOp>( |
There was a problem hiding this comment.
Ah, need to make it easier to use IRN -- 100% should be easy to ask for resolution of an inner ref. Anyway, thanks for working through the current situation (including re:other comments).
|
@dtzSiFive comments addressed in: f69e974 Thanks! |
Change the ResolveTraces pass to use symbols instead of hard-coded names. Previously, the pass used hard-coded names derived from the hierpath op symbols (which was mega-jank! I'm sorry!). Correct all this by using symbols with substitutions.
Update the end-to-end test to use a test case which uncovered this error (because it uses an instance path). Update the pass unit tests to use the new format.