Drop -polly-vectorizer-unroll-only option

This options was earlier used for experiments with the vectorizer, but to my
knowledge is not really used anymore. If anybody needs this, we can always
reintroduce this feature.

llvm-svn: 232934

diff --git a/polly/include/polly/CodeGen/CodeGeneration.h b/polly/include/polly/CodeGen/CodeGeneration.h
index a4b8712..bb905ee 100644 (file)
--- a/polly/include/polly/CodeGen/CodeGeneration.h
+++ b/polly/include/polly/CodeGen/CodeGeneration.h
@@ -22,7 +22,6 @@ enum VectorizerChoice {
   VECTORIZER_NONE,
   VECTORIZER_STRIPMINE,
   VECTORIZER_POLLY,
-  VECTORIZER_UNROLL_ONLY
 };
 extern VectorizerChoice PollyVectorizerChoice;
 

diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp
index ed48e9e..0e04235 100644 (file)
--- a/polly/lib/CodeGen/BlockGenerators.cpp
+++ b/polly/lib/CodeGen/BlockGenerators.cpp
@@ -451,8 +451,7 @@ Value *VectorBlockGenerator::generateUnknownStrideLoad(
 void VectorBlockGenerator::generateLoad(ScopStmt &Stmt, const LoadInst *Load,
                                         ValueMapT &VectorMap,
                                         VectorValueMapT &ScalarMaps) {
-  if (PollyVectorizerChoice == VECTORIZER_UNROLL_ONLY ||
-      !VectorType::isValidElementType(Load->getType())) {
+  if (!VectorType::isValidElementType(Load->getType())) {
     for (int i = 0; i < getVectorWidth(); i++)
       ScalarMaps[i][Load] =
           generateScalarLoad(Stmt, Load, ScalarMaps[i], GlobalMaps[i], VLTS[i]);

diff --git a/polly/lib/Support/RegisterPasses.cpp b/polly/lib/Support/RegisterPasses.cpp
index c0d2687..60b694c 100644 (file)
--- a/polly/lib/Support/RegisterPasses.cpp
+++ b/polly/lib/Support/RegisterPasses.cpp
@@ -82,8 +82,6 @@ static cl::opt<polly::VectorizerChoice, true> Vectorizer(
                    "Polly internal vectorizer"),
         clEnumValN(polly::VECTORIZER_STRIPMINE, "stripmine",
                    "Strip-mine outer loops for the loop-vectorizer to trigger"),
-        clEnumValN(polly::VECTORIZER_UNROLL_ONLY, "unroll-only",
-                   "Only grouped unroll the vectorize candidate loops"),
         clEnumValEnd),
     cl::location(PollyVectorizerChoice), cl::init(polly::VECTORIZER_NONE),
     cl::ZeroOrMore, cl::cat(PollyCategory));

diff --git a/polly/test/Isl/CodeGen/20130211-getNumberOfIterations.ll b/polly/test/Isl/CodeGen/20130211-getNumberOfIterations.ll
index 5470317..8fd0606 100644 (file)
--- a/polly/test/Isl/CodeGen/20130211-getNumberOfIterations.ll
+++ b/polly/test/Isl/CodeGen/20130211-getNumberOfIterations.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl -polly-vectorizer=polly < %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl -polly-vectorizer=unroll-only < %s
 
 ; This test case checks that the polly vectorizer does not crash when
 ; calculating the number of iterations.