[llvm] cde4ae7 - [ARM] Use getSignedTargetConstant. NFC
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 18 13:15:55 PST 2024
Author: Craig Topper
Date: 2024-11-18T13:12:23-08:00
New Revision: cde4ae789e4a2f408d06d2b0045cca22c201c47b
URL: https://github.com/llvm/llvm-project/commit/cde4ae789e4a2f408d06d2b0045cca22c201c47b
DIFF: https://github.com/llvm/llvm-project/commit/cde4ae789e4a2f408d06d2b0045cca22c201c47b.diff
LOG: [ARM] Use getSignedTargetConstant. NFC
Added:
Modified:
llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
llvm/lib/Target/ARM/ARMISelLowering.cpp
llvm/lib/Target/ARM/ARMInstrInfo.td
llvm/lib/Target/ARM/ARMInstrThumb2.td
Removed:
################################################################################
diff --git a/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp b/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
index 5c45e081e1b162..73ee8cf81adcd6 100644
--- a/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
+++ b/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
@@ -710,8 +710,7 @@ bool ARMDAGToDAGISel::SelectAddrModeImm12(SDValue N,
Base = CurDAG->getTargetFrameIndex(
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
}
- OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
return true;
}
}
@@ -880,8 +879,7 @@ bool ARMDAGToDAGISel::SelectAddrMode2OffsetImmPre(SDNode *Op, SDValue N,
if (isScaledConstantInRange(N, /*Scale=*/1, 0, 0x1000, Val)) { // 12 bits.
if (AddSub == ARM_AM::sub) Val *= -1;
Offset = CurDAG->getRegister(0, MVT::i32);
- Opc =
- CurDAG->getSignedConstant(Val, SDLoc(Op), MVT::i32, /*isTarget*/ true);
+ Opc = CurDAG->getSignedTargetConstant(Val, SDLoc(Op), MVT::i32);
return true;
}
@@ -1185,8 +1183,7 @@ ARMDAGToDAGISel::SelectThumbAddrModeImm5S(SDValue N, unsigned Scale,
int RHSC;
if (isScaledConstantInRange(N.getOperand(1), Scale, 0, 32, RHSC)) {
Base = N.getOperand(0);
- OffImm =
- CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32, /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
return true;
}
@@ -1248,8 +1245,7 @@ bool ARMDAGToDAGISel::SelectThumbAddrModeSP(SDValue N,
if (MFI.getObjectAlign(FI) >= Align(4)) {
Base = CurDAG->getTargetFrameIndex(
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
- OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
return true;
}
}
@@ -1269,8 +1265,8 @@ bool ARMDAGToDAGISel::SelectTAddrModeImm7(SDValue N, SDValue &Base,
Base = N.getOperand(0);
if (N.getOpcode() == ISD::SUB)
RHSC = -RHSC;
- OffImm = CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
- MVT::i32, /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
+ MVT::i32);
return true;
}
}
@@ -1332,8 +1328,7 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm12(SDValue N,
Base = CurDAG->getTargetFrameIndex(
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
}
- OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
return true;
}
}
@@ -1359,9 +1354,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8(SDValue N, SDValue &Base,
if (N.getOpcode() == ISD::SUB)
RHSC = -RHSC;
- OffImm =
- CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
+ MVT::i32);
return true;
}
}
@@ -1391,8 +1385,7 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8(SDValue N,
Base = CurDAG->getTargetFrameIndex(
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
}
- OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
return true;
}
}
@@ -1409,10 +1402,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8Offset(SDNode *Op, SDValue N,
int RHSC;
if (isScaledConstantInRange(N, /*Scale=*/1, 0, 0x100, RHSC)) { // 8 bits.
OffImm = ((AM == ISD::PRE_INC) || (AM == ISD::POST_INC))
- ? CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true)
- : CurDAG->getSignedConstant(-RHSC, SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ ? CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32)
+ : CurDAG->getSignedTargetConstant(-RHSC, SDLoc(N), MVT::i32);
return true;
}
@@ -1435,8 +1426,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm7(SDValue N, SDValue &Base,
if (N.getOpcode() == ISD::SUB)
RHSC = -RHSC;
- OffImm = CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
- MVT::i32, /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
+ MVT::i32);
return true;
}
}
@@ -1479,10 +1470,10 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm7Offset(SDNode *Op, SDValue N,
// 7 bit constant, shifted by Shift.
if (isScaledConstantInRange(N, 1 << Shift, 0, 0x80, RHSC)) {
OffImm = ((AM == ISD::PRE_INC) || (AM == ISD::POST_INC))
- ? CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
- MVT::i32, /*isTarget=*/true)
- : CurDAG->getSignedConstant(-RHSC * (1 << Shift), SDLoc(N),
- MVT::i32, /*isTarget=*/true);
+ ? CurDAG->getSignedTargetConstant(RHSC * (1 << Shift),
+ SDLoc(N), MVT::i32)
+ : CurDAG->getSignedTargetConstant(-RHSC * (1 << Shift),
+ SDLoc(N), MVT::i32);
return true;
}
return false;
@@ -1492,8 +1483,7 @@ template <int Min, int Max>
bool ARMDAGToDAGISel::SelectImmediateInRange(SDValue N, SDValue &OffImm) {
int Val;
if (isScaledConstantInRange(N, 1, Min, Max, Val)) {
- OffImm =
- CurDAG->getSignedConstant(Val, SDLoc(N), MVT::i32, /*isTarget=*/true);
+ OffImm = CurDAG->getSignedTargetConstant(Val, SDLoc(N), MVT::i32);
return true;
}
return false;
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 7fce91f97f3618..554f7337a6a5a0 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -2970,8 +2970,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
Ops.push_back(Callee);
if (isTailCall) {
- Ops.push_back(
- DAG.getSignedConstant(SPDiff, dl, MVT::i32, /*isTarget=*/true));
+ Ops.push_back(DAG.getSignedTargetConstant(SPDiff, dl, MVT::i32));
}
// Add argument registers to the end of the list so that they are known live
@@ -20615,8 +20614,7 @@ void ARMTargetLowering::LowerAsmOperandForConstraint(SDValue Op,
}
return;
}
- Result = DAG.getSignedConstant(CVal, SDLoc(Op), Op.getValueType(),
- /*isTarget=*/true);
+ Result = DAG.getSignedTargetConstant(CVal, SDLoc(Op), Op.getValueType());
break;
}
diff --git a/llvm/lib/Target/ARM/ARMInstrInfo.td b/llvm/lib/Target/ARM/ARMInstrInfo.td
index d24d4af36f0d86..72146f2a717ade 100644
--- a/llvm/lib/Target/ARM/ARMInstrInfo.td
+++ b/llvm/lib/Target/ARM/ARMInstrInfo.td
@@ -371,14 +371,14 @@ def ARMVCCElse : PatLeaf<(i32 2)>;
// imm_neg_XFORM - Return the negation of an i32 immediate value.
def imm_neg_XFORM : SDNodeXForm<imm, [{
- return CurDAG->getSignedConstant(-(int)N->getZExtValue(), SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ return CurDAG->getSignedTargetConstant(-(int)N->getZExtValue(), SDLoc(N),
+ MVT::i32);
}]>;
// imm_not_XFORM - Return the complement of a i32 immediate value.
def imm_not_XFORM : SDNodeXForm<imm, [{
- return CurDAG->getSignedConstant(~(int)N->getZExtValue(), SDLoc(N), MVT::i32,
- /*isTarget=*/true);
+ return CurDAG->getSignedTargetConstant(~(int)N->getZExtValue(), SDLoc(N),
+ MVT::i32);
}]>;
def gi_imm_not_XFORM : GICustomOperandRenderer<"renderInvertedImm">,
GISDNodeXFormEquiv<imm_not_XFORM>;
diff --git a/llvm/lib/Target/ARM/ARMInstrThumb2.td b/llvm/lib/Target/ARM/ARMInstrThumb2.td
index cb20aacb539ad9..4e9160bcfd5ec9 100644
--- a/llvm/lib/Target/ARM/ARMInstrThumb2.td
+++ b/llvm/lib/Target/ARM/ARMInstrThumb2.td
@@ -77,8 +77,8 @@ def t2_so_imm_not_XFORM : SDNodeXForm<imm, [{
// t2_so_imm_neg_XFORM - Return the negation of a t2_so_imm value
def t2_so_imm_neg_XFORM : SDNodeXForm<imm, [{
- return CurDAG->getSignedConstant(-((int)N->getZExtValue()), SDLoc(N),
- MVT::i32, /*isTarget=*/true);
+ return CurDAG->getSignedTargetConstant(-((int)N->getZExtValue()), SDLoc(N),
+ MVT::i32);
}]>;
// so_imm_notSext_XFORM - Return a so_imm value packed into the format
More information about the llvm-commits
mailing list