Skip to content

Commit 6288f86

Browse files
committed
Revert "[ThinLTO] Add additional ThinLTO pipeline testing with new PM"
This reverts commit 2af97be. After attempting to fix bot failures from matching issues (mostly due to inconsistent printing of "llvm::" prefixes on objects, and AnalysisManager objects being printed differntly, I am now seeing some differences I don't understand (real differences in the passes being printed). Giving up at this point to allow the bots to recover. Will revisit later.
1 parent cb988a8 commit 6288f86

8 files changed

+0
-1254
lines changed

clang/test/CodeGen/thinlto-distributed-newpm.ll

Lines changed: 0 additions & 236 deletions
This file was deleted.

llvm/test/Other/Inputs/new-pm-thinlto-prelink-pgo-defaults.proftext

Lines changed: 0 additions & 1 deletion
This file was deleted.

llvm/test/Other/Inputs/new-pm-thinlto-samplepgo-defaults.prof

Lines changed: 0 additions & 1 deletion
This file was deleted.

llvm/test/Other/new-pm-pgo.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
; RUN: opt -debug-pass-manager -passes='default<O2>' -pgo-kind=pgo-instr-gen-pipeline -profile-file='temp' %s 2>&1 |FileCheck %s --check-prefixes=GEN
22
; RUN: llvm-profdata merge %S/Inputs/new-pm-pgo.proftext -o %t.profdata
33
; RUN: opt -debug-pass-manager -passes='default<O2>' -pgo-kind=pgo-instr-use-pipeline -profile-file='%t.profdata' %s 2>&1 |FileCheck %s --check-prefixes=USE
4-
; RUN: opt -debug-pass-manager -passes='thinlto-pre-link<O2>' -pgo-kind=pgo-instr-use-pipeline -profile-file='%t.profdata' %s 2>&1 |FileCheck %s --check-prefixes=USE
5-
; RUN: opt -debug-pass-manager -passes='thinlto<O2>' -pgo-kind=pgo-instr-use-pipeline -profile-file='%t.profdata' %s 2>&1 |FileCheck %s --check-prefixes=USE_POST_LINK
64
; RUN: opt -debug-pass-manager -passes='default<O2>' -hot-cold-split -pgo-kind=pgo-instr-use-pipeline -profile-file='%t.profdata' %s 2>&1 |FileCheck %s --check-prefixes=USE --check-prefixes=SPLIT
75
; RUN: opt -debug-pass-manager -passes='default<O2>' -pgo-kind=pgo-sample-use-pipeline -profile-file='%S/Inputs/new-pm-pgo.prof' %s 2>&1 \
86
; RUN: |FileCheck %s --check-prefixes=SAMPLE_USE,SAMPLE_USE_O
@@ -16,8 +14,6 @@
1614
; USE: Running pass: PGOInstrumentationUse
1715
; USE: Running pass: PGOIndirectCallPromotion
1816
; USE: Running pass: PGOMemOPSizeOpt
19-
; USE_POST_LINK: Running pass: PGOIndirectCallPromotion
20-
; USE_POST_LINK: Running pass: PGOMemOPSizeOpt
2117
; SAMPLE_USE_O: Running pass: ModuleToFunctionPassAdaptor<{{.*}}AddDiscriminatorsPass{{.*}}>
2218
; SAMPLE_USE_PRE_LINK: Running pass: ModuleToFunctionPassAdaptor<{{.*}}AddDiscriminatorsPass{{.*}}>
2319
; SAMPLE_USE: Running pass: SimplifyCFGPass
@@ -29,7 +25,6 @@
2925
; SAMPLE_USE_O: Running pass: PGOIndirectCallPromotion
3026
; SAMPLE_USE_POST_LINK-NOT: Running pass: GlobalOptPass
3127
; SAMPLE_USE_POST_LINK: Running pass: PGOIndirectCallPromotion
32-
; SAMPLE_USE_PRE_LINK-NOT: Running pass: PGOIndirectCallPromotion
3328
; SAMPLE_GEN: Running pass: ModuleToFunctionPassAdaptor<{{.*}}AddDiscriminatorsPass{{.*}}>
3429
; SPLIT: Running pass: HotColdSplittingPass
3530

0 commit comments

Comments
 (0)