[llvm] 007ffdc - [test] Fix LoopDistribute tests under NPM

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2020-10-21T19:05:30-07:00
New Revision: 007ffdc18c503094e705ffcdd3ad51b829b77348

URL: https://github.com/llvm/llvm-project/commit/007ffdc18c503094e705ffcdd3ad51b829b77348
DIFF: https://github.com/llvm/llvm-project/commit/007ffdc18c503094e705ffcdd3ad51b829b77348.diff

LOG: [test] Fix LoopDistribute tests under NPM

Added: 
    

Modified: 
    llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll
    llvm/test/Transforms/LoopDistribute/basic.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll b/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll
index 5f72b8d49b51..4a48c1611210 100644
--- a/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll
+++ b/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll
@@ -6,7 +6,11 @@
 ; RUN:   FileCheck --check-prefix=VECTORIZE %s
 
 ; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info \
-; RUN:   -loop-accesses -analyze < %s | FileCheck %s --check-prefix=ANALYSIS
+; RUN:   -loop-accesses -analyze < %s -enable-new-pm=0 | FileCheck %s --check-prefix=ANALYSIS
+
+; TODO: the following changes the order loop-access printing prints loops, remove legacy RUN and change after NPM switch
+; TODO: opt -aa-pipeline=basic-aa -passes='loop-distribute,print-access-info' -enable-loop-distribute \
+; TODO:   -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS
 
 ; The memcheck version of basic.ll.  We should distribute and vectorize the
 ; second part of this loop with 5 memchecks (A+1 x {C, D, E} + C x {A, B})

diff  --git a/llvm/test/Transforms/LoopDistribute/basic.ll b/llvm/test/Transforms/LoopDistribute/basic.ll
index d696c0cf3a45..85795eed155d 100644
--- a/llvm/test/Transforms/LoopDistribute/basic.ll
+++ b/llvm/test/Transforms/LoopDistribute/basic.ll
@@ -2,7 +2,11 @@
 ; RUN:   < %s | FileCheck %s
 
 ; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info \
-; RUN:   -loop-accesses -analyze < %s | FileCheck %s --check-prefix=ANALYSIS
+; RUN:   -loop-accesses -analyze < %s -enable-new-pm=0 | FileCheck %s --check-prefix=ANALYSIS
+
+; TODO: the following changes the order loop-access printing prints loops, remove legacy RUN and change after NPM switch
+; TODO: opt -aa-pipeline=basic-aa -passes='loop-distribute,print-access-info' -enable-loop-distribute \
+; TODO:   -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS
 
 ; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -loop-vectorize -force-vector-width=4 -S \
 ; RUN:   < %s | FileCheck %s --check-prefix=VECTORIZE