This is an archive of the discontinued LLVM Phabricator instance.

Differential D92817

[test] Fix scev-expander-preserve-lcssa.ll under NPM
ClosedPublic

Authored by aeubanks on Dec 7 2020, 11:00 PM.

Details

Reviewers
fhahn
Commits
rG512a64de6a97: [test] Fix scev-expander-preserve-lcssa.ll under NPM
Summary

The NPM runs loop passes over loops in forward program order, rather
than the legacy loop PM's reverse program order. This seems to produce
better results as shown here.

I verified that changing the loop order to reverse program order results
in the same IR with the NPM.

Diff Detail

Unit TestsFailed

TimeTest
60 msx64 windows > LLVM.CodeGen/XCore::threads.ll
60 msx64 windows > LLVM.tools/llvm-profgen::inline-cs-noprobe.test
50 msx64 windows > LLVM.tools/llvm-profgen::noinline-cs-noprobe.test

Event Timeline

aeubanks requested review of this revision.Dec 7 2020, 11:00 PM
aeubanks created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 7 2020, 11:00 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B81396: Diff 310092.Dec 7 2020, 11:42 PM
fhahn accepted this revision.Dec 10 2020, 8:16 AM

LGTM, thanks. This removes legacy PM test coverage, right? But I think that should be fine in that case.

This revision is now accepted and ready to land.Dec 10 2020, 8:16 AM
This revision was landed with ongoing or failed builds.Dec 10 2020, 9:47 AM
Closed by commit rG512a64de6a97: [test] Fix scev-expander-preserve-lcssa.ll under NPM (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rG512a64de6a97: [test] Fix scev-expander-preserve-lcssa.ll under NPM.

Revision Contents

PathSize
llvm/
test/
Transforms/
IndVarSimplify/
9 lines

Diff 310092

llvm/test/Transforms/IndVarSimplify/scev-expander-preserve-lcssa.ll

; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -indvars -S -indvars -verify-loop-lcssa %s | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes=indvars,indvars -S -verify-loop-lcssa %s | FileCheck %s
; Make sure SCEVExpander does not crash and introduce unnecessary LCSSA PHI nodes. ; Make sure SCEVExpander does not crash and introduce unnecessary LCSSA PHI nodes.
; The tests are a collection of cases with crashes when preserving LCSSA PHI ; The tests are a collection of cases with crashes when preserving LCSSA PHI
; nodes directly in SCEVExpander. ; nodes directly in SCEVExpander.
declare i1 @cond() readnone declare i1 @cond() readnone
define void @test1(i8 %x, [512 x i8]* %ptr) { define void @test1(i8 %x, [512 x i8]* %ptr) {
▲ Show 20 Lines • Show All 97 Lines • ▼ Show 20 Lines
; CHECK-NEXT: ] ; CHECK-NEXT: ]
; CHECK: for.end: ; CHECK: for.end:
; CHECK-NEXT: [[I_0_LCSSA2:%.*]] = phi i32 [ 0, [[FOR_COND]] ] ; CHECK-NEXT: [[I_0_LCSSA2:%.*]] = phi i32 [ 0, [[FOR_COND]] ]
; CHECK-NEXT: [[CMP8243:%.*]] = icmp sgt i32 [[I_0_LCSSA2]], 0 ; CHECK-NEXT: [[CMP8243:%.*]] = icmp sgt i32 [[I_0_LCSSA2]], 0
; CHECK-NEXT: br i1 [[CMP8243]], label [[FOR_BODY84_PREHEADER:%.*]], label [[RETURN]] ; CHECK-NEXT: br i1 [[CMP8243]], label [[FOR_BODY84_PREHEADER:%.*]], label [[RETURN]]
; CHECK: for.body84.preheader: ; CHECK: for.body84.preheader:
; CHECK-NEXT: br label [[FOR_BODY84:%.*]] ; CHECK-NEXT: br label [[FOR_BODY84:%.*]]
; CHECK: for.body84: ; CHECK: for.body84:
; CHECK-NEXT: [[I_144:%.*]] = phi i32 [ [[INC:%.*]], [[IF_END106:%.*]] ], [ 0, [[FOR_BODY84_PREHEADER]] ]
; CHECK-NEXT: [[C_2:%.*]] = call i1 @cond() ; CHECK-NEXT: [[C_2:%.*]] = call i1 @cond()
; CHECK-NEXT: br i1 [[C_2]], label [[IF_END106]], label [[RETURN_LOOPEXIT:%.*]] ; CHECK-NEXT: br i1 [[C_2]], label [[IF_END106:%.*]], label [[RETURN_LOOPEXIT:%.*]]
; CHECK: if.end106: ; CHECK: if.end106:
; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[I_144]], 1 ; CHECK-NEXT: br i1 false, label [[FOR_BODY84]], label [[RETURN_LOOPEXIT]]
; CHECK-NEXT: [[CMP82:%.*]] = icmp slt i32 [[INC]], [[I_0_LCSSA2]]
; CHECK-NEXT: br i1 [[CMP82]], label [[FOR_BODY84]], label [[RETURN_LOOPEXIT]]
; CHECK: return.loopexit: ; CHECK: return.loopexit:
; CHECK-NEXT: br label [[RETURN]] ; CHECK-NEXT: br label [[RETURN]]
; CHECK: return.loopexit1: ; CHECK: return.loopexit1:
; CHECK-NEXT: br label [[RETURN]] ; CHECK-NEXT: br label [[RETURN]]
; CHECK: return: ; CHECK: return:
; CHECK-NEXT: ret void ; CHECK-NEXT: ret void
; ;
entry: entry:
▲ Show 20 Lines • Show All 457 Lines • Show Last 20 Lines