Many tests use opt's -analyze feature, which does not translate well to
NPM and has better alternatives. The alternative here is to explicitly
add a pass that calls ScalarEvolution::print().
The legacy pass manager RUNs aren't changing, but they are now pinned to
the legacy pass manager. For each legacy pass manager RUN, I added a
corresponding NPM RUN using the 'print<scalar-evolution>' pass. For
compatibility with update_analyze_test_checks.py and existing test
CHECKs, 'print<scalar-evolution>' now prints what -analyze prints per
function.
This was generated by the following Python script and failures were
manually fixed up:
import sys
for i in sys.argv:
with open(i, 'r') as f:
s = f.read()
with open(i, 'w') as f:
for l in s.splitlines():
if "RUN:" in l and ' -analyze ' in l and '\\' not in l:
f.write(l.replace(' -analyze ', ' -analyze -enable-new-pm=0 '))
f.write('\n')
f.write(l.replace(' -analyze ', ' -disable-output ').replace(' -scalar-evolution ', ' "-passes=print<scalar-evolution>" ').replace(" | ", " 2>&1 | "))
f.write('\n')
else:
f.write(l)
There are a couple failures still in ScalarEvolution under NPM, but
those are due to other unrelated naming conflicts.
Reviewed By: asbirlea
Differential Revision: https://reviews.llvm.org/D83798
55 lines
1.9 KiB
LLVM
55 lines
1.9 KiB
LLVM
; RUN: opt -scalar-evolution -analyze -enable-new-pm=0 < %s | FileCheck %s
|
|
; RUN: opt "-passes=print<scalar-evolution>" -disable-output < %s 2>&1 | FileCheck %s
|
|
;
|
|
; This checks if the min and max expressions are properly recognized by
|
|
; ScalarEvolution even though they the ICmpInst and SelectInst have different
|
|
; types.
|
|
;
|
|
; #define max(a, b) (a > b ? a : b)
|
|
; #define min(a, b) (a < b ? a : b)
|
|
;
|
|
; void f(int *A, int N) {
|
|
; for (int i = 0; i < N; i++) {
|
|
; A[max(0, i - 3)] = A[min(N, i + 3)] * 2;
|
|
; }
|
|
; }
|
|
;
|
|
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
|
|
|
|
define void @f(i32* %A, i32 %N) {
|
|
bb:
|
|
br label %bb1
|
|
|
|
bb1: ; preds = %bb2, %bb
|
|
%i.0 = phi i32 [ 0, %bb ], [ %tmp23, %bb2 ]
|
|
%i.0.1 = sext i32 %i.0 to i64
|
|
%tmp = icmp slt i32 %i.0, %N
|
|
br i1 %tmp, label %bb2, label %bb24
|
|
|
|
bb2: ; preds = %bb1
|
|
%tmp3 = add nuw nsw i32 %i.0, 3
|
|
%tmp4 = icmp slt i32 %tmp3, %N
|
|
%tmp5 = sext i32 %tmp3 to i64
|
|
%tmp6 = sext i32 %N to i64
|
|
%tmp9 = select i1 %tmp4, i64 %tmp5, i64 %tmp6
|
|
; min(N, i+3)
|
|
; CHECK: select i1 %tmp4, i64 %tmp5, i64 %tmp6
|
|
; CHECK-NEXT: --> ((sext i32 {3,+,1}<nuw><%bb1> to i64) smin (sext i32 %N to i64))
|
|
%tmp11 = getelementptr inbounds i32, i32* %A, i64 %tmp9
|
|
%tmp12 = load i32, i32* %tmp11, align 4
|
|
%tmp13 = shl nsw i32 %tmp12, 1
|
|
%tmp14 = icmp sge i32 3, %i.0
|
|
%tmp17 = add nsw i64 %i.0.1, -3
|
|
%tmp19 = select i1 %tmp14, i64 0, i64 %tmp17
|
|
; max(0, i - 3)
|
|
; CHECK: select i1 %tmp14, i64 0, i64 %tmp17
|
|
; CHECK-NEXT: --> (-3 + (3 smax {0,+,1}<nuw><nsw><%bb1>))
|
|
%tmp21 = getelementptr inbounds i32, i32* %A, i64 %tmp19
|
|
store i32 %tmp13, i32* %tmp21, align 4
|
|
%tmp23 = add nuw nsw i32 %i.0, 1
|
|
br label %bb1
|
|
|
|
bb24: ; preds = %bb1
|
|
ret void
|
|
}
|