Skip to content

Commit 769caf3

Browse files
committed
Merge from 'main' to 'sycl-web' (152 commits)
CONFLICT (content): Merge conflict in clang/test/CodeGenSYCL/unique_stable_name.cpp CONFLICT (content): Merge conflict in clang/test/CodeGenSYCL/functionptr-addrspace.cpp CONFLICT (content): Merge conflict in clang/test/CodeGenSYCL/address-space-conversions.cpp CONFLICT (content): Merge conflict in clang/test/CodeGen/builtins-nvptx.c
2 parents e6dc83b + 532dc62 commit 769caf3

File tree

2,717 files changed

+45795
-31233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,717 files changed

+45795
-31233
lines changed

bolt/test/AArch64/lit.local.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ config.substitutions.insert(
55
0, ('%cflags',
66
'%cflags --target=aarch64-pc-linux -nostartfiles -nostdlib -fuse-ld=lld'
77
' -ffreestanding -Wl,--unresolved-symbols=ignore-all'))
8+
9+
config.substitutions.insert(
10+
0, ('%cxxflags',
11+
'%cxxflags --target=aarch64-pc-linux -nostartfiles -nostdlib -fuse-ld=lld'
12+
' -ffreestanding -Wl,--unresolved-symbols=ignore-all'))

bolt/test/Inputs/stub.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,10 @@ void *memcpy(void *dest, const void *src, unsigned long n) { return 0; }
44
void *memset(void *dest, int c, unsigned long n) { return 0; }
55
int printf(const char *format, ...) { return 0; }
66
void exit(int status) {}
7+
8+
void *__gxx_personality_v0;
9+
void *__cxa_allocate_exception;
10+
void *_ZTIi;
11+
void *__cxa_throw;
12+
void *__cxa_begin_catch;
13+
void *__cxa_end_catch;

bolt/test/X86/Inputs/unreachable.s

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ foo:
7878
.uleb128 0x1
7979
.LLSDACSE1:
8080
.LLSDATT1:
81+
8182
.text
82-
.globl main, function
83-
main:
83+
.globl _start, function
84+
_start:
8485
.cfi_startproc
86+
ud2
8587
.cfi_endproc

bolt/test/X86/asm-dump.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Test for asm-dump functionality.
33
*
4-
* REQUIRES: system-linux
4+
* REQUIRES: system-linux,bolt-runtime
55
*
66
* Compile the source
77
* RUN: %clang -fPIC %s -o %t.exe -Wl,-q
@@ -59,7 +59,8 @@
5959
* CHECK-FILE-NEXT: .size main, .-main
6060
* CHECK-FILE: .section .rodata
6161
*
62-
* CHECK-REOPT: BOLT-INFO: 1 out of {{.*}} functions in the binary {{.*}} have non-empty execution profile
62+
* CHECK-REOPT: BOLT-INFO: 1 out of {{.*}} functions in the binary {{.*}} have
63+
* CHECK-REOPT: non-empty execution profile
6364
*/
6465
#include <stdio.h>
6566
#include <string.h>

bolt/test/X86/avx512-trap.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check that BOLT inserts trap instruction at entry to functions that use AVX-512.
22
# Check that AVX-512 instruction is updated correctly when -trap-avx512=0 is passed.
33

4-
RUN: %clang %S/Inputs/avx512.c -o %t -Wl,-q,-znow
4+
RUN: %clang %cflags %S/Inputs/avx512.c -o %t -Wl,-q,-znow
55
RUN: llvm-bolt %t -trap-avx512=1 -o %t.bolt 2>&1 | FileCheck %s && \
66
RUN: llvm-objdump -d --disassemble-symbols=use_avx512 %t.bolt | FileCheck %s --check-prefix=CHECK-DIS
77
RUN: llvm-bolt %t -trap-avx512=0 -o %t.bolt && \

bolt/test/X86/bug-reorder-bb-jrcxz.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
1313
# RUN: %s -o %t.o
1414
# RUN: link_fdata %s %t.o %t.fdata
15-
# RUN: %clang %t.o -falign-labels -march=native -o %t.exe -Wl,-q
15+
# RUN: %clang %cflags %t.o -falign-labels -march=native -o %t.exe -Wl,-q
1616

1717
# RUN: llvm-bolt %t.exe -o %t.bolted -data %t.fdata \
1818
# RUN: -reorder-blocks=cache+ -reorder-functions=hfsort \

bolt/test/X86/exceptions-args.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Check that we handle GNU_args_size correctly.
22
# It is generated for throwing functions with LP that have parameters on stack.
33

4-
RUN: %clangxx %cxxflags %p/Inputs/exc_args.s -o %t
4+
RUN: %clang %cflags %p/../Inputs/stub.c -fPIC -pie -shared -o %t.so
5+
RUN: %clangxx %cxxflags %p/Inputs/exc_args.s -o %t %t.so -Wl,-z,notext
56
RUN: llvm-bolt %t -o /dev/null -print-finalized -print-only=main | FileCheck %s
67

78
CHECK: Binary Function "main" after finalize-functions

bolt/test/X86/fallthrough-to-noop.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
55
RUN: %S/Inputs/ft_to_noop.s -o %t.o
66
RUN: link_fdata %S/Inputs/ft_to_noop.s %t.o %t.fdata
77
RUN: llvm-strip --strip-unneeded %t.o
8-
RUN: %clang %t.o -o %t.exe -Wl,-q
8+
RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
99
RUN: llvm-bolt %t.exe -o %t -data %t.fdata \
1010
RUN: -print-cfg -sequential-disassembly 2>&1 | FileCheck %s
1111

bolt/test/X86/inlined-function-mixed.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Make sure inlining from a unit with debug info into unit without
22
# debug info does not cause a crash.
33

4-
RUN: %clangxx %S/Inputs/inlined.cpp -c -o %T/inlined.o
4+
RUN: %clangxx %cxxflags %S/Inputs/inlined.cpp -c -o %T/inlined.o
55
RUN: %clangxx %cxxflags %S/Inputs/inlinee.cpp -c -o %T/inlinee.o -g
6-
RUN: %clangxx %T/inlined.o %T/inlinee.o -o %t
6+
RUN: %clangxx %cxxflags %T/inlined.o %T/inlinee.o -o %t
77

88
RUN: llvm-bolt %t -o %t.bolt -update-debug-sections -reorder-blocks=reverse \
99
RUN: -inline-small-functions -force-inline=main | FileCheck %s

bolt/test/X86/jmp-optimization.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Tests the optimization of functions that just do a tail call in the beginning.
22

3-
RUN: %clang -O2 %S/Inputs/jmp_opt{,2,3}.cpp -o %t
3+
RUN: %clang %cflags -O2 %S/Inputs/jmp_opt{,2,3}.cpp -o %t
44
RUN: llvm-bolt -inline-small-functions %t -o %t.bolt
55
RUN: llvm-objdump -d %t.bolt --print-imm-hex | FileCheck %s
66

0 commit comments

Comments
 (0)