[llvm] r176513 - reverting patch 176508.
Jyotsna Verma
jverma at codeaurora.org
Tue Mar 5 12:29:23 PST 2013
Author: jverma
Date: Tue Mar 5 14:29:23 2013
New Revision: 176513
URL: http://llvm.org/viewvc/llvm-project?rev=176513&view=rev
Log:
reverting patch 176508.
Removed:
llvm/trunk/test/CodeGen/Hexagon/block-addr.ll
llvm/trunk/test/CodeGen/Hexagon/indirect-br.ll
Modified:
llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.cpp
llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h
llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.td
llvm/trunk/lib/Target/Hexagon/HexagonInstrInfoV4.td
Modified: llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.cpp?rev=176513&r1=176512&r2=176513&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.cpp Tue Mar 5 14:29:23 2013
@@ -1024,14 +1024,6 @@ SDValue HexagonTargetLowering::LowerGLOB
return DAG.getNode(HexagonISD::CONST32, dl, getPointerTy(), Result);
}
-SDValue
-HexagonTargetLowering::LowerBlockAddress(SDValue Op, SelectionDAG &DAG) const {
- const BlockAddress *BA = cast<BlockAddressSDNode>(Op)->getBlockAddress();
- SDValue BA_SD = DAG.getTargetBlockAddress(BA, MVT::i32);
- DebugLoc dl = Op.getDebugLoc();
- return DAG.getNode(HexagonISD::CONST32_GP, dl, getPointerTy(), BA_SD);
-}
-
//===----------------------------------------------------------------------===//
// TargetLowering Implementation
//===----------------------------------------------------------------------===//
@@ -1305,7 +1297,6 @@ HexagonTargetLowering::HexagonTargetLowe
// Custom legalize GlobalAddress nodes into CONST32.
setOperationAction(ISD::GlobalAddress, MVT::i32, Custom);
setOperationAction(ISD::GlobalAddress, MVT::i8, Custom);
- setOperationAction(ISD::BlockAddress, MVT::i32, Custom);
// Truncate action?
setOperationAction(ISD::TRUNCATE, MVT::i64, Expand);
@@ -1468,8 +1459,6 @@ HexagonTargetLowering::getTargetNodeName
switch (Opcode) {
default: return 0;
case HexagonISD::CONST32: return "HexagonISD::CONST32";
- case HexagonISD::CONST32_GP: return "HexagonISD::CONST32_GP";
- case HexagonISD::CONST32_Int_Real: return "HexagonISD::CONST32_Int_Real";
case HexagonISD::ADJDYNALLOC: return "HexagonISD::ADJDYNALLOC";
case HexagonISD::CMPICC: return "HexagonISD::CMPICC";
case HexagonISD::CMPFCC: return "HexagonISD::CMPFCC";
@@ -1518,7 +1507,6 @@ HexagonTargetLowering::LowerOperation(SD
case ISD::MEMBARRIER: return LowerMEMBARRIER(Op, DAG);
case ISD::ATOMIC_FENCE: return LowerATOMIC_FENCE(Op, DAG);
case ISD::GlobalAddress: return LowerGLOBALADDRESS(Op, DAG);
- case ISD::BlockAddress: return LowerBlockAddress(Op, DAG);
case ISD::VASTART: return LowerVASTART(Op, DAG);
case ISD::BR_JT: return LowerBR_JT(Op, DAG);
Modified: llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h?rev=176513&r1=176512&r2=176513&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h Tue Mar 5 14:29:23 2013
@@ -27,7 +27,6 @@ namespace llvm {
CONST32,
CONST32_GP, // For marking data present in GP.
- CONST32_Int_Real,
FCONST32,
SETCC,
ADJDYNALLOC,
@@ -107,7 +106,6 @@ namespace llvm {
DebugLoc dl, SelectionDAG &DAG,
SmallVectorImpl<SDValue> &InVals) const;
SDValue LowerGLOBALADDRESS(SDValue Op, SelectionDAG &DAG) const;
- SDValue LowerBlockAddress(SDValue Op, SelectionDAG &DAG) const;
SDValue LowerCall(TargetLowering::CallLoweringInfo &CLI,
SmallVectorImpl<SDValue> &InVals) const;
Modified: llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.td?rev=176513&r1=176512&r2=176513&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.td (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.td Tue Mar 5 14:29:23 2013
@@ -2076,10 +2076,6 @@ def CONST32_Int_Real : LDInst2<(outs Int
"$dst = CONST32(#$global)",
[(set (i32 IntRegs:$dst), imm:$global) ]>;
-// Map BlockAddress lowering to CONST32_Int_Real
-def : Pat<(HexagonCONST32_GP tblockaddress:$addr),
- (CONST32_Int_Real tblockaddress:$addr)>;
-
let isReMaterializable = 1, isMoveImm = 1 in
def CONST32_Label : LDInst2<(outs IntRegs:$dst), (ins bblabel:$label),
"$dst = CONST32($label)",
@@ -3050,11 +3046,6 @@ def BR_JT : JRInst<(outs), (ins IntRegs:
"jumpr $src",
[(HexagonBR_JT (i32 IntRegs:$src))]>;
-let isBranch=1, isIndirectBranch=1, isTerminator=1 in
-def BRIND : JRInst<(outs), (ins IntRegs:$src),
- "jumpr $src",
- [(brind (i32 IntRegs:$src))]>;
-
def HexagonWrapperJT: SDNode<"HexagonISD::WrapperJT", SDTIntUnaryOp>;
def : Pat<(HexagonWrapperJT tjumptable:$dst),
Modified: llvm/trunk/lib/Target/Hexagon/HexagonInstrInfoV4.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonInstrInfoV4.td?rev=176513&r1=176512&r2=176513&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonInstrInfoV4.td (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonInstrInfoV4.td Tue Mar 5 14:29:23 2013
@@ -3790,11 +3790,6 @@ def TFRI_V4 : ALU32_ri<(outs IntRegs:$ds
[(set IntRegs:$dst, (HexagonCONST32 tglobaladdr:$src1))]>,
Requires<[HasV4T]>;
-// Transfer a block address into a register
-def : Pat<(HexagonCONST32_GP tblockaddress:$src1),
- (TFRI_V4 tblockaddress:$src1)>,
- Requires<[HasV4T]>;
-
let AddedComplexity=50, neverHasSideEffects = 1, isPredicated = 1 in
def TFRI_cPt_V4 : ALU32_ri<(outs IntRegs:$dst),
(ins PredRegs:$src1, globaladdress:$src2),
Removed: llvm/trunk/test/CodeGen/Hexagon/block-addr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/block-addr.ll?rev=176512&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/block-addr.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/block-addr.ll (removed)
@@ -1,64 +0,0 @@
-; RUN: llc -march=hexagon < %s | FileCheck %s
-
-; CHECK: r{{[0-9]+}} = CONST32(#.LJTI{{[0-9]+_[0-9]+}})
-; CHECK: r{{[0-9]+}} = memw(r{{[0-9]+}}+r{{[0-9]+<<#[0-9]+}})
-; CHECK: jumpr r{{[0-9]+}}
-
-define void @main() #0 {
-entry:
- %ret = alloca i32, align 4
- br label %while.body
-
-while.body:
- %ret.0.load17 = load volatile i32* %ret, align 4
- switch i32 %ret.0.load17, label %label6 [
- i32 0, label %label0
- i32 1, label %label1
- i32 2, label %label2
- i32 3, label %label3
- i32 4, label %label4
- i32 5, label %label5
- ]
-
-label0:
- %ret.0.load18 = load volatile i32* %ret, align 4
- %inc = add nsw i32 %ret.0.load18, 1
- store volatile i32 %inc, i32* %ret, align 4
- br label %while.body
-
-label1:
- %ret.0.load19 = load volatile i32* %ret, align 4
- %inc2 = add nsw i32 %ret.0.load19, 1
- store volatile i32 %inc2, i32* %ret, align 4
- br label %while.body
-
-label2:
- %ret.0.load20 = load volatile i32* %ret, align 4
- %inc4 = add nsw i32 %ret.0.load20, 1
- store volatile i32 %inc4, i32* %ret, align 4
- br label %while.body
-
-label3:
- %ret.0.load21 = load volatile i32* %ret, align 4
- %inc6 = add nsw i32 %ret.0.load21, 1
- store volatile i32 %inc6, i32* %ret, align 4
- br label %while.body
-
-label4:
- %ret.0.load22 = load volatile i32* %ret, align 4
- %inc8 = add nsw i32 %ret.0.load22, 1
- store volatile i32 %inc8, i32* %ret, align 4
- br label %while.body
-
-label5:
- %ret.0.load23 = load volatile i32* %ret, align 4
- %inc10 = add nsw i32 %ret.0.load23, 1
- store volatile i32 %inc10, i32* %ret, align 4
- br label %while.body
-
-label6:
- store volatile i32 0, i32* %ret, align 4
- br label %while.body
-}
-
-attributes #0 = { noreturn nounwind "target-cpu"="hexagonv4" }
Removed: llvm/trunk/test/CodeGen/Hexagon/indirect-br.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/indirect-br.ll?rev=176512&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/indirect-br.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/indirect-br.ll (removed)
@@ -1,14 +0,0 @@
-; RUN: llc -march=hexagon < %s | FileCheck %s
-
-;CHECK: jumpr r{{[0-9]+}}
-
-define i32 @check_indirect_br(i8* %target) nounwind {
-entry:
- indirectbr i8* %target, [label %test_label]
-
-test_label:
- br label %ret
-
-ret:
- ret i32 -1
-}
\ No newline at end of file
More information about the llvm-commits
mailing list