Skip to content

[AMDGPU] Handle MachineOperandType global address in SIFoldOperands. #135424

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

isakhilesh
Copy link

@isakhilesh isakhilesh commented Apr 11, 2025

This patch handles the global operand type properly, fixing the
bug : Assertion (isFI() || isCPI() || isTargetIndex() || isJTI()) && "Wrong MachineOperand accessor" failed.

Fixes SWDEV-504645

Copy link

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.

@llvmbot
Copy link
Member

llvmbot commented Apr 11, 2025

@llvm/pr-subscribers-backend-amdgpu

Author: Akhilesh Moorthy (isakhilesh)

Changes

While FoldingImmLike accepts :
MO_Immediate, MO_FrameIndex and MO_GlobalAddress.
The conditional block after it only covers the first 2. So I have added a case for the global value as well.


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

1 Files Affected:

  • (modified) llvm/lib/Target/AMDGPU/SIFoldOperands.cpp (+3-1)
diff --git a/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp b/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp
index d6acf9e081b9f..701d17930d7df 100644
--- a/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp
+++ b/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp
@@ -1161,8 +1161,10 @@ void SIFoldOperandsImpl::foldOperand(
 
         if (OpToFold.isImm())
           UseMI->getOperand(1).ChangeToImmediate(OpToFold.getImm());
-        else
+        else if(OpToFold.isFI())
           UseMI->getOperand(1).ChangeToFrameIndex(OpToFold.getIndex());
+        else if(OpToFold.isGlobal())
+          return;
         UseMI->removeOperand(2); // Remove exec read (or src1 for readlane)
         return;
       }

@isakhilesh
Copy link
Author

Work In Progress: working on adding a test.

@isakhilesh isakhilesh force-pushed the updated_global_address branch 2 times, most recently from 686a2b5 to 69c3465 Compare April 11, 2025 19:37
Copy link
Contributor

@arsenm arsenm left a comment

Choose a reason for hiding this comment

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

Please do not post or update new reviews without a test.

Fixes SWDEV-504645.

This patch handles the global operand type properly fixing the
bug : Assertion `(isFI() || isCPI() || isTargetIndex() ||
isJTI()) && "Wrong MachineOperand accessor"' failed.
@isakhilesh isakhilesh force-pushed the updated_global_address branch from 69c3465 to ea3c20a Compare April 24, 2025 16:10
@dhruvachak
Copy link
Contributor

Occurred to me that perhaps the test name should be changed since the swdev# won't make sense to everyone. What do you think @arsenm ?

@arsenm
Copy link
Contributor

arsenm commented Apr 24, 2025

Occurred to me that perhaps the test name should be changed since the swdev# won't make sense to everyone. What do you think @arsenm ?

I usually include that as a suffix, or in the test function name with some other description

@isakhilesh
Copy link
Author

Occurred to me that perhaps the test name should be changed since the swdev# won't make sense to everyone. What do you think @arsenm ?

I usually include that as a suffix, or in the test function name with some other description

Yes, updated the name of the test file.

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