Skip to content

[GlobalISel] support lowering of G_SHUFFLEVECTOR with pointer args #141959

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

Merged
merged 3 commits into from
Jun 5, 2025

Conversation

stanleygambarin
Copy link
Contributor

No description provided.

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 May 29, 2025

@llvm/pr-subscribers-backend-amdgpu

@llvm/pr-subscribers-llvm-globalisel

Author: Stanley Gambarin (stanleygambarin)

Changes

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

2 Files Affected:

  • (modified) llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp (+3-3)
  • (added) llvm/test/CodeGen/AMDGPU/shufflevector-pointer-crash.mir (+21)
diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
index 7b18a98d7f3ca..83ba71e4c9d49 100644
--- a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
@@ -8446,10 +8446,10 @@ LegalizerHelper::lowerShuffleVector(MachineInstr &MI) {
     }
   }
 
-  if (DstTy.isScalar())
-    MIRBuilder.buildCopy(DstReg, BuildVec[0]);
-  else
+  if (DstTy.isVector())
     MIRBuilder.buildBuildVector(DstReg, BuildVec);
+  else
+    MIRBuilder.buildCopy(DstReg, BuildVec[0]);
   MI.eraseFromParent();
   return Legalized;
 }
diff --git a/llvm/test/CodeGen/AMDGPU/shufflevector-pointer-crash.mir b/llvm/test/CodeGen/AMDGPU/shufflevector-pointer-crash.mir
new file mode 100644
index 0000000000000..03b870b923454
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/shufflevector-pointer-crash.mir
@@ -0,0 +1,21 @@
+# RUN: llc -march=amdgcn -run-pass=legalizer -verify-machineinstrs %s -o - 
+
+--- |
+  define i32 @test(i64 %arg) {
+    ret i32 0
+  }
+...
+name:            test
+tracksRegLiveness: true
+body: |
+  bb.0:
+    %9:_(p0) = G_CONSTANT i64 0
+    %10:_(<2 x p0>) = G_BUILD_VECTOR %9:_(p0), %9:_(p0)
+    %8:_(<2 x p0>) = G_LOAD %9:_(p0) :: (load (<2 x p0>) from `ptr null`, align 64)
+    %11:_(p0) = G_SHUFFLE_VECTOR %8:_(<2 x p0>), %10:_, shufflemask(0)
+    %12:_(s32), %13:_(s32) = G_UNMERGE_VALUES %11:_(p0)
+    $vgpr0 = COPY %12:_(s32)
+    $vgpr1 = COPY %13:_(s32)
+    SI_RETURN implicit $vgpr0, implicit $vgpr1
+...
+

@michalpaszkowski michalpaszkowski requested a review from arsenm May 29, 2025 16:19
@@ -0,0 +1,21 @@
# RUN: llc -march=amdgcn -run-pass=legalizer -verify-machineinstrs %s -o -
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you include an IR test? Can we just add global-isel run lines to the existing shuffle vector tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

unfortunately, no. AMD backend will replace G_SHUFFLEVECTOR is pre-legalizer pass (even with -O0), so the fixed code path never gets hit. Have to resort to using MIR test to demonstrate the problem.

@stanleygambarin stanleygambarin requested a review from arsenm May 29, 2025 21:30
@stanleygambarin stanleygambarin requested a review from arsenm May 30, 2025 15:53
Copy link
Member

@michalpaszkowski michalpaszkowski left a comment

Choose a reason for hiding this comment

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

@stanleygambarin Thanks for working on this! LGTM! I can merge the PR if the patch is ready.

@michalpaszkowski michalpaszkowski merged commit 33974b4 into llvm:main Jun 5, 2025
11 checks passed
Copy link

github-actions bot commented Jun 5, 2025

@stanleygambarin 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!

rorth pushed a commit to rorth/llvm-project that referenced this pull request Jun 11, 2025
DhruvSrivastavaX pushed a commit to DhruvSrivastavaX/lldb-for-aix that referenced this pull request Jun 12, 2025
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