Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

[AMDGPU] Check legality of both operands before swap#148843

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
shiltian merged 1 commit intollvm:mainfromptrojahn:commute_sgprs
Jul 15, 2025

Conversation

ptrojahn
Copy link
Contributor

@ptrojahnptrojahn commentedJul 15, 2025
edited
Loading

When trying to fold an SGPR into the second operand to a DPP add, si-fold-operands correctly determines that this is not possible and attempts to swap the second and third operand. This succeeds even if the third operand is an SGPR, creating an illegal dpp add with two SGPR operands. We need to check both operands if they are legal in their new position.

This causes a crash at compile time for a test in triton on gfx12:
https://github.com/triton-lang/triton/blob/345c633787e90a7f94864de3035346eb5de1781f/python/test/unit/language/test_core.py#L2718

@llvmbot
Copy link
Member

@llvm/pr-subscribers-backend-amdgpu

Author: Paul Trojahn (ptrojahn)

Changes

When trying to fold an SGPR into the second operand to a DPP add, si-fold-operands correctly determines that this is not possible and attempts to swap the second and third operand. This succeeds even if the third operand is an SGPR, creating an illegal dpp add with two SGPR operands. We need to check both operands if they are legal in their new position.

This crashes a test in triton on gfx12:
https://github.com/triton-lang/triton/blob/345c633787e90a7f94864de3035346eb5de1781f/python/test/unit/language/test_core.py#L2718


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

2 Files Affected:

  • (modified) llvm/lib/Target/AMDGPU/SIInstrInfo.cpp (+2-2)
  • (added) llvm/test/CodeGen/AMDGPU/fold-commute-sgpr.mir (+24)
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cppindex 4c5f938831243..733c98f2d3dff 100644--- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp+++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp@@ -2807,12 +2807,12 @@ bool SIInstrInfo::isLegalToSwap(const MachineInstr &MI, unsigned OpIdx0,   if ((int)OpIdx1 != Src0Idx && MO0->isReg()) {     if (!DefinedRC1)       return OpInfo1.OperandType == MCOI::OPERAND_UNKNOWN;-    return isLegalRegOperand(MI, OpIdx1, *MO0);+    return isLegalRegOperand(MI, OpIdx1, *MO0) && (!MO1->isReg() || isLegalRegOperand(MI, OpIdx0, *MO1));   }   if ((int)OpIdx0 != Src0Idx && MO1->isReg()) {     if (!DefinedRC0)       return OpInfo0.OperandType == MCOI::OPERAND_UNKNOWN;-    return isLegalRegOperand(MI, OpIdx0, *MO1);+    return (!MO0->isReg() || isLegalRegOperand(MI, OpIdx1, *MO0)) && isLegalRegOperand(MI, OpIdx0, *MO1);   }    // No need to check 64-bit literals since swapping does not bring newdiff --git a/llvm/test/CodeGen/AMDGPU/fold-commute-sgpr.mir b/llvm/test/CodeGen/AMDGPU/fold-commute-sgpr.mirnew file mode 100644index 0000000000000..c6bc248f13388--- /dev/null+++ b/llvm/test/CodeGen/AMDGPU/fold-commute-sgpr.mir@@ -0,0 +1,24 @@+# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5+# RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1200 -run-pass=si-fold-operands -verify-machineinstrs -o - %s | FileCheck %s++---+name: fold_commute_sgprs+body:             |+  bb.0:+    liveins: $sgpr0, $sgpr1+    ; CHECK-LABEL: name: fold_commute_sgprs+    ; CHECK: liveins: $sgpr0, $sgpr1+    ; CHECK-NEXT: {{  $}}+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:sreg_32 = COPY $sgpr0+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:sreg_32 = IMPLICIT_DEF+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:vgpr_32 = COPY [[DEF]]+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:vgpr_32 = COPY [[COPY]]+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:sreg_32 = COPY $sgpr1+    ; CHECK-NEXT: [[V_ADD_NC_U16_fake16_e64_dpp:%[0-9]+]]:vgpr_32 = V_ADD_NC_U16_fake16_e64_dpp [[COPY1]], 0, [[COPY2]], 0, [[COPY3]], 0, 0, 280, 15, 15, 1, implicit $exec+    %0:sreg_32 = COPY $sgpr0+    %1:sreg_32 = IMPLICIT_DEF+    %2:vgpr_32 = COPY %1:sreg_32+    %3:vgpr_32 = COPY %0:sreg_32+    %4:sreg_32 = COPY $sgpr1+    %5:vgpr_32 = V_ADD_NC_U16_fake16_e64_dpp %2:vgpr_32, 0, %3:vgpr_32, 0, %4:sreg_32, 0, 0, 280, 15, 15, 1, implicit $exec+...

@github-actionsGitHub Actions
Copy link

github-actionsbot commentedJul 15, 2025
edited
Loading

✅ With the latest revision this PR passed the C/C++ code formatter.

When trying to fold an SGPR into a DPP add, si-fold-operands correctlyrealizes that this is not possible and then tries to commute whichmistakenly succeeds, creating a dpp add with two SGPRs. We need tocheck both operands if they are legal in their new position.This crashes a test in triton on gfx12:ttps://github.com/triton-lang/triton/blob/345c633787e90a7f94864de3035346eb5de1781f/python/test/unit/language/test_core.py#L2718
@paultrojahnamd
Copy link
Contributor

Thanks for the review! Can you merge this?

@shiltianshiltian merged commit70e1a3c intollvm:mainJul 15, 2025
9 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@shiltianshiltianshiltian approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

4 participants
@ptrojahn@llvmbot@paultrojahnamd@shiltian

[8]ページ先頭

©2009-2025 Movatter.jp