Author: hans
Date: Mon Aug 22 16:04:17 2016
New Revision: 279474
URL: http://llvm.org/viewvc/llvm-project?rev=279474&view=rev
Log:
Merging r279369 and update the test:
------------------------------------------------------------------------
r279369 | mssimpso | 2016-08-20 07:10:06 -0700 (Sat, 20 Aug 2016) | 1 line
[SLP] Add command line option for minimum tree size (NFC)
------------------------------------------------------------------------
Modified:
llvm/branches/release_39/ (props changed)
llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 16:04:17 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,277773,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,277773,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125,279369
Modified: llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp?rev=279474&r1=279473&r2=279474&view=diff
==============================================================================
--- llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp
(original)
+++ llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp Mon Aug
22 16:04:17 2016
@@ -86,6 +86,10 @@ static cl::opt<unsigned> RecursionMaxDep
"slp-recursion-max-depth", cl::init(12), cl::Hidden,
cl::desc("Limit the recursion depth when building a vectorizable tree"));
+static cl::opt<unsigned> MinTreeSize(
+ "slp-min-tree-size", cl::init(3), cl::Hidden,
+ cl::desc("Only vectorize small trees if they are fully vectorizable"));
+
// Limit the number of alias checks. The limit is chosen so that
// it has no negative effect on the llvm benchmarks.
static const unsigned AliasedCheckLimit = 10;
@@ -1843,7 +1847,7 @@ int BoUpSLP::getTreeCost() {
VectorizableTree.size() << ".\n");
// We only vectorize tiny trees if it is fully vectorizable.
- if (VectorizableTree.size() < 3 && !isFullyVectorizableTinyTree()) {
+ if (VectorizableTree.size() < MinTreeSize && !isFullyVectorizableTinyTree())
{
if (VectorizableTree.empty()) {
assert(!ExternalUses.size() && "We should not have any external users");
}
Modified:
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll?rev=279474&r1=279473&r2=279474&view=diff
==============================================================================
---
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
(original)
+++
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
Mon Aug 22 16:04:17 2016
@@ -1,5 +1,5 @@
; RUN: opt < %s -slp-vectorizer -S | FileCheck %s --check-prefix=DEFAULT
-; RUN: opt < %s -slp-recursion-max-depth=0 -slp-vectorizer -S | FileCheck %s
--check-prefix=GATHER
+; RUN: opt < %s -slp-schedule-budget=0 -slp-min-tree-size=0 -slp-threshold=-30
-slp-vectorizer -S | FileCheck %s --check-prefix=GATHER
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
target triple = "aarch64--linux-gnu"
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
