Skip to content

[X86] combineConcatVectorOps - remove unused DAGCombinerInfo argument. NFC. #130951

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 1 commit into from
Mar 12, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions llvm/lib/Target/X86/X86ISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41920,7 +41920,6 @@ static SDValue canonicalizeLaneShuffleWithRepeatedOps(SDValue V,

static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
ArrayRef<SDValue> Ops, SelectionDAG &DAG,
TargetLowering::DAGCombinerInfo &DCI,
const X86Subtarget &Subtarget,
unsigned Depth = 0);

Expand Down Expand Up @@ -42669,7 +42668,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
if (CanConcat) {
SDValue Ops[] = {N.getOperand(0), N.getOperand(2)};
if (SDValue ConcatSrc =
combineConcatVectorOps(DL, WideVT, Ops, DAG, DCI, Subtarget)) {
combineConcatVectorOps(DL, WideVT, Ops, DAG, Subtarget)) {
SDValue Mask = widenSubVector(N.getOperand(1), false, Subtarget, DAG,
DL, WideVT.getSizeInBits());
SDValue Perm = DAG.getNode(X86ISD::VPERMV, DL, WideVT, Mask, ConcatSrc);
Expand All @@ -42684,7 +42683,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
// See if we can concatenate the commuted operands.
if (CanConcat) {
if (SDValue ConcatSrc = combineConcatVectorOps(
DL, WideVT, {N.getOperand(2), N.getOperand(0)}, DAG, DCI,
DL, WideVT, {N.getOperand(2), N.getOperand(0)}, DAG,
Subtarget)) {
ShuffleVectorSDNode::commuteMask(Mask);
Mask.append(NumElts, SM_SentinelUndef);
Expand Down Expand Up @@ -42714,7 +42713,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
m_InsertSubvector(m_Undef(), m_Value(Ops[1]), m_Zero())) &&
Ops[0].getValueType() == HalfVT && Ops[1].getValueType() == HalfVT) {
if (SDValue ConcatSrc =
combineConcatVectorOps(DL, VT, Ops, DAG, DCI, Subtarget)) {
combineConcatVectorOps(DL, VT, Ops, DAG, Subtarget)) {
for (int &M : Mask)
M = (M < (int)NumElts ? M : (M - (NumElts / 2)));
return lowerShuffleWithPERMV(DL, VT, Mask, ConcatSrc,
Expand Down Expand Up @@ -57822,7 +57821,6 @@ CastIntSETCCtoFP(MVT VT, ISD::CondCode CC, unsigned NumSignificantBitsLHS,
/// ISD::INSERT_SUBVECTOR). The ops are assumed to be of the same type.
static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
ArrayRef<SDValue> Ops, SelectionDAG &DAG,
TargetLowering::DAGCombinerInfo &DCI,
const X86Subtarget &Subtarget,
unsigned Depth) {
assert(Subtarget.hasAVX() && "AVX assumed for concat_vectors");
Expand Down Expand Up @@ -57980,8 +57978,7 @@ static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
}
if (AllConstants)
return DAG.getNode(ISD::CONCAT_VECTORS, DL, VT, Subs);
return combineConcatVectorOps(DL, VT, Subs, DAG, DCI, Subtarget,
Depth + 1);
return combineConcatVectorOps(DL, VT, Subs, DAG, Subtarget, Depth + 1);
};

switch (Op0.getOpcode()) {
Expand Down Expand Up @@ -58663,7 +58660,7 @@ static SDValue combineCONCAT_VECTORS(SDNode *N, SelectionDAG &DAG,

if (Subtarget.hasAVX() && TLI.isTypeLegal(VT) && TLI.isTypeLegal(SrcVT)) {
if (SDValue R = combineConcatVectorOps(SDLoc(N), VT.getSimpleVT(), Ops, DAG,
DCI, Subtarget))
Subtarget))
return R;
}

Expand Down Expand Up @@ -58765,7 +58762,7 @@ static SDValue combineINSERT_SUBVECTOR(SDNode *N, SelectionDAG &DAG,
SmallVector<SDValue, 2> SubVectorOps;
if (collectConcatOps(N, SubVectorOps, DAG)) {
if (SDValue Fold =
combineConcatVectorOps(dl, OpVT, SubVectorOps, DAG, DCI, Subtarget))
combineConcatVectorOps(dl, OpVT, SubVectorOps, DAG, Subtarget))
return Fold;

// If we're inserting all zeros into the upper half, change this to
Expand Down
Loading