Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[Arc] Infer StateOp reset from CompReg #4997

Merged
merged 10 commits into from
Apr 14, 2023
Merged

[Arc] Infer StateOp reset from CompReg #4997

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78bdeb0
Copy reset from CompReg to StateOp (reset currently unchecked)
TaoBi22 Apr 11, 2023
b52305b
Add checks that the reset value is valid
TaoBi22 Apr 11, 2023
08ca1c3
Update comments
TaoBi22 Apr 11, 2023
c31be99
clang-format
TaoBi22 Apr 11, 2023
dbd7031
Update to error on reset inference when StateOp already has a reset
TaoBi22 Apr 12, 2023
fda7273
Fix non-trivial reset assignment
TaoBi22 Apr 12, 2023
0f88cd5
Add compreg reset inference integration test
TaoBi22 Apr 12, 2023
2197394
Return on multiple reset error
TaoBi22 Apr 12, 2023
185343f
clang-format
TaoBi22 Apr 12, 2023
8d77815
Move inference test into ConvertToArcs tests and remove unnecessary C…
TaoBi22 Apr 12, 2023
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
Prev Previous commit
Next Next commit
Return on multiple reset error 
Co-authored-by: Martin Erhart <maerhart@outlook.com>
  • Loading branch information
@TaoBi22 @maerhart
TaoBi22 and maerhart committed Apr 12, 2023
commit 2197394cf2362fe23a9d087f5feba53fd2949719
5 changes: 2 additions & 3 deletions lib/Conversion/ConvertToArcs/ConvertToArcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,9 @@ LogicalResult Converter::absorbRegs(HWModuleOp module) {
arc.setLatency(arc.getLatency() + 1);
if (reset) {
if (arc.getReset())
arc.emitError("StateOp tried to infer reset from CompReg, but already "
return arc.emitError("StateOp tried to infer reset from CompReg, but already "
"had a reset.");
else
arc.getResetMutable().assign(reset);
arc.getResetMutable().assign(reset);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if there is already a reset present?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you happy for this just to be covered with an assertion? I suppose we could comb.or multiple reset lines, but I'm unable to think of a situation where you would expect/desire a reset to already be present on the StateOp at this point, unless there are additions you have planned.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The situation/assertion could be triggered with an input that has both state ops and compreg ops in there which does not happen currently. But the fact that a user can construct such an IR is enough of a reason that we shouldn't use an assertion. However, I think it's not necessary to support this case right now, so I would just go for an emitError in that case as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah of course! Sounds good, I'll do that :)

}
if (llvm::any_of(absorbedNames, [](auto name) {
return !name.template cast<StringAttr>().getValue().empty();
Expand Down