diff options
| -rw-r--r-- | polly/include/polly/CodeGen/CodeGeneration.h | 3 | ||||
| -rw-r--r-- | polly/lib/CodeGen/IslCodeGeneration.cpp | 4 | ||||
| -rw-r--r-- | polly/lib/Support/RegisterPasses.cpp | 7 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/annotated_alias_scopes.ll | 16 |
4 files changed, 1 insertions, 29 deletions
diff --git a/polly/include/polly/CodeGen/CodeGeneration.h b/polly/include/polly/CodeGen/CodeGeneration.h index 2fce41ce182..a134784a1af 100644 --- a/polly/include/polly/CodeGen/CodeGeneration.h +++ b/polly/include/polly/CodeGen/CodeGeneration.h @@ -27,9 +27,6 @@ extern VectorizerChoice PollyVectorizerChoice; 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 diff --git a/polly/lib/CodeGen/IslCodeGeneration.cpp b/polly/lib/CodeGen/IslCodeGeneration.cpp index 749c07774e1..7cf5b263667 100644 --- a/polly/lib/CodeGen/IslCodeGeneration.cpp +++ b/polly/lib/CodeGen/IslCodeGeneration.cpp @@ -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); diff --git a/polly/lib/Support/RegisterPasses.cpp b/polly/lib/Support/RegisterPasses.cpp index 95f4bc3c774..b3ffdb143aa 100644 --- a/polly/lib/Support/RegisterPasses.cpp +++ b/polly/lib/Support/RegisterPasses.cpp @@ -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); diff --git a/polly/test/Isl/CodeGen/annotated_alias_scopes.ll b/polly/test/Isl/CodeGen/annotated_alias_scopes.ll index 556223580c7..a3807136eb0 100644 --- a/polly/test/Isl/CodeGen/annotated_alias_scopes.ll +++ b/polly/test/Isl/CodeGen/annotated_alias_scopes.ll @@ -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]; |
