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.

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

[NVPTX][NFC] Use same logic to get alignment in param declarations and function prototypes #98220

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

kalxr
Copy link
Contributor

@kalxr kalxr commented Jul 9, 2024

Unifies the logic used to choose function prototype argument alignment and param alignment declared in the caller. The call in getPrototype to getAlign/getFunctionParamOptimizedAlign is replaced with getArgumentAlignment, which is what is currently used to select the alignment for the param declarations. This avoids code duplication of getAlign().value_or(getFunctionParamOptimizedAlign()) and ensures that param alignments are the same in declarations and prototypes.

Copy link

github-actions bot commented Jul 9, 2024

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@kalxr kalxr force-pushed the nvptx-prototype-param-alignment branch from 38f5d9c to d4e39c1 Compare July 9, 2024 20:49
@kalxr kalxr marked this pull request as ready for review July 9, 2024 21:06
@llvmbot
Copy link
Collaborator

llvmbot commented Jul 9, 2024

@llvm/pr-subscribers-backend-nvptx

Author: Kevin McAfee (kalxr)

Changes

Unifies the logic used to choose function prototype argument alignment and param alignment declared in the caller. The call in getPrototype to getAlign/getFunctionParamOptimizedAlign is replaced with getArgumentAlignment, which is what is currently used to select the alignment for the param declarations. This avoids code duplication of getAlign().value_or(getFunctionParamOptimizedAlign()) and ensures that param alignments are the same in declarations and prototypes.


Full diff: https://github.com/llvm/llvm-project/pull/98220.diff

1 Files Affected:

  • (modified) llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp (+1-3)
diff --git a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
index 26c16ee9fd18f..9fccfb26eb6fe 100644
--- a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
@@ -1438,10 +1438,8 @@ std::string NVPTXTargetLowering::getPrototype(
 
     if (!Outs[OIdx].Flags.isByVal()) {
       if (IsTypePassedAsArray(Ty)) {
-        const CallInst *CallI = cast<CallInst>(&CB);
         Align ParamAlign =
-            getAlign(*CallI, i + AttributeList::FirstArgIndex)
-                .value_or(getFunctionParamOptimizedAlign(F, Ty, DL));
+            getArgumentAlignment(&CB, Ty, i + AttributeList::FirstArgIndex, DL);
         O << ".param .align " << ParamAlign.value() << " .b8 ";
         O << "_";
         O << "[" << DL.getTypeAllocSize(Ty) << "]";

@AlexMaclean AlexMaclean requested a review from Artem-B July 9, 2024 21:42
@kalxr
Copy link
Contributor Author

kalxr commented Jul 11, 2024

I don't have commit access, could you please merge for me @Artem-B ?

@justinfargnoli justinfargnoli merged commit 88cbc8c into llvm:main Jul 11, 2024
10 checks passed
Copy link

@kalxr Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested
by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as
the builds can include changes from many authors. It is not uncommon for your
change to be included in a build that fails due to someone else's changes, or
infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself.
This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

@justinfargnoli
Copy link
Contributor

Merged at @kalxr’s (offline) request.

aaryanshukla pushed a commit to aaryanshukla/llvm-project that referenced this pull request Jul 14, 2024
…d function prototypes (llvm#98220)

Unifies the logic used to choose function prototype argument alignment
and param alignment declared in the caller. The call in `getPrototype`
to `getAlign`/`getFunctionParamOptimizedAlign` is replaced with
`getArgumentAlignment`, which is what is currently used to select the
alignment for the param declarations. This avoids code duplication of
`getAlign().value_or(getFunctionParamOptimizedAlign())` and ensures that
param alignments are the same in declarations and prototypes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants