[polly] r232099 - Drop option to prepare code for the BB vectorizer

[Tobias Grosser]

Author: grosser
Date: Thu Mar 12 15:47:58 2015
New Revision: 232099

URL: http://llvm.org/viewvc/llvm-project?rev=232099&view=rev
Log:
Drop option to prepare code for the BB vectorizer

The BB vectorizer is deprecated and there is no point in generating code for it
any more. This option was introduced when there was not yet any loop vectorizer
in sight. Now being matured, Polly should target the loop vectorizer.

Modified:
    polly/trunk/include/polly/CodeGen/CodeGeneration.h
    polly/trunk/lib/CodeGen/BlockGenerators.cpp
    polly/trunk/lib/Support/RegisterPasses.cpp
    polly/trunk/test/Isl/CodeGen/20130211-getNumberOfIterations.ll

Modified: polly/trunk/include/polly/CodeGen/CodeGeneration.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/CodeGeneration.h?rev=232099&r1=232098&r2=232099&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/CodeGeneration.h (original)
+++ polly/trunk/include/polly/CodeGen/CodeGeneration.h Thu Mar 12 15:47:58 2015
@@ -21,9 +21,7 @@ namespace polly {
 enum VectorizerChoice {
   VECTORIZER_NONE,
   VECTORIZER_POLLY,
-  VECTORIZER_UNROLL_ONLY,
-  VECTORIZER_FIRST_NEED_GROUPED_UNROLL = VECTORIZER_UNROLL_ONLY,
-  VECTORIZER_BB
+  VECTORIZER_UNROLL_ONLY
 };
 extern VectorizerChoice PollyVectorizerChoice;
 

Modified: polly/trunk/lib/CodeGen/BlockGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=232099&r1=232098&r2=232099&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/BlockGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/BlockGenerators.cpp Thu Mar 12 15:47:58 2015
@@ -451,7 +451,7 @@ Value *VectorBlockGenerator::generateUnk
 void VectorBlockGenerator::generateLoad(ScopStmt &Stmt, const LoadInst *Load,
                                         ValueMapT &VectorMap,
                                         VectorValueMapT &ScalarMaps) {
-  if (PollyVectorizerChoice >= VECTORIZER_FIRST_NEED_GROUPED_UNROLL ||
+  if (PollyVectorizerChoice == VECTORIZER_UNROLL_ONLY ||
       !VectorType::isValidElementType(Load->getType())) {
     for (int i = 0; i < getVectorWidth(); i++)
       ScalarMaps[i][Load] =

Modified: polly/trunk/lib/Support/RegisterPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Support/RegisterPasses.cpp?rev=232099&r1=232098&r2=232099&view=diff
==============================================================================
--- polly/trunk/lib/Support/RegisterPasses.cpp (original)
+++ polly/trunk/lib/Support/RegisterPasses.cpp Thu Mar 12 15:47:58 2015
@@ -81,8 +81,6 @@ static cl::opt<polly::VectorizerChoice,
                           "Polly internal vectorizer"),
                clEnumValN(polly::VECTORIZER_UNROLL_ONLY, "unroll-only",
                           "Only grouped unroll the vectorize candidate loops"),
-               clEnumValN(polly::VECTORIZER_BB, "bb",
-                          "The Basic Block vectorizer driven by Polly"),
                clEnumValEnd),
     cl::location(PollyVectorizerChoice), cl::init(polly::VECTORIZER_NONE),
     cl::ZeroOrMore, cl::cat(PollyCategory));

Modified: polly/trunk/test/Isl/CodeGen/20130211-getNumberOfIterations.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/20130211-getNumberOfIterations.ll?rev=232099&r1=232098&r2=232099&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/20130211-getNumberOfIterations.ll (original)
+++ polly/trunk/test/Isl/CodeGen/20130211-getNumberOfIterations.ll Thu Mar 12 15:47:58 2015
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl -polly-vectorizer=polly < %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl -polly-vectorizer=bb < %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.