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

[Philip Pfaffe via Phabricator via llvm-commits]

philip.pfaffe created this revision.
philip.pfaffe added a project: Polly.

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.

Resubmitting this because of missing subscribers. Sorry about the noise!


Repository:
  rL LLVM

https://reviews.llvm.org/D35837

Files:
  test/Isl/CodeGen/loop_with_condition_nested.ll
  test/Isl/CodeGen/simple_loop_non_single_exit.ll
  test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
  test/Isl/CodeGen/simple_non_single_entry.ll
  test/Isl/CodeGen/single_loop_zero_iterations.ll
  test/Isl/single_loop_param_less_equal.ll


Index: test/Isl/single_loop_param_less_equal.ll
===================================================================
--- test/Isl/single_loop_param_less_equal.ll
+++ test/Isl/single_loop_param_less_equal.ll
@@ -57,5 +57,5 @@
 ; 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>
Index: test/Isl/CodeGen/single_loop_zero_iterations.ll
===================================================================
--- test/Isl/CodeGen/single_loop_zero_iterations.ll
+++ test/Isl/CodeGen/single_loop_zero_iterations.ll
@@ -64,5 +64,4 @@
   ret i32 %retval.0
 }
 
-; SCALAR: for region: 'for.cond => for.end' in function 'main':
 ; SCALAR-NOT:   Stmt_for_body(0);
Index: test/Isl/CodeGen/simple_non_single_entry.ll
===================================================================
--- test/Isl/CodeGen/simple_non_single_entry.ll
+++ 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 @@
   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
Index: test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
===================================================================
--- test/Isl/CodeGen/simple_loop_non_single_exit_2.ll
+++ 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 @@
   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
Index: test/Isl/CodeGen/simple_loop_non_single_exit.ll
===================================================================
--- test/Isl/CodeGen/simple_loop_non_single_exit.ll
+++ 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 @@
   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
Index: test/Isl/CodeGen/loop_with_condition_nested.ll
===================================================================
--- test/Isl/CodeGen/loop_with_condition_nested.ll
+++ test/Isl/CodeGen/loop_with_condition_nested.ll
@@ -211,6 +211,5 @@
 ; 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>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35837.108070.patch
Type: text/x-patch
Size: 3990 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170725/d7db9344/attachment.bin>