[polly] 758e06b - [polly][test] Fix after 7c3c98144

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2023-03-10T19:29:50-08:00
New Revision: 758e06bbd99a35b1cc9f6cd3bd9bd1903503cefd

URL: https://github.com/llvm/llvm-project/commit/758e06bbd99a35b1cc9f6cd3bd9bd1903503cefd
DIFF: https://github.com/llvm/llvm-project/commit/758e06bbd99a35b1cc9f6cd3bd9bd1903503cefd.diff

LOG: [polly][test] Fix after 7c3c98144

Added: 
    

Modified: 
    polly/test/ScopInfo/licm_load.ll
    polly/test/ScopInfo/licm_potential_store.ll

Removed: 
    


################################################################################
diff  --git a/polly/test/ScopInfo/licm_load.ll b/polly/test/ScopInfo/licm_load.ll
index 1ba6f9135dea..ade640976d00 100644
--- a/polly/test/ScopInfo/licm_load.ll
+++ b/polly/test/ScopInfo/licm_load.ll
@@ -1,8 +1,6 @@
-; RUN: opt %loadPolly -basic-aa -loop-rotate -indvars       -polly-prepare \
-; RUN: -polly-invariant-load-hoisting=true -polly-print-scops -disable-output < %s \
+; RUN: opt %loadNPMPolly -passes='loop(loop-rotate,indvars),polly-prepare,print<polly-function-scops>' -polly-invariant-load-hoisting=true -disable-output < %s 2>&1 \
 ; RUN: | FileCheck %s
-; RUN: opt %loadPolly -basic-aa -loop-rotate -indvars -licm -polly-prepare \
-; RUN: -polly-invariant-load-hoisting=true -polly-print-scops --disable-output< %s \
+; RUN: opt %loadNPMPolly -passes='loop-mssa(loop-rotate,indvars,licm),polly-prepare,print<polly-function-scops>' -polly-invariant-load-hoisting=true -disable-output < %s 2>&1 \
 ; RUN: | FileCheck %s
 ;
 ;    void foo(int n, float A[static const restrict n],

diff  --git a/polly/test/ScopInfo/licm_potential_store.ll b/polly/test/ScopInfo/licm_potential_store.ll
index 19aeeb605e40..8a36ee84313a 100644
--- a/polly/test/ScopInfo/licm_potential_store.ll
+++ b/polly/test/ScopInfo/licm_potential_store.ll
@@ -1,11 +1,9 @@
-; RUN: opt %loadPolly -basic-aa -sroa -instcombine -simplifycfg -tailcallopt \
-; RUN:    -simplifycfg -reassociate -loop-rotate -instcombine -indvars \
-; RUN:    -polly-prepare -polly-print-scops -disable-output < %s \
+; RUN: opt %loadNPMPolly -passes='sroa,instcombine,simplifycfg,reassociate,loop(loop-rotate),instcombine,indvars,polly-prepare,print<polly-function-scops>' \
+; RUN:    -tailcallopt -disable-output < %s 2>&1 \
 ; RUN:     | FileCheck %s --check-prefix=NOLICM
 
-; RUN: opt %loadPolly -basic-aa -sroa -instcombine -simplifycfg -tailcallopt \
-; RUN:    -simplifycfg -reassociate -loop-rotate -instcombine -indvars -licm \
-; RUN:    -polly-prepare -polly-print-scops -disable-output < %s \
+; RUN: opt %loadNPMPolly -passes='sroa,instcombine,simplifycfg,reassociate,loop(loop-rotate),instcombine,indvars,loop-mssa(licm),polly-prepare,print<polly-function-scops>' \
+; RUN:    -tailcallopt -disable-output < %s 2>&1 \
 ; RUN:     | FileCheck %s --check-prefix=LICM
 
 ;    void foo(int n, float A[static const restrict n], float x) {