[IslAst] Untangle IslAst lit-testcases from specifics of the legacy-PM

Summary:
This consists instances of two changes:

- Accept any order of checks for a specific loop form, that appear in different order in the new vs legacy-PM.
- Remove checks for specific regions.

Reviewers: grosser

Reviewed By: grosser

Subscribers: pollydev, llvm-commits

Tags: #polly

Differential Revision: https://reviews.llvm.org/D35837

llvm-svn: 308976

diff --git a/polly/test/Isl/CodeGen/loop_with_condition_nested.ll b/polly/test/Isl/CodeGen/loop_with_condition_nested.ll
index 8a7c790..38ce558 100644 (file)
--- a/polly/test/Isl/CodeGen/loop_with_condition_nested.ll
+++ b/polly/test/Isl/CodeGen/loop_with_condition_nested.ll
@@ -211,6 +211,5 @@ declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 ; CHECK:   Stmt_bb9(c0);
 ; CHECK: }
 
-; LOOPS: Printing analysis 'Natural Loop Information' for function 'loop_with_condition':
-; LOOPS: Loop at depth 1 containing: %bb1<header><exiting>,%bb2,%bb4,%bb7,%bb6,%bb8,%bb9,%bb10<latch>
-; LOOPS: Loop at depth 1 containing: %polly.loop_header<header>,%polly.cond,%polly.merge,%polly.then,%polly.else,%polly.stmt.bb7,%polly.cond3,%polly.merge4,%polly.then5,%polly.else6,%polly.stmt.bb6,%polly.stmt.bb9<latch><exiting>
+; LOOPS-DAG: Loop at depth 1 containing: %bb1<header><exiting>,%bb2,%bb4,%bb7,%bb6,%bb8,%bb9,%bb10<latch>
+; LOOPS-DAG: Loop at depth 1 containing: %polly.loop_header<header>,%polly.cond,%polly.merge,%polly.then,%polly.else,%polly.stmt.bb7,%polly.cond3,%polly.merge4,%polly.then5,%polly.else6,%polly.stmt.bb6,%polly.stmt.bb9<latch><exiting>

diff --git a/polly/test/Isl/CodeGen/simple_loop_non_single_exit.ll b/polly/test/Isl/CodeGen/simple_loop_non_single_exit.ll
index ca62df7..00bed09 100644 (file)
--- a/polly/test/Isl/CodeGen/simple_loop_non_single_exit.ll
+++ b/polly/test/Isl/CodeGen/simple_loop_non_single_exit.ll
@@ -1,4 +1,3 @@
-; RUN: opt %loadPolly -polly-codegen -analyze < %s | FileCheck %s
 ; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s -check-prefix=CHECK-CODE
 
 ; void f(long A[], long N) {
@@ -31,6 +30,5 @@ return:
   ret void
 }
 
-; CHECK: Create LLVM-IR from SCoPs' for region: 'next => polly.merge_new_and_old'
 ; CHECK-CODE: polly.split_new_and_old
 ; CHECK-CODE: polly.merge_new_and_old

diff --git a/polly/test/Isl/CodeGen/simple_loop_non_single_exit_2.ll b/polly/test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
index ac31a86..e9d155c 100644 (file)
--- a/polly/test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
+++ b/polly/test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
@@ -1,4 +1,3 @@
-; RUN: opt %loadPolly -polly-codegen -analyze < %s | FileCheck %s
 ; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s -check-prefix=CHECK-CODE
 
 ; void f(long A[], long N) {
@@ -32,6 +31,5 @@ return:
   ret void
 }
 
-; CHECK: Create LLVM-IR from SCoPs' for region: 'for.i => return'
 ; CHECK-CODE: polly.split_new_and_old
 ; CHECK-CODE: polly.merge_new_and_old

diff --git a/polly/test/Isl/CodeGen/simple_non_single_entry.ll b/polly/test/Isl/CodeGen/simple_non_single_entry.ll
index 226af71..154764e 100644 (file)
--- a/polly/test/Isl/CodeGen/simple_non_single_entry.ll
+++ b/polly/test/Isl/CodeGen/simple_non_single_entry.ll
@@ -1,4 +1,3 @@
-; RUN: opt %loadPolly -polly-codegen -analyze < %s | FileCheck %s
 ; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s -check-prefix=CHECK-CODE
 
 ; void f(long A[], long N) {
@@ -67,6 +66,5 @@ return:
   ret void
 }
 
-; CHECK: Create LLVM-IR from SCoPs' for region: 'next => polly.merge_new_and_old'
 ; CHECK-CODE: polly.split_new_and_old
 ; CHECK-CODE: polly.merge_new_and_old

diff --git a/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll b/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
index f8e74bf..0c17a0c 100644 (file)
--- a/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
@@ -64,5 +64,4 @@ return:                                           ; preds = %if.else, %if.then
   ret i32 %retval.0
 }
 
-; SCALAR: for region: 'for.cond => for.end' in function 'main':
 ; SCALAR-NOT:   Stmt_for_body(0);

diff --git a/polly/test/Isl/single_loop_param_less_equal.ll b/polly/test/Isl/single_loop_param_less_equal.ll
index 0cdec02..02013b8 100644 (file)
--- a/polly/test/Isl/single_loop_param_less_equal.ll
+++ b/polly/test/Isl/single_loop_param_less_equal.ll
@@ -57,5 +57,5 @@ ret:
 ; CODEGEN: polly.loop_preheader:
 ; CODEGEN:   br label %polly.loop_header
 
-; LOOPS: Loop at depth 1 containing: %loop.header<header><exiting>,%loop.body,%loop.backedge<latch>
-; LOOPS: Loop at depth 1 containing: %polly.loop_header<header>,%polly.stmt.loop.body<latch><exiting>
+; LOOPS-DAG: Loop at depth 1 containing: %loop.header<header><exiting>,%loop.body,%loop.backedge<latch>
+; LOOPS-DAG: Loop at depth 1 containing: %polly.loop_header<header>,%polly.stmt.loop.body<latch><exiting>