[llvm] 11df0ce - [NFC][AMDGPU] Use structured binding to replace explicit use of std::pair
Shilei Tian via llvm-commits
llvm-commits at lists.llvm.org
Sat Nov 2 12:17:20 PDT 2024
Author: Shilei Tian
Date: 2024-11-02T15:11:55-04:00
New Revision: 11df0ce1405ec3e3721b43764dc53250aa9e08a1
URL: https://github.com/llvm/llvm-project/commit/11df0ce1405ec3e3721b43764dc53250aa9e08a1
DIFF: https://github.com/llvm/llvm-project/commit/11df0ce1405ec3e3721b43764dc53250aa9e08a1.diff
LOG: [NFC][AMDGPU] Use structured binding to replace explicit use of std::pair
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 d66610ae0a160d..601faef2997b64 100644
--- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
@@ -3331,11 +3331,9 @@ void SITargetLowering::passSpecialInputs(
};
// clang-format on
- for (auto Attr : ImplicitAttrs) {
- AMDGPUFunctionArgInfo::PreloadedValue InputID = Attr.first;
-
+ for (auto [InputID, Attr] : ImplicitAttrs) {
// If the callee does not use the attribute value, skip copying the value.
- if (CLI.CB->hasFnAttr(Attr.second))
+ if (CLI.CB->hasFnAttr(Attr))
continue;
const auto [OutgoingArg, ArgRC, ArgTy] =
@@ -3927,10 +3925,8 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
// Add argument registers to the end of the list so that they are known live
// into the call.
- for (auto &RegToPass : RegsToPass) {
- Ops.push_back(
- DAG.getRegister(RegToPass.first, RegToPass.second.getValueType()));
- }
+ for (auto &[Reg, Val] : RegsToPass)
+ Ops.push_back(DAG.getRegister(Reg, Val.getValueType()));
// Add a register mask operand representing the call-preserved registers.
const uint32_t *Mask = TRI->getCallPreservedMask(MF, CallConv);
@@ -8863,16 +8859,16 @@ SDValue SITargetLowering::lowerRawBufferAtomicIntrin(SDValue Op,
SDValue VData = Op.getOperand(2);
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(4), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(4), DAG);
auto SOffset = selectSOffset(Op.getOperand(5), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
VData, // vdata
Rsrc, // rsrc
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(6), // cachepolicy
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
};
@@ -8891,16 +8887,16 @@ SITargetLowering::lowerStructBufferAtomicIntrin(SDValue Op, SelectionDAG &DAG,
SDValue VData = Op.getOperand(2);
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(5), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(5), DAG);
auto SOffset = selectSOffset(Op.getOperand(6), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
VData, // vdata
Rsrc, // rsrc
Op.getOperand(4), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(7), // cachepolicy
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
};
@@ -8981,15 +8977,15 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
IntrID == Intrinsic::amdgcn_raw_ptr_buffer_load_format;
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(2), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(3), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(3), DAG);
auto SOffset = selectSOffset(Op.getOperand(4), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
Rsrc, // rsrc
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(5), // cachepolicy, swizzled buffer
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
};
@@ -9008,15 +9004,15 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
IntrID == Intrinsic::amdgcn_struct_ptr_buffer_load_format;
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(2), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(4), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(4), DAG);
auto SOffset = selectSOffset(Op.getOperand(5), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
Rsrc, // rsrc
Op.getOperand(3), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(6), // cachepolicy, swizzled buffer
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
};
@@ -9028,16 +9024,16 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
MemSDNode *M = cast<MemSDNode>(Op);
EVT LoadVT = Op.getValueType();
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(2), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(3), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(3), DAG);
auto SOffset = selectSOffset(Op.getOperand(4), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
Rsrc, // rsrc
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(5), // format
Op.getOperand(6), // cachepolicy, swizzled buffer
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
@@ -9055,16 +9051,16 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
MemSDNode *M = cast<MemSDNode>(Op);
EVT LoadVT = Op.getValueType();
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(2), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(4), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(4), DAG);
auto SOffset = selectSOffset(Op.getOperand(5), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
Rsrc, // rsrc
Op.getOperand(3), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(6), // format
Op.getOperand(7), // cachepolicy, swizzled buffer
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
@@ -9185,7 +9181,7 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
case Intrinsic::amdgcn_raw_buffer_atomic_cmpswap:
case Intrinsic::amdgcn_raw_ptr_buffer_atomic_cmpswap: {
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(4), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(5), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(5), DAG);
auto SOffset = selectSOffset(Op.getOperand(6), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
@@ -9193,9 +9189,9 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
Op.getOperand(3), // cmp
Rsrc, // rsrc
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(7), // cachepolicy
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
};
@@ -9209,7 +9205,7 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
case Intrinsic::amdgcn_struct_buffer_atomic_cmpswap:
case Intrinsic::amdgcn_struct_ptr_buffer_atomic_cmpswap: {
SDValue Rsrc = bufferRsrcPtrToVector(Op->getOperand(4), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(6), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(6), DAG);
auto SOffset = selectSOffset(Op.getOperand(7), DAG, Subtarget);
SDValue Ops[] = {
Op.getOperand(0), // Chain
@@ -9217,9 +9213,9 @@ SDValue SITargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
Op.getOperand(3), // cmp
Rsrc, // rsrc
Op.getOperand(5), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(8), // cachepolicy
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
};
@@ -9623,16 +9619,16 @@ SDValue SITargetLowering::LowerINTRINSIC_VOID(SDValue Op,
if (IsD16)
VData = handleD16VData(VData, DAG);
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(5), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(5), DAG);
auto SOffset = selectSOffset(Op.getOperand(6), DAG, Subtarget);
SDValue Ops[] = {
Chain,
VData, // vdata
Rsrc, // rsrc
Op.getOperand(4), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(7), // format
Op.getOperand(8), // cachepolicy, swizzled buffer
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
@@ -9651,16 +9647,16 @@ SDValue SITargetLowering::LowerINTRINSIC_VOID(SDValue Op,
if (IsD16)
VData = handleD16VData(VData, DAG);
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(4), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(4), DAG);
auto SOffset = selectSOffset(Op.getOperand(5), DAG, Subtarget);
SDValue Ops[] = {
Chain,
VData, // vdata
Rsrc, // rsrc
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(6), // format
Op.getOperand(7), // cachepolicy, swizzled buffer
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
@@ -9696,16 +9692,16 @@ SDValue SITargetLowering::LowerINTRINSIC_VOID(SDValue Op,
}
SDValue Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(4), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(4), DAG);
auto SOffset = selectSOffset(Op.getOperand(5), DAG, Subtarget);
SDValue Ops[] = {
Chain,
VData,
Rsrc,
DAG.getConstant(0, DL, MVT::i32), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(6), // cachepolicy, swizzled buffer
DAG.getTargetConstant(0, DL, MVT::i1), // idxen
};
@@ -9747,16 +9743,16 @@ SDValue SITargetLowering::LowerINTRINSIC_VOID(SDValue Op,
}
auto Rsrc = bufferRsrcPtrToVector(Op.getOperand(3), DAG);
- auto Offsets = splitBufferOffsets(Op.getOperand(5), DAG);
+ auto [VOffset, Offset] = splitBufferOffsets(Op.getOperand(5), DAG);
auto SOffset = selectSOffset(Op.getOperand(6), DAG, Subtarget);
SDValue Ops[] = {
Chain,
VData,
Rsrc,
Op.getOperand(4), // vindex
- Offsets.first, // voffset
+ VOffset, // voffset
SOffset, // soffset
- Offsets.second, // offset
+ Offset, // offset
Op.getOperand(7), // cachepolicy, swizzled buffer
DAG.getTargetConstant(1, DL, MVT::i1), // idxen
};
More information about the llvm-commits
mailing list