summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-03-08 18:59:49 +0000
committerChris Lattner <sabre@nondot.org>2010-03-08 18:59:49 +0000
commite77f993262aa7d217135651ce4db251484b8a1a3 (patch)
treecad2fec10e314a7eb9e536191312f17ada803b8e
parentd8045649a6e4957b911f68a2ea011f0e7ece845e (diff)
downloadbcm5719-llvm-e77f993262aa7d217135651ce4db251484b8a1a3.tar.gz
bcm5719-llvm-e77f993262aa7d217135651ce4db251484b8a1a3.zip
disambiguate some types, add a fixme about some
inconsistent intrinsics. llvm-svn: 97959
-rw-r--r--llvm/lib/Target/CellSPU/CellSDKIntrinsics.td1
-rw-r--r--llvm/lib/Target/CellSPU/SPUInstrInfo.td2
-rw-r--r--llvm/lib/Target/CellSPU/SPUMathInstr.td6
-rw-r--r--llvm/lib/Target/CellSPU/SPUNodes.td2
4 files changed, 6 insertions, 5 deletions
diff --git a/llvm/lib/Target/CellSPU/CellSDKIntrinsics.td b/llvm/lib/Target/CellSPU/CellSDKIntrinsics.td
index 5d759a41c2c..1fe7aff94a7 100644
--- a/llvm/lib/Target/CellSPU/CellSDKIntrinsics.td
+++ b/llvm/lib/Target/CellSPU/CellSDKIntrinsics.td
@@ -205,6 +205,7 @@ def CellSDKnand:
// Shift/rotate intrinsics:
//===----------------------------------------------------------------------===//
+/* FIXME: These have (currently unenforced) type conflicts. */
def CellSDKshli:
Pat<(int_spu_si_shli (v4i32 VECREG:$rA), uimm7:$val),
(SHLIv4i32 VECREG:$rA, uimm7:$val)>;
diff --git a/llvm/lib/Target/CellSPU/SPUInstrInfo.td b/llvm/lib/Target/CellSPU/SPUInstrInfo.td
index f24ffd2f8d4..b96b64ecd06 100644
--- a/llvm/lib/Target/CellSPU/SPUInstrInfo.td
+++ b/llvm/lib/Target/CellSPU/SPUInstrInfo.td
@@ -2370,7 +2370,7 @@ class ROTHInst<dag OOL, dag IOL, list<dag> pattern>:
class ROTHVecInst<ValueType vectype>:
ROTHInst<(outs VECREG:$rT), (ins VECREG:$rA, VECREG:$rB),
[(set (vectype VECREG:$rT),
- (SPUvec_rotl VECREG:$rA, VECREG:$rB))]>;
+ (SPUvec_rotl VECREG:$rA, (v8i16 VECREG:$rB)))]>;
class ROTHRegInst<RegisterClass rclass>:
ROTHInst<(outs rclass:$rT), (ins rclass:$rA, rclass:$rB),
diff --git a/llvm/lib/Target/CellSPU/SPUMathInstr.td b/llvm/lib/Target/CellSPU/SPUMathInstr.td
index 80ebde3ef25..ed7129e3329 100644
--- a/llvm/lib/Target/CellSPU/SPUMathInstr.td
+++ b/llvm/lib/Target/CellSPU/SPUMathInstr.td
@@ -45,9 +45,9 @@ def : Pat<(mul (v8i16 VECREG:$rA), (v8i16 VECREG:$rB)),
def MPYv4i32:
Pat<(mul (v4i32 VECREG:$rA), (v4i32 VECREG:$rB)),
(Av4i32
- (Av4i32 (MPYHv4i32 VECREG:$rA, VECREG:$rB),
- (MPYHv4i32 VECREG:$rB, VECREG:$rA)),
- (MPYUv4i32 VECREG:$rA, VECREG:$rB))>;
+ (v4i32 (Av4i32 (v4i32 (MPYHv4i32 VECREG:$rA, VECREG:$rB)),
+ (v4i32 (MPYHv4i32 VECREG:$rB, VECREG:$rA)))),
+ (v4i32 (MPYUv4i32 VECREG:$rA, VECREG:$rB)))>;
def MPYi32:
Pat<(mul R32C:$rA, R32C:$rB),
diff --git a/llvm/lib/Target/CellSPU/SPUNodes.td b/llvm/lib/Target/CellSPU/SPUNodes.td
index c722e4b006e..85078616a82 100644
--- a/llvm/lib/Target/CellSPU/SPUNodes.td
+++ b/llvm/lib/Target/CellSPU/SPUNodes.td
@@ -26,7 +26,7 @@ def callseq_end : SDNode<"ISD::CALLSEQ_END", SDT_SPUCallSeq,
// Operand constraints:
//===----------------------------------------------------------------------===//
-def SDT_SPUCall : SDTypeProfile<0, -1, [SDTCisInt<0>]>;
+def SDT_SPUCall : SDTypeProfile<0, -1, [SDTCisPtrTy<0>]>;
def SPUcall : SDNode<"SPUISD::CALL", SDT_SPUCall,
[SDNPHasChain, SDNPOptInFlag, SDNPOutFlag]>;
OpenPOWER on IntegriCloud