This is an archive of the discontinued LLVM Phabricator instance.

Differential D95898

[test][NewPM] Pin various tests to the legacy PM
ClosedPublic

Authored by aeubanks on Feb 2 2021, 2:50 PM.

Details

Reviewers
MaskRay
ychen
asbirlea
Commits
rGdd4dbad87bd0: [test][NewPM] Pin various tests to the legacy PM
Summary

tut-simplify-cfg hasn't been ported to the new PM.
llvm-lto2's -enable-new-pm defaults to the CMake flag, so the legacy PM extension test needs to be pinned.

Diff Detail

Event Timeline

aeubanks requested review of this revision.Feb 2 2021, 2:50 PM
aeubanks created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 2 2021, 2:50 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
aeubanks added reviewers: MaskRay, ychen, asbirlea.Feb 2 2021, 2:50 PM

should be the last set of tests

MaskRay accepted this revision.Feb 2 2021, 2:54 PM

Thanks!

This revision is now accepted and ready to land.Feb 2 2021, 2:54 PM
ychen accepted this revision.Feb 2 2021, 2:54 PM

LGTM

This revision was landed with ongoing or failed builds.Feb 2 2021, 3:07 PM
Closed by commit rGdd4dbad87bd0: [test][NewPM] Pin various tests to the legacy PM (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rGdd4dbad87bd0: [test][NewPM] Pin various tests to the legacy PM.
Harbormaster completed remote builds in B87590: Diff 320916.Feb 2 2021, 3:45 PM
fhahn added a subscriber: fhahn.Feb 3 2021, 12:27 AM

Thanks for pinning these to the old pass manager. Is there a way to add a new PM version of the pass & link conditionally if examples are enabled?

aeubanks added a comment.Feb 3 2021, 9:14 AM
In D95898#2538625, @fhahn wrote:

Thanks for pinning these to the old pass manager. Is there a way to add a new PM version of the pass & link conditionally if examples are enabled?

llvm/examples/Bye/Bye.cpp should do just that.

Revision Contents

Diff 320921

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg-blockaddress.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 -tut-simplifycfg -tut-simplifycfg-version=v1 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -enable-new-pm=0 -S < %s | FileCheck %s
define i8* @simp1(i32 %x) { define i8* @simp1(i32 %x) {
; CHECK-LABEL: @simp1( ; CHECK-LABEL: @simp1(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[X:%.*]], 42 ; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[X:%.*]], 42
; CHECK-NEXT: [[ADDR:%.*]] = select i1 [[CMP]], i8* inttoptr (i32 1 to i8*), i8* inttoptr (i32 1 to i8*) ; CHECK-NEXT: [[ADDR:%.*]] = select i1 [[CMP]], i8* inttoptr (i32 1 to i8*), i8* inttoptr (i32 1 to i8*)
; CHECK-NEXT: ret i8* [[ADDR]] ; CHECK-NEXT: ret i8* [[ADDR]]
; ;
Show All 11 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg1.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 -tut-simplifycfg -tut-simplifycfg-version=v1 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -enable-new-pm=0 -S < %s | FileCheck %s
define i32 @simp1() { define i32 @simp1() {
; CHECK-LABEL: @simp1( ; CHECK-LABEL: @simp1(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: ret i32 10 ; CHECK-NEXT: ret i32 10
; ;
entry: entry:
br i1 true, label %if.then, label %if.else br i1 true, label %if.then, label %if.else
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg2-dead-block-order.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 -tut-simplifycfg -tut-simplifycfg-version=v1 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -enable-new-pm=0 -S < %s | FileCheck %s
define i32 @remove_dead_blocks() { define i32 @remove_dead_blocks() {
; CHECK-LABEL: @remove_dead_blocks( ; CHECK-LABEL: @remove_dead_blocks(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: ret i32 1 ; CHECK-NEXT: ret i32 1
; CHECK-NEXT: } ; CHECK-NEXT: }
; ;
entry: entry:
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg3-phis.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 -tut-simplifycfg -tut-simplifycfg-version=v1 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -enable-new-pm=0 -S < %s | FileCheck %s
define i32 @phi_cond_branch_eliminated() { define i32 @phi_cond_branch_eliminated() {
; CHECK-LABEL: @phi_cond_branch_eliminated( ; CHECK-LABEL: @phi_cond_branch_eliminated(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: ret i32 20 ; CHECK-NEXT: ret i32 20
; ;
entry: entry:
br i1 true, label %bb.2, label %bb.3 br i1 true, label %bb.2, label %bb.3
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg4-multiple-duplicate-cfg-updates.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 -tut-simplifycfg -tut-simplifycfg-version=v1 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
; Check that we do not crash when we remove edges multiple times in ; Check that we do not crash when we remove edges multiple times in
; the DomTreeUpdater. ; the DomTreeUpdater.
define void @test() { define void @test() {
; CHECK-LABEL: @test( ; CHECK-LABEL: @test(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: switch i8 undef, label [[IF_THEN_EPIL:%.*]] [ ; CHECK-NEXT: switch i8 undef, label [[IF_THEN_EPIL:%.*]] [
; CHECK-NEXT: i8 32, label [[FOR_INC_EPIL:%.*]] ; CHECK-NEXT: i8 32, label [[FOR_INC_EPIL:%.*]]
Show All 28 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg5-del-phis-for-dead-block.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 -tut-simplifycfg -tut-simplifycfg-version=v1 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 < %s -S -verify-dom-info | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 < %s -enable-new-pm=0 -S -verify-dom-info | FileCheck %s
define void @test() { define void @test() {
; CHECK-LABEL: @test( ; CHECK-LABEL: @test(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: switch i32 undef, label [[SW_DEFAULT23:%.*]] [ ; CHECK-NEXT: switch i32 undef, label [[SW_DEFAULT23:%.*]] [
; CHECK-NEXT: i32 129, label [[SW_BB:%.*]] ; CHECK-NEXT: i32 129, label [[SW_BB:%.*]]
; CHECK-NEXT: i32 215, label [[SW_BB1:%.*]] ; CHECK-NEXT: i32 215, label [[SW_BB1:%.*]]
; CHECK-NEXT: i32 117, label [[SW_BB1]] ; CHECK-NEXT: i32 117, label [[SW_BB1]]
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines

llvm/test/Examples/IRTransforms/SimplifyCFG/tut-simplify-cfg6-dead-self-loop.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 -tut-simplifycfg -tut-simplifycfg-version=v1 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v1 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v2 -enable-new-pm=0 -S < %s | FileCheck %s
; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -S < %s | FileCheck %s ; RUN: opt -tut-simplifycfg -tut-simplifycfg-version=v3 -enable-new-pm=0 -S < %s | FileCheck %s
define i32 @simp1() { define i32 @simp1() {
; CHECK-LABEL: @simp1( ; CHECK-LABEL: @simp1(
; CHECK-NEXT: entry: ; CHECK-NEXT: entry:
; CHECK-NEXT: ret i32 1 ; CHECK-NEXT: ret i32 1
; CHECK: bb.1: ; CHECK: bb.1:
; CHECK-NEXT: br label [[BB_1:%.*]] ; CHECK-NEXT: br label [[BB_1:%.*]]
; CHECK: bb.2: ; CHECK: bb.2:
Show All 13 Lines

llvm/test/Feature/load_extension.ll

; REQUIRES: x86-registered-target ; REQUIRES: x86-registered-target
; RUN: opt %s %loadbye -goodbye -wave-goodbye -disable-output 2>&1 | FileCheck %s ; RUN: opt %s %loadbye -goodbye -wave-goodbye -disable-output -enable-new-pm=0 2>&1 | FileCheck %s
; RUN: opt %s %loadnewpmbye %loadbye -passes="goodbye" -wave-goodbye -disable-output 2>&1 | FileCheck %s ; RUN: opt %s %loadnewpmbye %loadbye -passes="goodbye" -wave-goodbye -disable-output 2>&1 | FileCheck %s
; RUN: opt -module-summary %s -o %t.o ; RUN: opt -module-summary %s -o %t.o
; RUN: llvm-lto2 run %t.o %loadbye -wave-goodbye -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s ; RUN: llvm-lto2 run %t.o %loadbye -wave-goodbye -use-new-pm=0 -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s
; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -wave-goodbye -use-new-pm -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s ; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -wave-goodbye -use-new-pm -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s
; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -opt-pipeline="goodbye" -wave-goodbye -use-new-pm -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s ; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -opt-pipeline="goodbye" -wave-goodbye -use-new-pm -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s
; REQUIRES: plugins, examples ; REQUIRES: plugins, examples
; UNSUPPORTED: windows ; UNSUPPORTED: windows
; CHECK: Bye ; CHECK: Bye
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
@junk = global i32 0 @junk = global i32 0
define i32* @somefunk() { define i32* @somefunk() {
ret i32* @junk ret i32* @junk
} }