From 02cdbc349fe85b52ea733fd1a0958d420027104f Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 17 May 2020 09:31:09 -0700 Subject: [PATCH] [XRay] Migrate xray_naive_log=true tests to xray_mode=xray-basic --- compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/argv0-log-file-name.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/coverage-sample.cpp | 2 +- .../test/xray/TestCases/Posix/custom-event-handler-alignment.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp | 4 ++-- compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/fixedsize-logging.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/func-id-utils.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/optional-inmemory-log.cpp | 2 +- compiler-rt/test/xray/TestCases/Posix/pic_test.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp index a6ca0a49525..48544c39239 100644 --- a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp @@ -3,7 +3,7 @@ // // RUN: %clangxx_xray -std=c++11 %s -o %t // RUN: rm -f arg1-logger-* -// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=true \ +// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_mode=xray-basic \ // RUN: xray_logfile_base=arg1-logger-" %run %t 2>&1 | FileCheck %s // // After all that, clean up the XRay log file. diff --git a/compiler-rt/test/xray/TestCases/Posix/argv0-log-file-name.cpp b/compiler-rt/test/xray/TestCases/Posix/argv0-log-file-name.cpp index a2cb11b4d0d..bd48693d37c 100644 --- a/compiler-rt/test/xray/TestCases/Posix/argv0-log-file-name.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/argv0-log-file-name.cpp @@ -2,7 +2,7 @@ // name. // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=true xray_naive_log=true" %run %t > xray.log.file.name 2>&1 +// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic" %run %t > xray.log.file.name 2>&1 // RUN: ls | FileCheck xray.log.file.name // RUN: rm xray-log.argv0-log-file-name.* xray.log.file.name diff --git a/compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp b/compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp index dac0789abde..f9189644b40 100644 --- a/compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/common-trampoline-alignment.cpp @@ -2,7 +2,7 @@ // expect 16-byte alignment of the stack. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_naive_log=false" \ +// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1" \ // RUN: %run %t 2>&1 // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/coverage-sample.cpp b/compiler-rt/test/xray/TestCases/Posix/coverage-sample.cpp index 62c13ba3d42..e05724e5915 100644 --- a/compiler-rt/test/xray/TestCases/Posix/coverage-sample.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/coverage-sample.cpp @@ -1,7 +1,7 @@ // Check that we can patch and unpatch specific function ids. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false" %run %t | FileCheck %s +// RUN: XRAY_OPTIONS="patch_premain=false" %run %t | FileCheck %s // UNSUPPORTED: target-is-mips64,target-is-mips64el diff --git a/compiler-rt/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp b/compiler-rt/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp index c8de18b0e2b..9c61cba83b0 100644 --- a/compiler-rt/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp @@ -2,7 +2,7 @@ // calls. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_naive_log=false" \ +// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1" \ // RUN: %run %t 2>&1 // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp b/compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp index 48fd6203419..d879270e33b 100644 --- a/compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/custom-event-logging.cpp @@ -1,9 +1,9 @@ // Use the clang feature for custom xray event logging. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_naive_log=false xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s +// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s // RUN: %clangxx_xray -std=c++11 -fpic -fpie %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_naive_log=false xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s +// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_logfile_base=custom-event-logging.xray-" %run %t 2>&1 | FileCheck %s // FIXME: Support this in non-x86_64 as well // REQUIRES: x86_64-linux // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cpp b/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cpp index accc5925c68..4215774d240 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t // RUN: rm -f fdr-logging-1thr-* // RUN: XRAY_OPTIONS=XRAY_OPTIONS="verbosity=1 patch_premain=true \ -// RUN: xray_naive_log=false xray_fdr_log=true \ +// RUN: xray_fdr_log=true \ // RUN: xray_fdr_log_func_duration_threshold_us=0 \ // RUN: xray_logfile_base=fdr-logging-1thr-" %run %t 2>&1 // RUN: %llvm_xray convert --output-format=yaml --symbolize --instr_map=%t \ diff --git a/compiler-rt/test/xray/TestCases/Posix/fixedsize-logging.cpp b/compiler-rt/test/xray/TestCases/Posix/fixedsize-logging.cpp index a2a41ce60d6..e4462c8b45e 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fixedsize-logging.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/fixedsize-logging.cpp @@ -1,7 +1,7 @@ // Check to make sure that we have a log file with a fixed-size. // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=true xray_naive_log=true verbosity=1 xray_logfile_base=fixedsize-logging-" %run %t 2>&1 | FileCheck %s +// RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 xray_logfile_base=fixedsize-logging-" %run %t 2>&1 | FileCheck %s // // After all that, clean up the output xray log. // diff --git a/compiler-rt/test/xray/TestCases/Posix/func-id-utils.cpp b/compiler-rt/test/xray/TestCases/Posix/func-id-utils.cpp index 41275366601..d2347dfcb6d 100644 --- a/compiler-rt/test/xray/TestCases/Posix/func-id-utils.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/func-id-utils.cpp @@ -2,7 +2,7 @@ // maximum function id for the current binary. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false" %run %t +// RUN: XRAY_OPTIONS="patch_premain=false" %run %t // UNSUPPORTED: target-is-mips64,target-is-mips64el diff --git a/compiler-rt/test/xray/TestCases/Posix/optional-inmemory-log.cpp b/compiler-rt/test/xray/TestCases/Posix/optional-inmemory-log.cpp index feaaa412475..a32c8746640 100644 --- a/compiler-rt/test/xray/TestCases/Posix/optional-inmemory-log.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/optional-inmemory-log.cpp @@ -2,7 +2,7 @@ // we turn it off via options. // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=false xray_logfile_base=optional-inmemory-log.xray-" %run %t 2>&1 | FileCheck %s +// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=optional-inmemory-log.xray-" %run %t 2>&1 | FileCheck %s // // Make sure we clean out the logs in case there was a bug. // diff --git a/compiler-rt/test/xray/TestCases/Posix/pic_test.cpp b/compiler-rt/test/xray/TestCases/Posix/pic_test.cpp index 93e1a6a47d3..fbf6bdcd4a7 100644 --- a/compiler-rt/test/xray/TestCases/Posix/pic_test.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/pic_test.cpp @@ -3,7 +3,7 @@ // RUN: %clangxx_xray -fxray-instrument -std=c++11 -ffunction-sections \ // RUN: -fdata-sections -fpic -fpie -Wl,--gc-sections %s -o %t // RUN: rm -f pic-test-logging-* -// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=true \ +// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_mode=xray-basic \ // RUN: xray_logfile_base=pic-test-logging-" %run %t 2>&1 | FileCheck %s // After all that, clean up the output xray log. // -- 2.11.0