[llvm-commits] [llvm] r154734 - in /llvm/trunk: include/llvm/Transforms/Vectorize.h lib/Transforms/Vectorize/BBVectorize.cpp test/Transforms/BBVectorize/simple-ldstr-ptrs.ll
Hal Finkel
hfinkel at anl.gov
Sat Apr 14 00:32:43 PDT 2012
Author: hfinkel
Date: Sat Apr 14 02:32:43 2012
New Revision: 154734
URL: http://llvm.org/viewvc/llvm-project?rev=154734&view=rev
Log:
Enhance BBVectorize to more-properly handle pointer values and vectorize GEPs.
Added:
llvm/trunk/test/Transforms/BBVectorize/simple-ldstr-ptrs.ll
Modified:
llvm/trunk/include/llvm/Transforms/Vectorize.h
llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp
Modified: llvm/trunk/include/llvm/Transforms/Vectorize.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Vectorize.h?rev=154734&r1=154733&r2=154734&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Vectorize.h (original)
+++ llvm/trunk/include/llvm/Transforms/Vectorize.h Sat Apr 14 02:32:43 2012
@@ -34,6 +34,9 @@
/// @brief Vectorize floating-point values.
bool VectorizeFloats;
+ /// @brief Vectorize pointer values.
+ bool VectorizePointers;
+
/// @brief Vectorize casting (conversion) operations.
bool VectorizeCasts;
@@ -46,6 +49,9 @@
/// @brief Vectorize select instructions.
bool VectorizeSelect;
+ /// @brief Vectorize getelementptr instructions.
+ bool VectorizeGEP;
+
/// @brief Vectorize loads and stores.
bool VectorizeMemOps;
Modified: llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp?rev=154734&r1=154733&r2=154734&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp (original)
+++ llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp Sat Apr 14 02:32:43 2012
@@ -84,6 +84,10 @@
cl::desc("Don't try to vectorize floating-point values"));
static cl::opt<bool>
+NoPointers("bb-vectorize-no-pointers", cl::init(false), cl::Hidden,
+ cl::desc("Don't try to vectorize pointer values"));
+
+static cl::opt<bool>
NoCasts("bb-vectorize-no-casts", cl::init(false), cl::Hidden,
cl::desc("Don't try to vectorize casting (conversion) operations"));
@@ -100,6 +104,10 @@
cl::desc("Don't try to vectorize select instructions"));
static cl::opt<bool>
+NoGEP("bb-vectorize-no-gep", cl::init(false), cl::Hidden,
+ cl::desc("Don't try to vectorize getelementptr instructions"));
+
+static cl::opt<bool>
NoMemOps("bb-vectorize-no-mem-ops", cl::init(false), cl::Hidden,
cl::desc("Don't try to vectorize loads and stores"));
@@ -550,15 +558,22 @@
return false;
Type *SrcTy = C->getSrcTy();
- if (!SrcTy->isSingleValueType() || SrcTy->isPointerTy())
+ if (!SrcTy->isSingleValueType())
return false;
Type *DestTy = C->getDestTy();
- if (!DestTy->isSingleValueType() || DestTy->isPointerTy())
+ if (!DestTy->isSingleValueType())
return false;
} else if (isa<SelectInst>(I)) {
if (!Config.VectorizeSelect)
return false;
+ } else if (GetElementPtrInst *G = dyn_cast<GetElementPtrInst>(I)) {
+ if (!Config.VectorizeGEP)
+ return false;
+
+ // Currently, vector GEPs exist only with one index.
+ if (G->getNumIndices() != 1)
+ return false;
} else if (!(I->isBinaryOp() || isa<ShuffleVectorInst>(I) ||
isa<ExtractElementInst>(I) || isa<InsertElementInst>(I))) {
return false;
@@ -597,6 +612,14 @@
&& (T1->isFPOrFPVectorTy() || T2->isFPOrFPVectorTy()))
return false;
+ if ((!Config.VectorizePointers || TD == 0)
+ && ((T1->isPointerTy() ||
+ (T1->isVectorTy() && T1->getScalarType()->isPointerTy())) ||
+ (T2->isPointerTy() ||
+ (T2->isVectorTy() && T2->getScalarType()->isPointerTy()))
+ ))
+ return false;
+
if (T1->getPrimitiveSizeInBits() > Config.VectorBits/2 ||
T2->getPrimitiveSizeInBits() > Config.VectorBits/2)
return false;
@@ -1898,10 +1921,12 @@
VectorBits = ::VectorBits;
VectorizeInts = !::NoInts;
VectorizeFloats = !::NoFloats;
+ VectorizePointers = !::NoPointers;
VectorizeCasts = !::NoCasts;
VectorizeMath = !::NoMath;
VectorizeFMA = !::NoFMA;
VectorizeSelect = !::NoSelect;
+ VectorizeGEP = !::NoGEP;
VectorizeMemOps = !::NoMemOps;
AlignedOnly = ::AlignedOnly;
ReqChainDepth= ::ReqChainDepth;
Added: llvm/trunk/test/Transforms/BBVectorize/simple-ldstr-ptrs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/BBVectorize/simple-ldstr-ptrs.ll?rev=154734&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/BBVectorize/simple-ldstr-ptrs.ll (added)
+++ llvm/trunk/test/Transforms/BBVectorize/simple-ldstr-ptrs.ll Sat Apr 14 02:32:43 2012
@@ -0,0 +1,81 @@
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
+; RUN: opt < %s -bb-vectorize -bb-vectorize-req-chain-depth=3 -instcombine -gvn -S | FileCheck %s
+; RUN: opt < %s -bb-vectorize -bb-vectorize-req-chain-depth=3 -bb-vectorize-aligned-only -instcombine -gvn -S | FileCheck %s -check-prefix=CHECK-AO
+
+; Simple 3-pair chain also with loads and stores (using ptrs and gep)
+define double @test1(i64* %a, i64* %b, i64* %c) nounwind uwtable readonly {
+entry:
+ %i0 = load i64* %a, align 8
+ %i1 = load i64* %b, align 8
+ %mul = mul i64 %i0, %i1
+ %arrayidx3 = getelementptr inbounds i64* %a, i64 1
+ %i3 = load i64* %arrayidx3, align 8
+ %arrayidx4 = getelementptr inbounds i64* %b, i64 1
+ %i4 = load i64* %arrayidx4, align 8
+ %mul5 = mul i64 %i3, %i4
+ %ptr = inttoptr i64 %mul to double*
+ %ptr5 = inttoptr i64 %mul5 to double*
+ %aptr = getelementptr inbounds double* %ptr, i64 2
+ %aptr5 = getelementptr inbounds double* %ptr5, i64 3
+ %av = load double* %aptr, align 16
+ %av5 = load double* %aptr5, align 16
+ %r = fmul double %av, %av5
+ store i64 %mul, i64* %c, align 8
+ %arrayidx5 = getelementptr inbounds i64* %c, i64 1
+ store i64 %mul5, i64* %arrayidx5, align 8
+ ret double %r
+; CHECK: @test1
+; CHECK: %i0.v.i0 = bitcast i64* %a to <2 x i64>*
+; CHECK: %i1.v.i0 = bitcast i64* %b to <2 x i64>*
+; CHECK: %i0 = load <2 x i64>* %i0.v.i0, align 8
+; CHECK: %i1 = load <2 x i64>* %i1.v.i0, align 8
+; CHECK: %mul = mul <2 x i64> %i0, %i1
+; CHECK: %ptr = inttoptr <2 x i64> %mul to <2 x double*>
+; CHECK: %aptr = getelementptr inbounds <2 x double*> %ptr, <2 x i64> <i64 2, i64 3>
+; CHECK: %aptr.v.r1 = extractelement <2 x double*> %aptr, i32 0
+; CHECK: %aptr.v.r2 = extractelement <2 x double*> %aptr, i32 1
+; CHECK: %av = load double* %aptr.v.r1, align 16
+; CHECK: %av5 = load double* %aptr.v.r2, align 16
+; CHECK: %r = fmul double %av, %av5
+; CHECK: %0 = bitcast i64* %c to <2 x i64>*
+; CHECK: store <2 x i64> %mul, <2 x i64>* %0, align 8
+; CHECK: ret double %r
+; CHECK-AO: @test1
+; CHECK-AO-NOT: load <2 x
+}
+
+; Simple 3-pair chain with loads and stores (using ptrs and gep)
+define void @test2(i64** %a, i64** %b, i64** %c) nounwind uwtable readonly {
+entry:
+ %i0 = load i64** %a, align 8
+ %i1 = load i64** %b, align 8
+ %arrayidx3 = getelementptr inbounds i64** %a, i64 1
+ %i3 = load i64** %arrayidx3, align 8
+ %arrayidx4 = getelementptr inbounds i64** %b, i64 1
+ %i4 = load i64** %arrayidx4, align 8
+ %o1 = load i64* %i1, align 8
+ %o4 = load i64* %i4, align 8
+ %ptr0 = getelementptr inbounds i64* %i0, i64 %o1
+ %ptr3 = getelementptr inbounds i64* %i3, i64 %o4
+ store i64* %ptr0, i64** %c, align 8
+ %arrayidx5 = getelementptr inbounds i64** %c, i64 1
+ store i64* %ptr3, i64** %arrayidx5, align 8
+ ret void
+; CHECK: @test2
+; CHECK: %i0.v.i0 = bitcast i64** %a to <2 x i64*>*
+; CHECK: %i1 = load i64** %b, align 8
+; CHECK: %i0 = load <2 x i64*>* %i0.v.i0, align 8
+; CHECK: %arrayidx4 = getelementptr inbounds i64** %b, i64 1
+; CHECK: %i4 = load i64** %arrayidx4, align 8
+; CHECK: %o1 = load i64* %i1, align 8
+; CHECK: %o4 = load i64* %i4, align 8
+; CHECK: %ptr0.v.i1.1 = insertelement <2 x i64> undef, i64 %o1, i32 0
+; CHECK: %ptr0.v.i1.2 = insertelement <2 x i64> %ptr0.v.i1.1, i64 %o4, i32 1
+; CHECK: %ptr0 = getelementptr inbounds <2 x i64*> %i0, <2 x i64> %ptr0.v.i1.2
+; CHECK: %0 = bitcast i64** %c to <2 x i64*>*
+; CHECK: store <2 x i64*> %ptr0, <2 x i64*>* %0, align 8
+; CHECK: ret void
+; CHECK-AO: @test2
+; CHECK-AO-NOT: <2 x
+}
+
More information about the llvm-commits
mailing list