caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BOLT][TEST] Replace cache+ option with ext-tsp

Browse Source 
Replace "cache+" with "ext-tsp" in all BOLT tests

Test Plan:
```
ninja check-bolt
grep -rnw . -e "cache+"
```
no more tests containing "cache+"
"cache+" and "ext-tsp" are aliases

Reviewed By: rafauler

Differential Revision: https://reviews.llvm.org/D126714
This commit is contained in:
Huan Nguyen
2022-06-01 13:59:28 -07:00
committed by Amir Ayupov
parent d53de9b7ac
commit 38fb7d56e5
14 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bolt/README.md
View File

@@ -180,7 +180,7 @@ Once you have `perf.fdata` ready, you can use it for optimizations with
BOLT. Assuming your environment is setup to include the right path, execute
`llvm-bolt`:
```
$ llvm-bolt <executable> -o <executable>.bolt -data=perf.fdata -reorder-blocks=cache+ -reorder-functions=hfsort -split-functions=2 -split-all-cold -split-eh -dyno-stats
$ llvm-bolt <executable> -o <executable>.bolt -data=perf.fdata -reorder-blocks=ext-tsp -reorder-functions=hfsort -split-functions=2 -split-all-cold -split-eh -dyno-stats
```
If you do need an updated debug info, then add `-update-debug-sections` option

2
bolt/docs/OptimizingClang.md
View File

@@ -64,7 +64,7 @@ Notice that we are passing `clang-7` to `perf2bolt` which is the real binary tha
the generated profile:
```bash
$ llvm-bolt $CPATH/clang-7 -o $CPATH/clang-7.bolt -b clang-7.yaml \
-reorder-blocks=cache+ -reorder-functions=hfsort+ -split-functions=3 \
-reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions=3 \
-split-all-cold -dyno-stats -icf=1 -use-gnu-stack
```
The output will look similar to the one below:

2
bolt/test/X86/bug-reorder-bb-jrcxz.s
View File

@@ -15,7 +15,7 @@
# RUN: %clang %cflags %t.o -falign-labels -march=native -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
# RUN: -reorder-blocks=cache+ -reorder-functions=hfsort \
# RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort \
# RUN: -split-functions=2 -split-all-cold -split-eh -dyno-stats \
# RUN: -print-finalized 2>&1 | FileCheck %s

4
bolt/test/X86/loop-inversion-pass.s
View File

@@ -6,9 +6,9 @@
# RUN: link_fdata %s %t.o %t.fdata2 "FDATA2"
# RUN: link_fdata %s %t.o %t.fdata3 "FDATA3"
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=cache+ -print-finalized \
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=ext-tsp -print-finalized \
# RUN: -loop-inversion-opt -o %t.out | FileCheck %s
# RUN: llvm-bolt %t.exe -data %t.fdata2 -reorder-blocks=cache+ -print-finalized \
# RUN: llvm-bolt %t.exe -data %t.fdata2 -reorder-blocks=ext-tsp -print-finalized \
# RUN: -loop-inversion-opt -o %t.out2 | FileCheck --check-prefix="CHECK2" %s
# RUN: llvm-bolt %t.exe -data %t.fdata3 -reorder-blocks=none -print-finalized \
# RUN: -loop-inversion-opt -o %t.out3 | FileCheck --check-prefix="CHECK3" %s

2
bolt/test/X86/tail-duplication-pass.s
View File

@@ -4,7 +4,7 @@
# RUN: %s -o %t.o
# RUN: link_fdata %s %t.o %t.fdata
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=cache+ -print-finalized \
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=ext-tsp -print-finalized \
# RUN: -tail-duplication -tail-duplication-minimum-offset 1 -o %t.out | FileCheck %s
# FDATA: 1 main 2 1 main #.BB2# 0 10

2
bolt/test/runtime/X86/exceptions-instrumentation.test
View File

@@ -8,7 +8,7 @@ RUN: llvm-bolt %t_exc_split -o %t.exc -instrument -instrumentation-file=%t.fdata
RUN: %t.exc arg1 arg2 arg3
RUN: llvm-bolt %t_exc_split -o %t.exc.bolted -data %t.fdata \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ -split-functions=3 \
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions=3 \
RUN: -split-eh=1 | FileCheck --check-prefix=EXCEPTIONS %s
EXCEPTIONS-NOT: invalid (possibly stale) profile

2
bolt/test/runtime/X86/fix-branches-jrcxz.s
View File

@@ -7,7 +7,7 @@
# RUN: link_fdata %s %t.o %t.fdata
# RUN: llvm-strip --strip-unneeded %t.o
# RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -relocs=1 -reorder-blocks=cache+ -print-finalized \
# RUN: llvm-bolt %t.exe -relocs=1 -reorder-blocks=ext-tsp -print-finalized \
# RUN: -o %t.out -data %t.fdata | FileCheck %s
# RUN: %t.out 1 2 3

2
bolt/test/runtime/X86/instrumentation-dup-jts.s
View File

@@ -56,7 +56,7 @@
# Test that the instrumented data makes sense
# RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
# RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ \
# RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ \
# RUN: -print-only=interp -print-finalized | FileCheck %s
# RUN: %t.bolted 120

2
bolt/test/runtime/X86/instrumentation-ind-calls.s
View File

@@ -20,7 +20,7 @@
# Test that the instrumented data makes sense
# RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
# RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ \
# RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ \
# RUN: -print-only=main -print-finalized | FileCheck %s
# RUN: %t.bolted arg1 arg2

2
bolt/test/runtime/X86/instrumentation-indirect.c
View File

@@ -56,7 +56,7 @@ RUN: %t.instrumented | FileCheck %s -check-prefix=CHECK-OUTPUT
# Test that the instrumented data makes sense
RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ \
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ \
RUN: -print-only=interp -print-finalized
RUN: %t.bolted | FileCheck %s -check-prefix=CHECK-OUTPUT

2
bolt/test/runtime/X86/instrumentation-pie.c
View File

@@ -31,7 +31,7 @@ RUN: %t.instrumented 1 2 3 | FileCheck %s -check-prefix=CHECK-OUTPUT
# Test that the instrumented data makes sense
RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+
RUN: %t.bolted 1 2 3 | FileCheck %s -check-prefix=CHECK-OUTPUT

2
bolt/test/runtime/X86/instrumentation-shlib.c
View File

@@ -61,7 +61,7 @@ RUN: test -f %t.so.fdata
# Test that the instrumented data makes sense
RUN: llvm-bolt %t.so -o %t.so.bolted -data %t.so.fdata \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+
RUN: %t.exe %t.so.bolted 1 2 | FileCheck %s -check-prefix=CHECK-OUTPUT

2
bolt/test/runtime/X86/tail-duplication-constant-prop.s
View File

@@ -4,7 +4,7 @@
# RUN: %s -o %t.o
# RUN: link_fdata %s %t.o %t.fdata
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=cache+ -print-finalized \
# RUN: llvm-bolt %t.exe -data %t.fdata -reorder-blocks=ext-tsp -print-finalized \
# RUN: -tail-duplication -tail-duplication-minimum-offset 1 -o %t.out | FileCheck %s
# RUN: %t.exe; echo $?
# RUN: %t.out; echo $?

4
bolt/test/runtime/meta-merge-fdata.test
View File

@@ -20,7 +20,7 @@ CHECK-FDATA: 0 [unknown] 0 1 _start 0 0 1
# Check that BOLT works with this profile
RUN: llvm-bolt merge-fdata -o %t.bolt -data %t.fdata1 \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ -split-functions=3 | \
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions=3 | \
RUN: FileCheck %s --check-prefix=CHECK-BOLT1
CHECK-BOLT1-NOT: invalid (possibly stale) profile
@@ -41,7 +41,7 @@ RUN: cmp %t.fdata.base %t.fdata.inst
# Optimize using merged fdata
RUN: llvm-bolt merge-fdata -o %t.opt -data %t.fdata.base \
RUN: -reorder-blocks=cache+ -reorder-functions=hfsort+ -split-functions=3 | \
RUN: -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions=3 | \
RUN: FileCheck %s --check-prefix=CHECK-BOLT2
CHECK-BOLT2-NOT: invalid (possibly stale) profile