Skip to content

Commit 651a5db

Browse files
authored
[BOLT-TESTS] Update python tests after #89681 (#33)
llvm/llvm-project#89681 added a failsafe check for rewriting certain dynamic relocations, which trigger in python test binaries. Skip the faulty functions.
1 parent 2af96ad commit 651a5db

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

test/X86/perf2bolt-multiple-edge.test

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,25 @@ RUN: -o %p/Output/libpython3.8-pyston2.3.so.1.0.perf
1010
RUN: test -f %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt || \
1111
RUN: unzstd %p/Inputs/libpython3.8-pyston2.3.so.1.0.prebolt.zst \
1212
RUN: -o %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt
13-
RUN: perf2bolt -p %p/Output/libpython3.8-pyston2.3.so.1.0.perf \
13+
RUN: perf2bolt -p %p/Output/libpython3.8-pyston2.3.so.1.0.perf -strict=0 \
14+
RUN: -skip-funcs=_PyEval_EvalFrame_AOT_Interpreter/1 \
1415
RUN: %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt -o %t.fdata -w %t.yaml
1516

1617
# Tests for fdata vs yaml from the same perf data
1718
RUN: llvm-bolt -p %p/Output/libpython3.8-pyston2.3.so.1.0.perf \
19+
RUN: -skip-funcs=_PyEval_EvalFrame_AOT_Interpreter/1,_PyEval_EvalFrameDefault \
1820
RUN: %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt -o %t.null \
1921
RUN: --print-only=_PyEval_EvalCodeWithName.localalias/1,dict_dealloc --print-cfg \
2022
RUN: | FileCheck %s --check-prefix=CHECK-FUNC
2123

2224
RUN: llvm-bolt -data %t.fdata \
25+
RUN: -skip-funcs=_PyEval_EvalFrame_AOT_Interpreter/1,_PyEval_EvalFrameDefault \
2326
RUN: %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt -o %t.null \
2427
RUN: --print-only=_PyEval_EvalCodeWithName.localalias/1,dict_dealloc --print-cfg \
2528
RUN: | FileCheck %s --check-prefix=CHECK-FUNC
2629

2730
RUN: llvm-bolt -data %t.yaml \
31+
RUN: -skip-funcs=_PyEval_EvalFrame_AOT_Interpreter/1,_PyEval_EvalFrameDefault \
2832
RUN: %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt -o %t.null \
2933
RUN: --print-only=_PyEval_EvalCodeWithName.localalias/1,dict_dealloc --print-cfg \
3034
RUN: | FileCheck %s --check-prefix=CHECK-FUNC
@@ -39,6 +43,7 @@ CHECK-FUNC-NEXT: Exec Count : 10578
3943

4044
# Test autofdo profile generation (-autofdo option)
4145
RUN: perf2bolt -p %p/Output/libpython3.8-pyston2.3.so.1.0.perf \
46+
RUN: -skip-funcs=_PyEval_EvalFrame_AOT_Interpreter/1 \
4247
RUN: %p/Output/libpython3.8-pyston2.3.so.1.0.prebolt -o %t.afdo -autofdo
4348
RUN: FileCheck %s --check-prefix=CHECK-AFDO --input-file %t.afdo
4449
# LBR traces/fallthroughs: count, first record

test/X86/python-split-func-jtable.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
# RUN: test -f %p/Output/python || \
77
# RUN: unzstd %p/Inputs/python3.8.6.zst \
88
# RUN: -o %p/Output/python
9-
# RUN: llvm-bolt -v=3 -instrument %p/Output/python -o %t.null 2>&1 | \
9+
# RUN: llvm-bolt -v=3 -instrument %p/Output/python -o %t.null \
10+
# RUN: -skip-funcs=_PyEval_EvalFrameDefault.cold/1 2>&1 | \
1011
# RUN: FileCheck %s --check-prefix=CHECK-INST
1112
# CHECK-INST: BOLT-INFO: Multiple fragments access same jump table: sre_ucs4_match.cold/1(*2); sre_ucs4_match/1(*2)
1213

1314
# Optimize in lite mode using pre-collected fdata profile
1415
#
1516
# RUN: llvm-bolt %p/Output/python -data %p/Inputs/python3.8.6.fdata -lite -v=1 \
17+
# RUN: -skip-funcs=_PyEval_EvalFrameDefault.cold/1 \
1618
# RUN: -o %t.null 2>&1 | FileCheck %s --check-prefix=CHECK-OPT
1719
# CHECK-OPT: BOLT-INFO: processing pymain_init.cold/1(*2) as a sibling of non-ignored function

0 commit comments

Comments
 (0)