[llvm] 11e5d1c - [AMDGPU] Respect existing glue when lowering convergence tokens (#90834)
via llvm-commits
llvm-commits at lists.llvm.org
Tue May 14 01:09:42 PDT 2024
Author: Sameer Sahasrabuddhe
Date: 2024-05-14T13:39:37+05:30
New Revision: 11e5d1cfee399cfaba373078879c1ac3e1109b11
URL: https://github.com/llvm/llvm-project/commit/11e5d1cfee399cfaba373078879c1ac3e1109b11
DIFF: https://github.com/llvm/llvm-project/commit/11e5d1cfee399cfaba373078879c1ac3e1109b11.diff
LOG: [AMDGPU] Respect existing glue when lowering convergence tokens (#90834)
Added:
Modified:
llvm/lib/Target/AMDGPU/SIISelLowering.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
index 8645f560d997d..8f741ffc58a82 100644
--- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
@@ -3859,20 +3859,20 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
assert(Mask && "Missing call preserved mask for calling convention");
Ops.push_back(DAG.getRegisterMask(Mask));
- if (InGlue.getNode())
- Ops.push_back(InGlue);
-
- // NOTE: This potentially results in *two* glue operands, and the wrong one
- // might possibly show up where the other was intended. In particular,
- // Emitter::EmitMachineNode() expects only the glued convergence token if it
- // exists. Similarly, the selection of the call expects to match only the
- // InGlue operand if it exists.
if (SDValue Token = CLI.ConvergenceControlToken) {
- Ops.push_back(SDValue(DAG.getMachineNode(TargetOpcode::CONVERGENCECTRL_GLUE,
- DL, MVT::Glue, Token),
- 0));
+ SmallVector<SDValue, 2> GlueOps;
+ GlueOps.push_back(Token);
+ if (InGlue)
+ GlueOps.push_back(InGlue);
+
+ InGlue = SDValue(DAG.getMachineNode(TargetOpcode::CONVERGENCECTRL_GLUE, DL,
+ MVT::Glue, GlueOps),
+ 0);
}
+ if (InGlue)
+ Ops.push_back(InGlue);
+
SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue);
// If we're doing a tall call, use a TC_RETURN here rather than an
More information about the llvm-commits
mailing list