[FIRRTL][CheckCombLoops] Support property types #5383
Merged
+19
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
youngar
force-pushed
the
firrtl-prop-combloop
branch
from
57551da
to
faeb5de
Compare
dtzSiFive
approved these changes
Jun 13, 2023
| @@ -248,12 +248,12 @@ class DiscoverLoops { | |||
| void preprocess(SmallVector<Value> &worklist) { | |||
| // All the input ports are added to the worklist. | |||
| for (BlockArgument arg : module.getArguments()) { | |||
| auto argType = arg.getType(); | |||
| auto argType = cast<FIRRTLType>(arg.getType()); | |||
There was a problem hiding this comment.
I think BlockArguments / module ports can be non-FIRRTLType's, ports and wires can be foreign I believe.
Curious how/why this is safe, but see that it previously already made this assumption so maybe nevermind 👍 .
There was a problem hiding this comment.
Yeah, it does not look like this code works with foreign types.
| @@ -248,12 +248,12 @@ class DiscoverLoops { | |||
| void preprocess(SmallVector<Value> &worklist) { | |||
| // All the input ports are added to the worklist. | |||
| for (BlockArgument arg : module.getArguments()) { | |||
| auto argType = arg.getType(); | |||
| auto argType = cast<FIRRTLType>(arg.getType()); | |||
| if (argType.isa<RefType>()) | |||
| continue; | |||
There was a problem hiding this comment.
Note to self: follow-up to get this working through references (cc #4691), thanks for getting this working for non-base types!
mikeurbach
approved these changes
Jun 13, 2023
lib/Dialect/FIRRTL/FIRRTLTypes.cpp
Outdated
| @@ -493,7 +493,7 @@ bool FIRRTLType::isGround() { | |||
| .Case<BundleType, FVectorType, FEnumType, OpenBundleType, OpenVectorType>( | |||
| [](Type) { return false; }) | |||
| // Not ground per spec, but leaf of aggregate. | |||
| .Case<RefType>([](Type) { return false; }) | |||
| .Case<StringType, RefType>([](Type) { return false; }) | |||
There was a problem hiding this comment.
Could this just be PropertyType?
This change adds support for property types. Right now property types show up as regular ports on instances and modules, and are assigned the through the PropAssignOp, which implements the ConnectLike interface. Module ports, instance ports, and connect like operations had to be updated to support FIRRTLTypes instead of just FIRRTLBaseTypes.
youngar
force-pushed
the
firrtl-prop-combloop
branch
from
faeb5de
to
dcbd410
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change adds support for property types to CheckCombLoops. Right now property types show up as regular ports on instances and modules, and are assigned the through the PropAssignOp, which implements the ConnectLike interface. Module ports, instance ports, and connect like operations had to be updated to support FIRRTLTypes instead of just FIRRTLBaseTypes.