Skip to content

[Builtin] Fix issue with attribute list update #2192

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

Merged
MrSidims merged 2 commits into from
Nov 9, 2023
+6 −8
Merged

[Builtin] Fix issue with attribute list update #2192

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9db319
[Builtin] Fix issue with attribute list update
asudarsa Oct 22, 2023
0577fc2
Fix test fail
asudarsa Oct 24, 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
5 changes: 4 additions & 1 deletion lib/SPIRV/SPIRVBuiltinHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ Value *BuiltinCallMutator::doConversion() {
Builder.Insert(addCallInst(CI->getModule(), FuncName, ReturnTy, Args,
&Attrs, nullptr, Mangler.get()));
NewCall->copyMetadata(*CI);
NewCall->setAttributes(CI->getAttributes());
if (CI->hasFnAttr("fpbuiltin-max-error")) {
auto Attr = CI->getFnAttr("fpbuiltin-max-error");
NewCall->addFnAttr(Attr);

@vmaksimo vmaksimo Oct 23, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should we also call setAttributes() to copy all the other attributes, not just fpbuiltin-max-error?

@MrSidims MrSidims Oct 23, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In addition to Viktoria's comment, like this we also discard calling convention if it was not a default one.

@asudarsa asudarsa Oct 24, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I am trying to NOT introduce any new logic here. This PR aims to only correct the bug introduced by PR #2056

@MrSidims MrSidims Oct 25, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Okay, I understand. Should we also guard addition of the metadata?

@asudarsa asudarsa Nov 5, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I do not think copyMetadata overwrites existing metadata. So we should be fine here.

Thanks

}
Value *Result = MutateRet ? MutateRet(Builder, NewCall) : NewCall;
Result->takeName(CI);
if (!CI->getType()->isVoidTy())
Expand Down