diff options
| author | Dean Michael Berris <dberris@google.com> | 2018-05-04 06:27:53 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2018-05-04 06:27:53 +0000 |
| commit | ef173d0d87b11574665f7d921cf5fa4e5d85a8e2 (patch) | |
| tree | 98b6bad3328e1989d80d2ac9427b57e714adc8d5 /test/xray | |
| parent | eebc67fc29382a7505890e517e1d9eedae5c4f57 (diff) | |
[XRay][compiler-rt] Support string-based config for Basic mode.
Summary:
This addresses http://llvm.org/PR36790.
This change allows the XRay Basic Mode implementation to use the
string-based initialization routine provided through
`__xray_log_init_mode(...)`. In the process, we've also deprecated some
flags defined for the `XRAY_OPTIONS` environment variable.
We then introduce another environment variable that can control the XRay
Basic Mode implementation through `XRAY_BASIC_OPTIONS`.
We also rename files from `xray_inmemory_log` to `xray_basic_logging` to
be more in line with the mode implementation.
Depends on D46174.
Reviewers: echristo, kpw, pelikan, eizan
Reviewed By: kpw
Subscribers: mgorny, llvm-commits
Differential Revision: https://reviews.llvm.org/D46246
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@331507 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/xray')
| -rw-r--r-- | test/xray/TestCases/Posix/basic-filtering.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/xray/TestCases/Posix/basic-filtering.cc b/test/xray/TestCases/Posix/basic-filtering.cc index bd3f6c6e4..5c51ef698 100644 --- a/test/xray/TestCases/Posix/basic-filtering.cc +++ b/test/xray/TestCases/Posix/basic-filtering.cc @@ -3,7 +3,7 @@ // RUN: %clangxx_xray -std=c++11 %s -o %t -g // RUN: rm basic-filtering-* || true -// RUN: XRAY_OPTIONS="patch_premain=true xray_naive_log=true verbosity=1 \ +// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \ // RUN: xray_logfile_base=basic-filtering- \ // RUN: xray_naive_log_func_duration_threshold_us=1000 \ // RUN: xray_naive_log_max_stack_depth=2" %run %t 2>&1 | \ @@ -13,6 +13,16 @@ // RUN: FileCheck %s --check-prefix TRACE // RUN: rm basic-filtering-* || true // +// Now check support for the XRAY_BASIC_OPTIONS environment variable. +// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \ +// RUN: xray_logfile_base=basic-filtering-" \ +// RUN: XRAY_BASIC_OPTIONS="func_duration_threshold_us=1000 max_stack_depth=2" \ +// RUN: %run %t 2>&1 | FileCheck %s +// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \ +// RUN: "`ls basic-filtering-* | head -1`" | \ +// RUN: FileCheck %s --check-prefix TRACE +// RUN: rm basic-filtering-* || true +// // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree |