Skip to content

Commit 1eca0ed

Browse files
RKSimonRKSimon
authored
Merge branch 'main' into issue_166814
2 parents c7c9925 + c7a9be8 commit 1eca0ed

Some content is hidden

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

44 files changed

+651
-286
lines changed

‎clang/test/Preprocessor/predefined-arch-macros.c‎

Lines changed: 58 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2525,15 +2525,32 @@
25252525
// RUN: %clang -march=wildcatlake -m32 -E -dM %s -o - 2>&1 \
25262526
// RUN: -target i386-unknown-linux \
25272527
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M32,CHECK_ARLS_M32,CHECK_NKL_M32
2528-
// RUN: %clang -march=novalake -m32 -E -dM %s -o - 2>&1 \
2529-
// RUN: -target i386-unknown-linux \
2530-
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M32,CHECK_ARLS_M32,CHECK_NVL_M32,CHECK_NKL_M32
25312528
// RUN: %clang -march=clearwaterforest -m32 -E -dM %s -o - 2>&1 \
25322529
// RUN: -target i386-unknown-linux \
2533-
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_SRF_M32,CHECK_ARLS_M32,CHECK_NVL_M32,CHECK_UMSR_M32,CHECK_NKL_M32
2530+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_SRF_M32,CHECK_ARLS_M32,CHECK_UMSR_M32,CHECK_CWF_M32,CHECK_NKL_M32
2531+
// RUN: %clang -march=novalake -m32 -E -dM %s -o - 2>&1 \
2532+
// RUN: -target i386-unknown-linux \
2533+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M32,CHECK_ARLS_M32,CHECK_CWF_M32,CHECK_NVL_M32,CHECK_NKL_M32
25342534
// CHECK_ARL_M32: #define __ADX__ 1
25352535
// CHECK_ARL_M32: #define __AES__ 1
2536+
// CHECK_NVL_M32: #define __AVX10_1__ 1
2537+
// CHECK_NVL_M32: #define __AVX10_2__ 1
25362538
// CHECK_ARL_M32: #define __AVX2__ 1
2539+
// CHECK_NVL_M32: #define __AVX512BF16__ 1
2540+
// CHECK_NVL_M32: #define __AVX512BITALG__ 1
2541+
// CHECK_NVL_M32: #define __AVX512BW__ 1
2542+
// CHECK_NVL_M32: #define __AVX512CD__ 1
2543+
// CHECK_NVL_M32: #define __AVX512DQ__ 1
2544+
// CHECK_NVL_M32: #define __AVX512FP16__ 1
2545+
// CHECK_NVL_M32: #define __AVX512F__ 1
2546+
// CHECK_NVL_M32: #define __AVX512IFMA__ 1
2547+
// CHECK_NVL_M32: #define __AVX512VBMI2__ 1
2548+
// CHECK_NVL_M32: #define __AVX512VBMI__ 1
2549+
// CHECK_NVL_M32: #define __AVX512VL__ 1
2550+
// CHECK_NVL_M32: #define __AVX512VNNI__ 1
2551+
// CHECK_NVL_M32: #define __AVX512VPOPCNTDQ__ 1
2552+
// We check for NOT AVX512 after all checks for AVX512, so
2553+
// if we missed some check on NVL, the test will fail.
25372554
// CHECK_ARL_M32-NOT: AVX512
25382555
// CHECK_ARL_M32: #define __AVXIFMA__ 1
25392556
// CHECK_ARL_M32: #define __AVXNECONVERT__ 1
@@ -2544,11 +2561,13 @@
25442561
// CHECK_ARL_M32: #define __AVX__ 1
25452562
// CHECK_ARL_M32: #define __BMI2__ 1
25462563
// CHECK_ARL_M32: #define __BMI__ 1
2564+
// CHECK_NVL_M32: #define __CCMP__ 1
25472565
// CHECK_ARLS_M32-NOT: __CLDEMOTE__
25482566
// CHECK_SRF_M32: #define __CLDEMOTE__ 1
25492567
// CHECK_ARL_M32: #define __CLFLUSHOPT__ 1
25502568
// CHECK_ARL_M32: #define __CLWB__ 1
25512569
// CHECK_ARL_M32: #define __CMPCCXADD__ 1
2570+
// CHECK_NVL_M32: #define __EGPR__ 1
25522571
// CHECK_ARL_M32: #define __ENQCMD__ 1
25532572
// CHECK_ARL_M32: #define __F16C__ 1
25542573
// CHECK_ARL_M32: #define __FMA__ 1
@@ -2564,15 +2583,20 @@
25642583
// CHECK_ARL_M32: #define __MOVBE__ 1
25652584
// CHECK_ARL_M32: #define __MOVDIR64B__ 1
25662585
// CHECK_ARL_M32: #define __MOVDIRI__ 1
2586+
// CHECK_NVL_M32: #define __MOVRS__ 1
2587+
// CHECK_NVL_M32: #define __NDD__ 1
2588+
// CHECK_NVL_M32: #define __NF__ 1
25672589
// CHECK_ARL_M32: #define __PCLMUL__ 1
25682590
// CHECK_ARL_M32: #define __PCONFIG__ 1
25692591
// CHECK_ARL_M32: #define __PKU__ 1
25702592
// CHECK_ARL_M32: #define __POPCNT__ 1
2593+
// CHECK_NVL_M32: #define __PPX__ 1
25712594
// CHECK_ARL_M32-NOT: #define __PREFETCHI__ 1
25722595
// CHECK_ARLS_M32-NOT: #define __PREFETCHI__ 1
2573-
// CHECK_NVL_M32: #define __PREFETCHI__ 1
2596+
// CHECK_CWF_M32: #define __PREFETCHI__ 1
25742597
// CHECK_ARL_M32: #define __PRFCHW__ 1
25752598
// CHECK_ARL_M32: #define __PTWRITE__ 1
2599+
// CHECK_NVL_M32: #define __PUSH2POP2__ 1
25762600
// CHECK_ARL_M32-NOT: #define __RAOINT__ 1
25772601
// CHECK_ARL_M32: #define __RDPID__ 1
25782602
// CHECK_ARL_M32: #define __RDRND__ 1
@@ -2607,6 +2631,7 @@
26072631
// CHECK_ARL_M32: #define __XSAVEOPT__ 1
26082632
// CHECK_ARL_M32: #define __XSAVES__ 1
26092633
// CHECK_ARL_M32: #define __XSAVE__ 1
2634+
// CHECK_NVL_M32: #define __ZU__ 1
26102635
// CHECK_ARL_M32: #define __corei7 1
26112636
// CHECK_ARL_M32: #define __corei7__ 1
26122637
// CHECK_ARL_M32: #define __i386 1
@@ -2635,15 +2660,30 @@
26352660
// RUN: %clang -march=wildcatlake -m64 -E -dM %s -o - 2>&1 \
26362661
// RUN: -target i386-unknown-linux \
26372662
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M64,CHECK_ARLS_M64,CHECK_NKL_M64
2638-
// RUN: %clang -march=novalake -m64 -E -dM %s -o - 2>&1 \
2639-
// RUN: -target i386-unknown-linux \
2640-
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M64,CHECK_ARLS_M64,CHECK_NVL_M64,CHECK_NKL_M64
26412663
// RUN: %clang -march=clearwaterforest -m64 -E -dM %s -o - 2>&1 \
26422664
// RUN: -target i386-unknown-linux \
2643-
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M64,CHECK_SRF_M64,CHECK_ARLS_M64,CHECK_NVL_M64,CHECK_UMSR_M64,CHECK_NKL_M64
2665+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_SRF_M64,CHECK_ARLS_M64,CHECK_UMSR_M64,CHECK_CWF_M64,CHECK_NKL_M64
2666+
// RUN: %clang -march=novalake -m64 -E -dM %s -o - 2>&1 \
2667+
// RUN: -target i386-unknown-linux \
2668+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_ARL_M64,CHECK_ARLS_M64,CHECK_CWF_M64,CHECK_NVL_M64,CHECK_NKL_M64
26442669
// CHECK_ARL_M64: #define __ADX__ 1
26452670
// CHECK_ARL_M64: #define __AES__ 1
2671+
// CHECK_NVL_M64: #define __AVX10_1__ 1
2672+
// CHECK_NVL_M64: #define __AVX10_2__ 1
26462673
// CHECK_ARL_M64: #define __AVX2__ 1
2674+
// CHECK_NVL_M64: #define __AVX512BF16__ 1
2675+
// CHECK_NVL_M64: #define __AVX512BITALG__ 1
2676+
// CHECK_NVL_M64: #define __AVX512BW__ 1
2677+
// CHECK_NVL_M64: #define __AVX512CD__ 1
2678+
// CHECK_NVL_M64: #define __AVX512DQ__ 1
2679+
// CHECK_NVL_M64: #define __AVX512FP16__ 1
2680+
// CHECK_NVL_M64: #define __AVX512F__ 1
2681+
// CHECK_NVL_M64: #define __AVX512IFMA__ 1
2682+
// CHECK_NVL_M64: #define __AVX512VBMI2__ 1
2683+
// CHECK_NVL_M64: #define __AVX512VBMI__ 1
2684+
// CHECK_NVL_M64: #define __AVX512VL__ 1
2685+
// CHECK_NVL_M64: #define __AVX512VNNI__ 1
2686+
// CHECK_NVL_M64: #define __AVX512VPOPCNTDQ__ 1
26472687
// CHECK_ARL_M64-NOT: AVX512
26482688
// CHECK_ARL_M64: #define __AVXIFMA__ 1
26492689
// CHECK_ARL_M64: #define __AVXNECONVERT__ 1
@@ -2654,11 +2694,13 @@
26542694
// CHECK_ARL_M64: #define __AVX__ 1
26552695
// CHECK_ARL_M64: #define __BMI2__ 1
26562696
// CHECK_ARL_M64: #define __BMI__ 1
2697+
// CHECK_NVL_M64: #define __CCMP__ 1
26572698
// CHECK_ARLS_M64-NOT: __CLDEMOTE__
26582699
// CHECK_SRF_M64: #define __CLDEMOTE__ 1
26592700
// CHECK_ARL_M64: #define __CLFLUSHOPT__ 1
26602701
// CHECK_ARL_M64: #define __CLWB__ 1
26612702
// CHECK_ARL_M64: #define __CMPCCXADD__ 1
2703+
// CHECK_NVL_M64: #define __EGPR__ 1
26622704
// CHECK_ARL_M64: #define __ENQCMD__ 1
26632705
// CHECK_ARL_M64: #define __F16C__ 1
26642706
// CHECK_ARL_M64: #define __FMA__ 1
@@ -2674,15 +2716,20 @@
26742716
// CHECK_ARL_M64: #define __MOVBE__ 1
26752717
// CHECK_ARL_M64: #define __MOVDIR64B__ 1
26762718
// CHECK_ARL_M64: #define __MOVDIRI__ 1
2719+
// CHECK_NVL_M64: #define __MOVRS__ 1
2720+
// CHECK_NVL_M64: #define __NDD__ 1
2721+
// CHECK_NVL_M64: #define __NF__ 1
26772722
// CHECK_ARL_M64: #define __PCLMUL__ 1
26782723
// CHECK_ARL_M64: #define __PCONFIG__ 1
26792724
// CHECK_ARL_M64: #define __PKU__ 1
26802725
// CHECK_ARL_M64: #define __POPCNT__ 1
2726+
// CHECK_NVL_M64: #define __PPX__ 1
26812727
// CHECK_ARL_M64-NOT: #define __PREFETCHI__ 1
26822728
// CHECK_ARLS_M64-NOT: #define __PREFETCHI__ 1
2683-
// CHECK_NVL_M64: #define __PREFETCHI__ 1
2729+
// CHECK_CWF_M64: #define __PREFETCHI__ 1
26842730
// CHECK_ARL_M64: #define __PRFCHW__ 1
26852731
// CHECK_ARL_M64: #define __PTWRITE__ 1
2732+
// CHECK_NVL_M64: #define __PUSH2POP2__ 1
26862733
// CHECK_ARL_M64-NOT: #define __RAOINT__ 1
26872734
// CHECK_ARL_M64: #define __RDPID__ 1
26882735
// CHECK_ARL_M64: #define __RDRND__ 1
@@ -2718,6 +2765,7 @@
27182765
// CHECK_ARL_M64: #define __XSAVEOPT__ 1
27192766
// CHECK_ARL_M64: #define __XSAVES__ 1
27202767
// CHECK_ARL_M64: #define __XSAVE__ 1
2768+
// CHECK_NVL_M64: #define __ZU__ 1
27212769
// CHECK_ARL_M64: #define __amd64 1
27222770
// CHECK_ARL_M64: #define __amd64__ 1
27232771
// CHECK_ARL_M64: #define __corei7 1

‎compiler-rt/test/xray/TestCases/Posix/basic-filtering.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33

44
// RUN: %clangxx_xray -std=c++11 %s -o %t -g
55
// RUN: rm -f basic-filtering-*
6-
// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \
6+
// RUN: env XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \
77
// RUN: xray_logfile_base=basic-filtering- \
88
// RUN: xray_naive_log_func_duration_threshold_us=1000 \
99
// RUN: xray_naive_log_max_stack_depth=2" %run %t 2>&1 | \
1010
// RUN: FileCheck %s
11+
// RUN: ls basic-filtering-* | head -1 | tr -d '\n' > %t.log
1112
// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
12-
// RUN: "`ls basic-filtering-* | head -1`" | \
13+
// RUN: "%{readfile:%t.log}" | \
1314
// RUN: FileCheck %s --check-prefix TRACE
1415
// RUN: rm -f basic-filtering-*
1516
//
1617
// Now check support for the XRAY_BASIC_OPTIONS environment variable.
17-
// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \
18+
// RUN: env XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \
1819
// RUN: xray_logfile_base=basic-filtering-" \
19-
// RUN: XRAY_BASIC_OPTIONS="func_duration_threshold_us=1000 max_stack_depth=2" \
20+
// RUN: env XRAY_BASIC_OPTIONS="func_duration_threshold_us=1000 max_stack_depth=2" \
2021
// RUN: %run %t 2>&1 | FileCheck %s
22+
// RUN: ls basic-filtering-* | head -1 | tr -d '\n' > %t.log
2123
// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
22-
// RUN: "`ls basic-filtering-* | head -1`" | \
24+
// RUN: "%{readfile:%t.log}" | \
2325
// RUN: FileCheck %s --check-prefix TRACE
2426
// RUN: rm -f basic-filtering-*
2527

‎compiler-rt/test/xray/TestCases/Posix/basic-mode-dso.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -shared -std=c++11 %t/testlib.cpp -o %t/testlib.so
55
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -std=c++11 %t/main.cpp %t/testlib.so -Wl,-rpath,%t -o %t/main.o
66

7-
// RUN: XRAY_OPTIONS="patch_premain=false,xray_mode=xray-basic,xray_logfile_base=basic-mode-dso-,verbosity=1" XRAY_BASIC_OPTIONS="func_duration_threshold_us=0" %run %t/main.o 2>&1 | FileCheck %s
8-
// RUN: %llvm_xray account --format=csv --sort=funcid "`ls basic-mode-dso-* | head -1`" | FileCheck --check-prefix=ACCOUNT %s
7+
// RUN: env XRAY_OPTIONS="patch_premain=false,xray_mode=xray-basic,xray_logfile_base=basic-mode-dso-,verbosity=1" XRAY_BASIC_OPTIONS="func_duration_threshold_us=0" %run %t/main.o 2>&1 | FileCheck %s
8+
// RUN: ls basic-mode-dso-* | head -1 | tr -d '\n' > %t.log
9+
// RUN: %llvm_xray account --format=csv --sort=funcid "%{readfile:%t.log}" | FileCheck --check-prefix=ACCOUNT %s
910
// RUN: rm basic-mode-dso-*
1011

1112
// REQUIRES: target={{(aarch64|x86_64)-.*}}

‎compiler-rt/test/xray/TestCases/Posix/c-test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clang_xray -g -fxray-modes=xray-basic,xray-fdr,xray-profiling -o %t %s
22
// RUN: rm -f xray-log.c-test.*
3-
// RUN: XRAY_OPTIONS=patch_premain=true:verbosity=1:xray_mode=xray-basic %t \
3+
// RUN: env XRAY_OPTIONS=patch_premain=true:verbosity=1:xray_mode=xray-basic %t \
44
// RUN: 2>&1 | FileCheck %s
55
// RUN: rm -f xray-log.c-test.*
66
//

‎compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// expect 16-byte alignment of the stack.
33
//
44
// RUN: %clangxx_xray -std=c++11 %s -o %t
5-
// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1" \
5+
// RUN: env XRAY_OPTIONS="patch_premain=false verbosity=1" \
66
// RUN: %run %t 2>&1
77
// REQUIRES: x86_64-target-arch
88
// REQUIRES: built-in-llvm-tree

‎compiler-rt/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// calls.
33
//
44
// RUN: %clangxx_xray -std=c++11 %s -o %t
5-
// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1" \
5+
// RUN: env XRAY_OPTIONS="patch_premain=false verbosity=1" \
66
// RUN: %run %t 2>&1
77
// REQUIRES: x86_64-target-arch
88
// REQUIRES: built-in-llvm-tree

‎compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Use the clang feature for custom xray event logging.
22
//
33
// RUN: %clangxx_xray -std=c++11 %s -o %t
4-
// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s
4+
// RUN: env XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s
55
// RUN: %clangxx_xray -std=c++11 -fpic -fpie %s -o %t
6-
// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s
6+
// RUN: env XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s
77
// FIXME: Support this in non-x86_64 as well
88
// REQUIRES: target={{(aarch64|x86_64)-.*linux.*}}
99
// REQUIRES: built-in-llvm-tree

‎compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// RUN: rm -rf %t.dir
33
// RUN: mkdir -p %t.dir
44
// RUN: cd %t.dir
5-
// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
5+
// RUN: env XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
66
// RUN: verbosity=1" \
7-
// RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
7+
// RUN: env XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
88
// RUN: %run %t 2>&1 | FileCheck %s
9-
// RUN: FILES=`find %t.dir -name 'fdr-inmemory-test-*' | wc -l`
10-
// RUN: [ $FILES -eq 0 ]
9+
// RUN: find %t.dir -name 'fdr-inmemory-test-*' | wc -l | tr -d '\n' > %t.file_count
10+
// RUN: %python -c "import sys; sys.exit(int(sys.argv[1]))" %{readfile:%t.file_count}
1111
// RUN: rm -rf %t.dir
1212
//
1313
// REQUIRES: built-in-llvm-tree

‎compiler-rt/test/xray/TestCases/Posix/fdr-mode-multiple.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// RUN: rm -rf %t.dir
33
// RUN: mkdir -p %t.dir
44
// RUN: cd %t.dir
5-
// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
5+
// RUN: env XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
66
// RUN: verbosity=1" \
7-
// RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
7+
// RUN: env XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
88
// RUN: %run %t 2>&1 | FileCheck %s
9-
// RUN: FILES=`find %t.dir -name 'fdr-inmemory-test-*' | wc -l`
10-
// RUN: [ $FILES -eq 0 ]
9+
// RUN: find %t.dir -name 'fdr-inmemory-test-*' | wc -l | tr -d '\n' > %t.file_count
10+
// RUN: %python -c "import sys; sys.exit(int(sys.argv[1]))" %{readfile:%t.file_count}
1111
// RUN: rm -rf %t.dir
1212
//
1313
// REQUIRES: built-in-llvm-tree

‎compiler-rt/test/xray/TestCases/Posix/fdr-mode.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
// RUN: %clangxx_xray -g -std=c++11 %s -o %t
22
// RUN: rm -f fdr-logging-test-*
33
// RUN: rm -f fdr-unwrite-test-*
4-
// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-logging-test- \
4+
// RUN: env XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-logging-test- \
55
// RUN: xray_mode=xray-fdr verbosity=1" \
6-
// RUN: XRAY_FDR_OPTIONS="func_duration_threshold_us=0" \
6+
// RUN: env XRAY_FDR_OPTIONS="func_duration_threshold_us=0" \
77
// RUN: %run %t 2>&1 | FileCheck %s
8-
// RUN: XRAY_OPTIONS="patch_premain=false \
8+
// RUN: env XRAY_OPTIONS="patch_premain=false \
99
// RUN: xray_logfile_base=fdr-unwrite-test- xray_mode=xray-fdr \
1010
// RUN: verbosity=1" \
11-
// RUN: XRAY_FDR_OPTIONS="func_duration_threshold_us=5000" \
11+
// RUN: env XRAY_FDR_OPTIONS="func_duration_threshold_us=5000" \
1212
// RUN: %run %t 2>&1 | FileCheck %s
13+
// RUN: ls fdr-logging-test-* | head -1 | tr -d '\n' > %t.log
1314
// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
14-
// RUN: "`ls fdr-logging-test-* | head -1`" \
15+
// RUN: "%{readfile:%t.log}" \
1516
// RUN: | FileCheck %s --check-prefix=TRACE
17+
// RUN: ls fdr-unwrite-test-* | head -1 | tr -d '\n' > %t.log
1618
// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
17-
// RUN: "`ls fdr-unwrite-test-* | head -1`" \
19+
// RUN: "%{readfile:%t.log}" \
1820
// RUN: | FileCheck %s --check-prefix=UNWRITE
1921
// RUN: rm fdr-logging-test-*
2022
// RUN: rm fdr-unwrite-test-*

0 commit comments

Comments
 (0)