Skip to content

Commit cde4ae7

Browse files
topperctopperc
committed
[ARM] Use getSignedTargetConstant. NFC
1 parent ce0cc8e commit cde4ae7

File tree

4 files changed

+27
-39
lines changed

4 files changed

+27
-39
lines changed

‎llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,7 @@ bool ARMDAGToDAGISel::SelectAddrModeImm12(SDValue N,
710710
Base = CurDAG->getTargetFrameIndex(
711711
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
712712
}
713-
OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
714-
/*isTarget=*/true);
713+
OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
715714
return true;
716715
}
717716
}
@@ -880,8 +879,7 @@ bool ARMDAGToDAGISel::SelectAddrMode2OffsetImmPre(SDNode *Op, SDValue N,
880879
if (isScaledConstantInRange(N, /*Scale=*/1, 0, 0x1000, Val)) { // 12 bits.
881880
if (AddSub == ARM_AM::sub) Val *= -1;
882881
Offset = CurDAG->getRegister(0, MVT::i32);
883-
Opc =
884-
CurDAG->getSignedConstant(Val, SDLoc(Op), MVT::i32, /*isTarget*/ true);
882+
Opc = CurDAG->getSignedTargetConstant(Val, SDLoc(Op), MVT::i32);
885883
return true;
886884
}
887885

@@ -1185,8 +1183,7 @@ ARMDAGToDAGISel::SelectThumbAddrModeImm5S(SDValue N, unsigned Scale,
11851183
int RHSC;
11861184
if (isScaledConstantInRange(N.getOperand(1), Scale, 0, 32, RHSC)) {
11871185
Base = N.getOperand(0);
1188-
OffImm =
1189-
CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32, /*isTarget=*/true);
1186+
OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
11901187
return true;
11911188
}
11921189

@@ -1248,8 +1245,7 @@ bool ARMDAGToDAGISel::SelectThumbAddrModeSP(SDValue N,
12481245
if (MFI.getObjectAlign(FI) >= Align(4)) {
12491246
Base = CurDAG->getTargetFrameIndex(
12501247
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
1251-
OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
1252-
/*isTarget=*/true);
1248+
OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
12531249
return true;
12541250
}
12551251
}
@@ -1269,8 +1265,8 @@ bool ARMDAGToDAGISel::SelectTAddrModeImm7(SDValue N, SDValue &Base,
12691265
Base = N.getOperand(0);
12701266
if (N.getOpcode() == ISD::SUB)
12711267
RHSC = -RHSC;
1272-
OffImm = CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
1273-
MVT::i32, /*isTarget=*/true);
1268+
OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
1269+
MVT::i32);
12741270
return true;
12751271
}
12761272
}
@@ -1332,8 +1328,7 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm12(SDValue N,
13321328
Base = CurDAG->getTargetFrameIndex(
13331329
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
13341330
}
1335-
OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
1336-
/*isTarget=*/true);
1331+
OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
13371332
return true;
13381333
}
13391334
}
@@ -1359,9 +1354,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8(SDValue N, SDValue &Base,
13591354

13601355
if (N.getOpcode() == ISD::SUB)
13611356
RHSC = -RHSC;
1362-
OffImm =
1363-
CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N), MVT::i32,
1364-
/*isTarget=*/true);
1357+
OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
1358+
MVT::i32);
13651359
return true;
13661360
}
13671361
}
@@ -1391,8 +1385,7 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8(SDValue N,
13911385
Base = CurDAG->getTargetFrameIndex(
13921386
FI, TLI->getPointerTy(CurDAG->getDataLayout()));
13931387
}
1394-
OffImm = CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
1395-
/*isTarget=*/true);
1388+
OffImm = CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32);
13961389
return true;
13971390
}
13981391
}
@@ -1409,10 +1402,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm8Offset(SDNode *Op, SDValue N,
14091402
int RHSC;
14101403
if (isScaledConstantInRange(N, /*Scale=*/1, 0, 0x100, RHSC)) { // 8 bits.
14111404
OffImm = ((AM == ISD::PRE_INC) || (AM == ISD::POST_INC))
1412-
? CurDAG->getSignedConstant(RHSC, SDLoc(N), MVT::i32,
1413-
/*isTarget=*/true)
1414-
: CurDAG->getSignedConstant(-RHSC, SDLoc(N), MVT::i32,
1415-
/*isTarget=*/true);
1405+
? CurDAG->getSignedTargetConstant(RHSC, SDLoc(N), MVT::i32)
1406+
: CurDAG->getSignedTargetConstant(-RHSC, SDLoc(N), MVT::i32);
14161407
return true;
14171408
}
14181409

@@ -1435,8 +1426,8 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm7(SDValue N, SDValue &Base,
14351426

14361427
if (N.getOpcode() == ISD::SUB)
14371428
RHSC = -RHSC;
1438-
OffImm = CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
1439-
MVT::i32, /*isTarget=*/true);
1429+
OffImm = CurDAG->getSignedTargetConstant(RHSC * (1 << Shift), SDLoc(N),
1430+
MVT::i32);
14401431
return true;
14411432
}
14421433
}
@@ -1479,10 +1470,10 @@ bool ARMDAGToDAGISel::SelectT2AddrModeImm7Offset(SDNode *Op, SDValue N,
14791470
// 7 bit constant, shifted by Shift.
14801471
if (isScaledConstantInRange(N, 1 << Shift, 0, 0x80, RHSC)) {
14811472
OffImm = ((AM == ISD::PRE_INC) || (AM == ISD::POST_INC))
1482-
? CurDAG->getSignedConstant(RHSC * (1 << Shift), SDLoc(N),
1483-
MVT::i32, /*isTarget=*/true)
1484-
: CurDAG->getSignedConstant(-RHSC * (1 << Shift), SDLoc(N),
1485-
MVT::i32, /*isTarget=*/true);
1473+
? CurDAG->getSignedTargetConstant(RHSC * (1 << Shift),
1474+
SDLoc(N), MVT::i32)
1475+
: CurDAG->getSignedTargetConstant(-RHSC * (1 << Shift),
1476+
SDLoc(N), MVT::i32);
14861477
return true;
14871478
}
14881479
return false;
@@ -1492,8 +1483,7 @@ template <int Min, int Max>
14921483
bool ARMDAGToDAGISel::SelectImmediateInRange(SDValue N, SDValue &OffImm) {
14931484
int Val;
14941485
if (isScaledConstantInRange(N, 1, Min, Max, Val)) {
1495-
OffImm =
1496-
CurDAG->getSignedConstant(Val, SDLoc(N), MVT::i32, /*isTarget=*/true);
1486+
OffImm = CurDAG->getSignedTargetConstant(Val, SDLoc(N), MVT::i32);
14971487
return true;
14981488
}
14991489
return false;

‎llvm/lib/Target/ARM/ARMISelLowering.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2970,8 +2970,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
29702970
Ops.push_back(Callee);
29712971

29722972
if (isTailCall) {
2973-
Ops.push_back(
2974-
DAG.getSignedConstant(SPDiff, dl, MVT::i32, /*isTarget=*/true));
2973+
Ops.push_back(DAG.getSignedTargetConstant(SPDiff, dl, MVT::i32));
29752974
}
29762975

29772976
// Add argument registers to the end of the list so that they are known live
@@ -20615,8 +20614,7 @@ void ARMTargetLowering::LowerAsmOperandForConstraint(SDValue Op,
2061520614
}
2061620615
return;
2061720616
}
20618-
Result = DAG.getSignedConstant(CVal, SDLoc(Op), Op.getValueType(),
20619-
/*isTarget=*/true);
20617+
Result = DAG.getSignedTargetConstant(CVal, SDLoc(Op), Op.getValueType());
2062020618
break;
2062120619
}
2062220620

‎llvm/lib/Target/ARM/ARMInstrInfo.td‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,14 @@ def ARMVCCElse : PatLeaf<(i32 2)>;
371371

372372
// imm_neg_XFORM - Return the negation of an i32 immediate value.
373373
def imm_neg_XFORM : SDNodeXForm<imm, [{
374-
return CurDAG->getSignedConstant(-(int)N->getZExtValue(), SDLoc(N), MVT::i32,
375-
/*isTarget=*/true);
374+
return CurDAG->getSignedTargetConstant(-(int)N->getZExtValue(), SDLoc(N),
375+
MVT::i32);
376376
}]>;
377377

378378
// imm_not_XFORM - Return the complement of a i32 immediate value.
379379
def imm_not_XFORM : SDNodeXForm<imm, [{
380-
return CurDAG->getSignedConstant(~(int)N->getZExtValue(), SDLoc(N), MVT::i32,
381-
/*isTarget=*/true);
380+
return CurDAG->getSignedTargetConstant(~(int)N->getZExtValue(), SDLoc(N),
381+
MVT::i32);
382382
}]>;
383383
def gi_imm_not_XFORM : GICustomOperandRenderer<"renderInvertedImm">,
384384
GISDNodeXFormEquiv<imm_not_XFORM>;

‎llvm/lib/Target/ARM/ARMInstrThumb2.td‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ def t2_so_imm_not_XFORM : SDNodeXForm<imm, [{
7777

7878
// t2_so_imm_neg_XFORM - Return the negation of a t2_so_imm value
7979
def t2_so_imm_neg_XFORM : SDNodeXForm<imm, [{
80-
return CurDAG->getSignedConstant(-((int)N->getZExtValue()), SDLoc(N),
81-
MVT::i32, /*isTarget=*/true);
80+
return CurDAG->getSignedTargetConstant(-((int)N->getZExtValue()), SDLoc(N),
81+
MVT::i32);
8282
}]>;
8383

8484
// so_imm_notSext_XFORM - Return a so_imm value packed into the format

0 commit comments

Comments
 (0)