[polly] r235861 - Remove flag '-polly-annotate-alias-scopes'

[Tobias Grosser]

Author: grosser
Date: Mon Apr 27 05:43:10 2015
New Revision: 235861

URL: http://llvm.org/viewvc/llvm-project?rev=235861&view=rev
Log:
Remove flag '-polly-annotate-alias-scopes'

This option is enabled since a long time and there does not seem to be a
situation in which we would not want to print alias scopes. Remove this option
to reduce the set of command-line option combinations that may expose bugs.

Modified:
    polly/trunk/include/polly/CodeGen/CodeGeneration.h
    polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
    polly/trunk/lib/Support/RegisterPasses.cpp
    polly/trunk/test/Isl/CodeGen/annotated_alias_scopes.ll

Modified: polly/trunk/include/polly/CodeGen/CodeGeneration.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/CodeGeneration.h?rev=235861&r1=235860&r2=235861&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/CodeGeneration.h (original)
+++ polly/trunk/include/polly/CodeGen/CodeGeneration.h Mon Apr 27 05:43:10 2015
@@ -27,9 +27,6 @@ extern VectorizerChoice PollyVectorizerC
 
 enum CodeGenChoice { CODEGEN_ISL, CODEGEN_NONE };
 extern CodeGenChoice PollyCodeGenChoice;
-
-/// @brief Flag to turn on/off annotation of alias scopes.
-extern bool PollyAnnotateAliasScopes;
 }
 
 #endif // POLLY_CODEGENERATION_H

Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=235861&r1=235860&r2=235861&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Mon Apr 27 05:43:10 2015
@@ -1007,9 +1007,7 @@ public:
     assert(!S.getRegion().isTopLevelRegion() &&
            "Top level regions are not supported");
 
-    // Build the alias scopes for annotations first.
-    if (PollyAnnotateAliasScopes)
-      Annotator.buildAliasScopes(S);
+    Annotator.buildAliasScopes(S);
 
     BasicBlock *EnteringBB = simplifyRegion(&S, this);
     PollyIRBuilder Builder = createPollyIRBuilder(EnteringBB, Annotator);

Modified: polly/trunk/lib/Support/RegisterPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Support/RegisterPasses.cpp?rev=235861&r1=235860&r2=235861&view=diff
==============================================================================
--- polly/trunk/lib/Support/RegisterPasses.cpp (original)
+++ polly/trunk/lib/Support/RegisterPasses.cpp Mon Apr 27 05:43:10 2015
@@ -124,13 +124,6 @@ static cl::opt<bool>
                cl::desc("Show the Polly CFG right after code generation"),
                cl::Hidden, cl::init(false), cl::cat(PollyCategory));
 
-bool polly::PollyAnnotateAliasScopes;
-static cl::opt<bool, true> XPollyAnnotateAliasScopes(
-    "polly-annotate-alias-scopes",
-    cl::desc("Annotate memory instructions with alias scopes"),
-    cl::location(PollyAnnotateAliasScopes), cl::init(true), cl::ZeroOrMore,
-    cl::cat(PollyCategory));
-
 namespace polly {
 void initializePollyPasses(PassRegistry &Registry) {
   initializeIslCodeGenerationPass(Registry);

Modified: polly/trunk/test/Isl/CodeGen/annotated_alias_scopes.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/annotated_alias_scopes.ll?rev=235861&r1=235860&r2=235861&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/annotated_alias_scopes.ll (original)
+++ polly/trunk/test/Isl/CodeGen/annotated_alias_scopes.ll Mon Apr 27 05:43:10 2015
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-codegen-isl -S < %s | FileCheck %s --check-prefix=SCOPES
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-codegen-isl -polly-annotate-alias-scopes=false -S < %s | FileCheck %s --check-prefix=NOSCOPES
 ;
 ; Check that we create alias scopes that indicate the accesses to A, B and C cannot alias in any way.
 ;
@@ -27,21 +26,6 @@
 ; SCOPES-DAG:     ![[AliasScopeC]]
 ; SCOPES:       }
 ;
-; NOSCOPES:    %[[BIdx:[._a-zA-Z0-9]*]] = getelementptr{{.*}} i32* %B, i64 %polly.indvar
-; NOSCOPES:    load i32, i32* %[[BIdx]]
-; NOSCOPES-NOT: alias.scope
-; NOSCOPES-NOT: noalias
-; NOSCOPES:    %[[CIdx:[._a-zA-Z0-9]*]] = getelementptr{{.*}} float* %C, i64 %polly.indvar
-; NOSCOPES:    load float, float* %[[CIdx]]
-; NOSCOPES-NOT: alias.scope
-; NOSCOPES-NOT: noalias
-; NOSCOPES:    %[[AIdx:[._a-zA-Z0-9]*]] = getelementptr{{.*}} i32* %A, i64 %polly.indvar
-; NOSCOPES:    store i32 %{{[._a-zA-Z0-9]*}}, i32* %[[AIdx]]
-; NOSCOPES-NOT: alias.scope
-; NOSCOPES-NOT: noalias
-;
-; NOSCOPES-NOT: !
-;
 ;    void jd(int *A, int *B, float *C) {
 ;      for (int i = 0; i < 1024; i++)
 ;        A[i] = B[i] + C[i];