diff options
| -rw-r--r-- | include/llvm/IntrinsicsX86.td | 11 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrSSE.td | 10 | ||||
| -rw-r--r-- | lib/VMCore/AutoUpgrade.cpp | 16 | ||||
| -rw-r--r-- | test/Bitcode/sse2_punpck_qdq.ll | 3 | ||||
| -rw-r--r-- | test/Bitcode/sse2_punpck_qdq.ll.bc | bin | 0 -> 576 bytes |
5 files changed, 15 insertions, 25 deletions
diff --git a/include/llvm/IntrinsicsX86.td b/include/llvm/IntrinsicsX86.td index 47c8e19..372f721 100644 --- a/include/llvm/IntrinsicsX86.td +++ b/include/llvm/IntrinsicsX86.td @@ -501,17 +501,6 @@ let TargetPrefix = "x86" in { // All intrinsics start with "llvm.x86.". Intrinsic<[llvm_void_ty], [IntrWriteMem]>; } -// Shuffles. -// FIXME: Temporary workarounds since 2-wide shuffle is broken. -let TargetPrefix = "x86" in { // All intrinsics start with "llvm.x86.". - def int_x86_sse2_punpckh_qdq : GCCBuiltin<"__builtin_ia32_punpckhqdq128">, - Intrinsic<[llvm_v2i64_ty, llvm_v2i64_ty, - llvm_v2i64_ty], [IntrNoMem]>; - def int_x86_sse2_punpckl_qdq : GCCBuiltin<"__builtin_ia32_punpcklqdq128">, - Intrinsic<[llvm_v2i64_ty, llvm_v2i64_ty, - llvm_v2i64_ty], [IntrNoMem]>; -} - //===----------------------------------------------------------------------===// // SSE3 diff --git a/lib/Target/X86/X86InstrSSE.td b/lib/Target/X86/X86InstrSSE.td index 8e6d9df..e995807 100644 --- a/lib/Target/X86/X86InstrSSE.td +++ b/lib/Target/X86/X86InstrSSE.td @@ -3050,16 +3050,6 @@ def : Pat<(v2f64 (vector_shuffle immAllZerosV_bc, VR128:$src, def : Pat<(v2f64 (X86vzmovl (v2f64 VR128:$src))), (MOVZPQILo2PQIrr VR128:$src)>, Requires<[HasSSE2]>; -// FIXME: Temporary workaround since 2-wide shuffle is broken. -def : Pat<(int_x86_sse2_punpckh_qdq VR128:$src1, VR128:$src2), - (v2i64 (PUNPCKHQDQrr VR128:$src1, VR128:$src2))>, Requires<[HasSSE2]>; -def : Pat<(int_x86_sse2_punpckh_qdq VR128:$src1, (memop addr:$src2)), - (v2i64 (PUNPCKHQDQrm VR128:$src1, addr:$src2))>, Requires<[HasSSE2]>; -def : Pat<(int_x86_sse2_punpckl_qdq VR128:$src1, VR128:$src2), - (v2i64 (PUNPCKLQDQrr VR128:$src1, VR128:$src2))>, Requires<[HasSSE2]>; -def : Pat<(int_x86_sse2_punpckl_qdq VR128:$src1, (memop addr:$src2)), - (PUNPCKLQDQrm VR128:$src1, addr:$src2)>, Requires<[HasSSE2]>; - // Some special case pandn patterns. def : Pat<(v2i64 (and (xor VR128:$src1, (bc_v2i64 (v4i32 immAllOnesV))), VR128:$src2)), diff --git a/lib/VMCore/AutoUpgrade.cpp b/lib/VMCore/AutoUpgrade.cpp index 0d6ae43..2f1e07c 100644 --- a/lib/VMCore/AutoUpgrade.cpp +++ b/lib/VMCore/AutoUpgrade.cpp @@ -154,7 +154,9 @@ static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) { Name.compare(5,15,"x86.sse2.movs.d",15) == 0 || Name.compare(5,16,"x86.sse2.shuf.pd",16) == 0 || Name.compare(5,18,"x86.sse2.unpckh.pd",18) == 0 || - Name.compare(5,18,"x86.sse2.unpckl.pd",18) == 0 ) { + Name.compare(5,18,"x86.sse2.unpckl.pd",18) == 0 || + Name.compare(5,20,"x86.sse2.punpckh.qdq",20) == 0 || + Name.compare(5,20,"x86.sse2.punpckl.qdq",20) == 0) { // Calls to these intrinsics are transformed into ShuffleVector's. NewFn = 0; return true; @@ -193,6 +195,7 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { bool isLoadH = false, isLoadL = false, isMovL = false; bool isMovSD = false, isShufPD = false; bool isUnpckhPD = false, isUnpcklPD = false; + bool isPunpckhQPD = false, isPunpcklQPD = false; if (strcmp(F->getNameStart(), "llvm.x86.sse2.loadh.pd") == 0) isLoadH = true; else if (strcmp(F->getNameStart(), "llvm.x86.sse2.loadl.pd") == 0) @@ -207,9 +210,13 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { isUnpckhPD = true; else if (strcmp(F->getNameStart(), "llvm.x86.sse2.unpckl.pd") == 0) isUnpcklPD = true; + else if (strcmp(F->getNameStart(), "llvm.x86.sse2.punpckh.qdq") == 0) + isPunpckhQPD = true; + else if (strcmp(F->getNameStart(), "llvm.x86.sse2.punpckl.qdq") == 0) + isPunpcklQPD = true; if (isLoadH || isLoadL || isMovL || isMovSD || isShufPD || - isUnpckhPD || isUnpcklPD) { + isUnpckhPD || isUnpcklPD || isPunpckhQPD || isPunpcklQPD) { std::vector<Constant*> Idxs; Value *Op0 = CI->getOperand(1); ShuffleVectorInst *SI = NULL; @@ -246,12 +253,13 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { Idxs.push_back(ConstantInt::get(Type::Int32Ty, 3)); Value *Mask = ConstantVector::get(Idxs); SI = new ShuffleVectorInst(ZeroV, Op0, Mask, "upgraded.", CI); - } else if (isMovSD || isUnpckhPD || isUnpcklPD) { + } else if (isMovSD || + isUnpckhPD || isUnpcklPD || isPunpckhQPD || isPunpcklQPD) { Value *Op1 = CI->getOperand(2); if (isMovSD) { Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2)); Idxs.push_back(ConstantInt::get(Type::Int32Ty, 1)); - } else if (isUnpckhPD) { + } else if (isUnpckhPD || isPunpckhQPD) { Idxs.push_back(ConstantInt::get(Type::Int32Ty, 1)); Idxs.push_back(ConstantInt::get(Type::Int32Ty, 3)); } else { diff --git a/test/Bitcode/sse2_punpck_qdq.ll b/test/Bitcode/sse2_punpck_qdq.ll new file mode 100644 index 0000000..b9d711c --- /dev/null +++ b/test/Bitcode/sse2_punpck_qdq.ll @@ -0,0 +1,3 @@ +; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.punpckh.qdq} +; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.punpckl.qdq} +; RUN: llvm-dis < %s.bc | grep shufflevector diff --git a/test/Bitcode/sse2_punpck_qdq.ll.bc b/test/Bitcode/sse2_punpck_qdq.ll.bc Binary files differnew file mode 100644 index 0000000..7c1b7ed --- /dev/null +++ b/test/Bitcode/sse2_punpck_qdq.ll.bc |