[compiler-rt] r367652 - compiler-rt: Rename .cc file in test/xray to .cpp

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 1 22:49:58 PDT 2019


Author: maskray
Date: Thu Aug  1 22:49:58 2019
New Revision: 367652

URL: http://llvm.org/viewvc/llvm-project?rev=367652&view=rev
Log:
compiler-rt: Rename .cc file in test/xray to .cpp

Like r367463, but for test/xray.

Update test/xray/lit.cfg.py config.suffixes to remove .cc (we actually
don't have .c tests now)

Added:
    compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cpp
      - copied, changed from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc
Removed:
    compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc
    compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc
Modified:
    compiler-rt/trunk/test/xray/lit.cfg.py

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc (removed)
@@ -1,23 +0,0 @@
-// Test that the always/never instrument lists apply.
-// RUN: echo "fun:main" > %tmp-always.txt
-// RUN: echo "fun:__xray*" > %tmp-never.txt
-// RUN: %clangxx_xray \
-// RUN:     -fxray-never-instrument=%tmp-never.txt \
-// RUN:     -fxray-always-instrument=%tmp-always.txt \
-// RUN:     %s -o %t
-// RUN: %llvm_xray extract -symbolize %t | \
-// RUN:    FileCheck %s --check-prefix NOINSTR
-// RUN: %llvm_xray extract -symbolize %t | \
-// RUN:    FileCheck %s --check-prefix ALWAYSINSTR
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-// NOINSTR-NOT: {{.*__xray_NeverInstrumented.*}}
-int __xray_NeverInstrumented() {
-  return 0;
-}
-
-// ALWAYSINSTR: {{.*function-name:.*main.*}}
-int main(int argc, char *argv[]) {
-  return __xray_NeverInstrumented();
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/always-never-instrument.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc (removed)
@@ -1,39 +0,0 @@
-// Allow having both the no-arg and arg1 logging implementation live together,
-// and be called in the correct cases.
-//
-// RUN: rm -f arg0-arg1-logging-*
-// RUN: %clangxx_xray -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=arg0-arg1-logging-" %run %t
-//
-// TODO: Support these in ARM and PPC
-// XFAIL: arm || aarch64 || mips
-// UNSUPPORTED: powerpc64le
-
-#include "xray/xray_interface.h"
-#include <cassert>
-#include <cstdio>
-
-using namespace std;
-
-bool arg0loggercalled = false;
-void arg0logger(int32_t, XRayEntryType) { arg0loggercalled = true; }
-
-[[clang::xray_always_instrument]] void arg0fn() { printf("hello, arg0!\n"); }
-
-bool arg1loggercalled = false;
-void arg1logger(int32_t, XRayEntryType, uint64_t) { arg1loggercalled = true; }
-
-[[ clang::xray_always_instrument, clang::xray_log_args(1) ]] void
-arg1fn(uint64_t arg1) {
-  printf("hello, arg1!\n");
-}
-
-int main(int argc, char *argv[]) {
-  __xray_set_handler(arg0logger);
-  __xray_set_handler_arg1(arg1logger);
-  arg0fn();
-  arg1fn(0xcafef00d);
-  __xray_remove_handler_arg1();
-  __xray_remove_handler();
-  assert(arg0loggercalled && arg1loggercalled);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-arg0-logging.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc (removed)
@@ -1,45 +0,0 @@
-// Check that we can get the first function argument logged
-// using a custom logging function.
-//
-// 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_logfile_base=arg1-logger-" %run %t 2>&1 | FileCheck %s
-//
-// After all that, clean up the XRay log file.
-//
-// RUN: rm -f arg1-logger-*
-//
-// At the time of writing, the ARM trampolines weren't written yet.
-// XFAIL: arm || aarch64 || mips
-// See the mailing list discussion of r296998.
-// UNSUPPORTED: powerpc64le
-
-#include "xray/xray_interface.h"
-
-#include <cinttypes>
-#include <cstdio>
-
-void arg1logger(int32_t fn, XRayEntryType t, uint64_t a1) {
-  printf("Arg1: %" PRIx64 ", XRayEntryType %u\n", a1, t);
-}
-
-[[clang::xray_always_instrument, clang::xray_log_args(1)]] void foo(void *) {}
-
-int main() {
-  // CHECK: XRay: Log file in 'arg1-logger-{{.*}}'
-
-  __xray_set_handler_arg1(arg1logger);
-  foo(nullptr);
-  // CHECK: Arg1: 0, XRayEntryType 3
-
-  __xray_remove_handler_arg1();
-  foo((void *) 0xBADC0DE);
-  // nothing expected to see here
-
-  __xray_set_handler_arg1(arg1logger);
-  foo((void *) 0xDEADBEEFCAFE);
-  // CHECK-NEXT: Arg1: deadbeefcafe, XRayEntryType 3
-  foo((void *) -1);
-  // CHECK-NEXT: Arg1: ffffffffffffffff, XRayEntryType 3
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logger.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc (removed)
@@ -1,31 +0,0 @@
-// Intercept the implicit 'this' argument of class member functions.
-//
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t
-// RUN: rm -f log-args-this-*
-// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=log-args-this-" %run %t
-//
-// XFAIL: FreeBSD || arm || aarch64 || mips
-// UNSUPPORTED: powerpc64le
-#include "xray/xray_interface.h"
-#include <cassert>
-
-class A {
- public:
-  [[clang::xray_always_instrument, clang::xray_log_args(1)]] void f() {
-    // does nothing.
-  }
-};
-
-volatile uint64_t captured = 0;
-
-void handler(int32_t, XRayEntryType, uint64_t arg1) {
-  captured = arg1;
-}
-
-int main() {
-  __xray_set_handler_arg1(handler);
-  A instance;
-  instance.f();
-  __xray_remove_handler_arg1();
-  assert(captured == (uint64_t)&instance);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc (removed)
@@ -1,16 +0,0 @@
-// Check to make sure argv[0] is contained within the (randomised) XRay log file
-// 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: ls | FileCheck xray.log.file.name
-// RUN: rm xray-log.argv0-log-file-name.* xray.log.file.name
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include <cstdio>
-#include <libgen.h>
-
-[[clang::xray_always_instrument]] int main(int argc, char *argv[]) {
-  printf("// CHECK: xray-log.%s.{{.*}}\n", basename(argv[0]));
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/argv0-log-file-name.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc (removed)
@@ -1,61 +0,0 @@
-// Check to make sure that we are actually filtering records from the basic mode
-// logging implementation.
-
-// RUN: %clangxx_xray -std=c++11 %s -o %t -g
-// RUN: rm -f basic-filtering-*
-// 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 | \
-// RUN:     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 -f basic-filtering-*
-//
-// 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 -f basic-filtering-*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include <cstdio>
-#include <time.h>
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) filtered() {
-  printf("filtered was called.\n");
-}
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) beyond_stack() {
-  printf("beyond stack was called.\n");
-}
-
-[[clang::xray_always_instrument]] void __attribute__((noinline))
-always_shows() {
-  struct timespec sleep;
-  sleep.tv_nsec = 2000000;
-  sleep.tv_sec = 0;
-  struct timespec rem;
-  while (nanosleep(&sleep, &rem) == -1)
-    sleep = rem;
-  printf("always_shows was called.\n");
-  beyond_stack();
-}
-
-[[clang::xray_always_instrument]] int main(int argc, char *argv[]) {
-  filtered();     // CHECK: filtered was called.
-  always_shows(); // CHECK: always_shows was called.
-  // CHECK: beyond stack was called.
-}
-
-// TRACE-NOT: - { type: 0, func-id: {{.*}}, function: {{.*filtered.*}}, {{.*}} }
-// TRACE-NOT: - { type: 0, func-id: {{.*}}, function: {{.*beyond_stack.*}}, {{.*}} }
-// TRACE-DAG: - { type: 0, func-id: [[FID:[0-9]+]], function: {{.*always_shows.*}}, cpu: {{.*}}, thread: {{.*}}, kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FID]], function: {{.*always_shows.*}}, cpu: {{.*}}, thread: {{.*}}, kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/basic-filtering.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc (removed)
@@ -1,15 +0,0 @@
-// RUN: %clang_xray -g -fxray-modes=xray-basic,xray-fdr,xray-profiling -o %t %s
-// RUN: rm -f xray-log.c-test.*
-// RUN: XRAY_OPTIONS=patch_premain=true:verbosity=1:xray_mode=xray-basic %t \
-// RUN:     2>&1 | FileCheck %s
-// RUN: rm -f xray-log.c-test.*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-__attribute__((xray_always_instrument)) void always() {}
-
-int main() {
-  always();
-}
-
-// CHECK: =={{[0-9].*}}==XRay: Log file in '{{.*}}'

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/c-test.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc (removed)
@@ -1,11 +0,0 @@
-// Test that we cannot actually find XRay instrumentation when we build with
-// -fno-xray-instrument but have code that's marked as 'xray_always_instrument'.
-//
-// RUN: %clangxx -fno-xray-instrument -c %s -o %t.o
-// RUN: not %llvm_xray extract -symbolize %t.o 2>&1 | FileCheck %s
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-// CHECK: llvm-xray: Cannot extract instrumentation map
-// CHECK-NOT: {{.*always_instrumented.*}}
-[[clang::xray_always_instrument]] int always_instrumented() { return 42; }

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/clang-no-xray-instrument.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc (removed)
@@ -1,57 +0,0 @@
-// Make sure that we're aligning the stack properly to support handlers that
-// 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:     %run %t 2>&1
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-#include "xray/xray_interface.h"
-#include <stdio.h>
-#include <xmmintrin.h>
-
-[[clang::xray_never_instrument]] __attribute__((weak)) __m128 f(__m128 *i) {
-  return *i;
-}
-
-[[clang::xray_always_instrument]] __attribute__((noinline)) void noarg() {
-  __m128 v = {};
-  f(&v);
-}
-
-[[ clang::xray_always_instrument, clang::xray_log_args(1) ]]
-__attribute__((noinline)) void arg1(int) {
-  __m128 v = {};
-  f(&v);
-}
-
-[[clang::xray_always_instrument]] __attribute__((noinline))
-void no_alignment() {}
-
-[[clang::xray_never_instrument]] void noarg_handler(int32_t,
-                                                        XRayEntryType) {
-  printf("noarg handler called\n");
-  __m128 v = {};
-  f(&v);
-}
-
-[[clang::xray_never_instrument]] void arg1_handler(int32_t, XRayEntryType,
-                                                   uint64_t) {
-  printf("arg1 handler called\n");
-  __m128 v = {};
-  f(&v);
-}
-
-int main(int argc, char *argv[]) {
-  __xray_set_handler(noarg_handler);
-  __xray_set_handler_arg1(arg1_handler);
-  __xray_patch();
-  noarg();    // CHECK: noarg handler called
-  arg1(argc); // CHECK: arg1 handler called
-  no_alignment();
-  __xray_unpatch();
-  __xray_remove_handler();
-  __xray_remove_handler_arg1();
-  noarg();
-  arg1(argc);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/common-trampoline-alignment.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc (removed)
@@ -1,91 +0,0 @@
-// 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
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include "xray/xray_interface.h"
-
-#include <set>
-#include <cstdio>
-#include <cassert>
-
-std::set<int32_t> function_ids;
-
-[[clang::xray_never_instrument]] void coverage_handler(int32_t fid,
-                                                       XRayEntryType) {
-  thread_local bool patching = false;
-  if (patching) return;
-  patching = true;
-  function_ids.insert(fid);
-  __xray_unpatch_function(fid);
-  patching = false;
-}
-
-[[clang::xray_always_instrument]] void baz() {
-  // do nothing!
-}
-
-[[clang::xray_always_instrument]] void bar() {
-  baz();
-}
-
-[[clang::xray_always_instrument]] void foo() {
-  bar();
-}
-
-[[clang::xray_always_instrument]] int main(int argc, char *argv[]) {
-  __xray_set_handler(coverage_handler);
-  assert(__xray_patch() == XRayPatchingStatus::SUCCESS);
-  foo();
-  assert(__xray_unpatch() == XRayPatchingStatus::SUCCESS);
-
-  // print out the function_ids.
-  printf("first pass.\n");
-  for (const auto id : function_ids)
-    printf("patched: %d\n", id);
-
-  // CHECK-LABEL: first pass.
-  // CHECK-DAG: patched: [[F1:.*]]
-  // CHECK-DAG: patched: [[F2:.*]]
-  // CHECK-DAG: patched: [[F3:.*]]
-
-  // make a copy of the function_ids, then patch them later.
-  auto called_fns = function_ids;
-
-  // clear the function_ids.
-  function_ids.clear();
-
-  // patch the functions we've called before.
-  for (const auto id : called_fns)
-    assert(__xray_patch_function(id) == XRayPatchingStatus::SUCCESS);
-
-  // then call them again.
-  foo();
-  assert(__xray_unpatch() == XRayPatchingStatus::SUCCESS);
-
-  // confirm that we've seen the same functions again.
-  printf("second pass.\n");
-  for (const auto id : function_ids)
-    printf("patched: %d\n", id);
-  // CHECK-LABEL: second pass.
-  // CHECK-DAG: patched: [[F1]]
-  // CHECK-DAG: patched: [[F2]]
-  // CHECK-DAG: patched: [[F3]]
-
-  // Now we want to make sure that if we unpatch one, that we're only going to
-  // see two calls of the coverage_handler.
-  function_ids.clear();
-  assert(__xray_patch() == XRayPatchingStatus::SUCCESS);
-  assert(__xray_unpatch_function(1) == XRayPatchingStatus::SUCCESS);
-  foo();
-  assert(__xray_unpatch() == XRayPatchingStatus::SUCCESS);
-
-  // confirm that we don't see function id one called anymore.
-  printf("missing 1.\n");
-  for (const auto id : function_ids)
-    printf("patched: %d\n", id);
-  // CHECK-LABEL: missing 1.
-  // CHECK-NOT: patched: 1
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/coverage-sample.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc (removed)
@@ -1,42 +0,0 @@
-// Make sure we're aligning the stack properly when lowering the custom event
-// calls.
-//
-// RUN: %clangxx_xray -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="patch_premain=false verbosity=1 xray_naive_log=false" \
-// RUN:     %run %t 2>&1
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-#include <xmmintrin.h>
-#include <stdio.h>
-#include "xray/xray_interface.h"
-
-[[clang::xray_never_instrument]] __attribute__((weak)) __m128 f(__m128 *i) {
-  return *i;
-}
-
-[[clang::xray_always_instrument]] void foo() {
-  __xray_customevent(0, 0);
-  __m128 v = {};
-  f(&v);
-}
-
-[[clang::xray_always_instrument]] void bar() {
-  __xray_customevent(0, 0);
-}
-
-void printer(void* ptr, size_t size) {
-  printf("handler called\n");
-  __m128 v = {};
-  f(&v);
-}
-
-int main(int argc, char* argv[]) {
-  __xray_set_customevent_handler(printer);
-  __xray_patch();
-  foo();  // CHECK: handler called
-  bar();  // CHECK: handler called
-  __xray_unpatch();
-  __xray_remove_customevent_handler();
-  foo();
-  bar();
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-handler-alignment.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc (removed)
@@ -1,42 +0,0 @@
-// 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: %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
-// FIXME: Support this in non-x86_64 as well
-// REQUIRES: x86_64-linux
-// REQUIRES: built-in-llvm-tree
-#include <cstdio>
-#include "xray/xray_interface.h"
-
-[[clang::xray_always_instrument]] void foo() {
-  static constexpr char CustomLogged[] = "hello custom logging!";
-  printf("before calling the custom logging...\n");
-  __xray_customevent(CustomLogged, sizeof(CustomLogged));
-  printf("after calling the custom logging...\n");
-}
-
-void myprinter(void* ptr, size_t size) {
-  printf("%.*s\n", static_cast<int>(size), static_cast<const char*>(ptr));
-}
-
-int main() {
-  foo();
-  // CHECK: before calling the custom logging...
-  // CHECK-NEXT: after calling the custom logging...
-  printf("setting up custom event handler...\n");
-  // CHECK-NEXT: setting up custom event handler...
-  __xray_set_customevent_handler(myprinter);
-  __xray_patch();
-  // CHECK-NEXT: before calling the custom logging...
-  foo();
-  // CHECK-NEXT: hello custom logging!
-  // CHECK-NEXT: after calling the custom logging...
-  printf("removing custom event handler...\n");
-  // CHECK-NEXT: removing custom event handler...
-  __xray_remove_customevent_handler();
-  foo();
-  // CHECK-NEXT: before calling the custom logging...
-  // CHECK-NEXT: after calling the custom logging...
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/custom-event-logging.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc (removed)
@@ -1,50 +0,0 @@
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t -fxray-modes=xray-fdr
-// RUN: rm -f fdr-inmemory-test-*
-// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
-// RUN:     verbosity=1" \
-// RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
-// RUN:     %run %t 2>&1 | FileCheck %s
-// RUN: FILES=`find %T -name 'fdr-inmemory-test-*' | wc -l`
-// RUN: [ $FILES -eq 0 ]
-// RUN: rm -f fdr-inmemory-test-*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <iostream>
-
-uint64_t var = 0;
-uint64_t buffers = 0;
-[[clang::xray_always_instrument]] void __attribute__((noinline)) f() { ++var; }
-
-int main(int argc, char *argv[]) {
-  assert(__xray_log_select_mode("xray-fdr") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  auto status = __xray_log_init_mode(
-      "xray-fdr",
-      "buffer_size=4096:buffer_max=10:func_duration_threshold_us=0");
-  assert(status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  __xray_patch();
-
-  // Create enough entries.
-  for (int i = 0; i != 1 << 20; ++i) {
-    f();
-  }
-
-  // Then we want to verify that we're getting 10 buffers outside of the initial
-  // header.
-  auto finalize_status = __xray_log_finalize();
-  assert(finalize_status == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  auto process_status =
-      __xray_log_process_buffers([](const char *, XRayBuffer) { ++buffers; });
-  std::cout << "buffers = " << buffers << std::endl;
-  assert(process_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  auto flush_status = __xray_log_flushLog();
-  assert(flush_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  // We expect 11 buffers because 1 header buffer + 10 actual FDR buffers.
-  // CHECK: Buffers = 11
-  std::cout << "Buffers = " << buffers << std::endl;
-  return 0;
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-inmemory.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc (removed)
@@ -1,76 +0,0 @@
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t -fxray-modes=xray-fdr
-// RUN: rm -f fdr-inmemory-test-*
-// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \
-// RUN:     verbosity=1" \
-// RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \
-// RUN:     %run %t 2>&1 | FileCheck %s
-// RUN: FILES=`find %T -name 'fdr-inmemory-test-*' | wc -l`
-// RUN: [ $FILES -eq 0 ]
-// RUN: rm -f fdr-inmemory-test-*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <iostream>
-
-uint64_t var = 0;
-uint64_t buffers = 0;
-[[clang::xray_always_instrument]] void __attribute__((noinline)) f() { ++var; }
-
-int main(int argc, char *argv[]) {
-  assert(__xray_log_select_mode("xray-fdr") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  auto status = __xray_log_init_mode(
-      "xray-fdr",
-      "buffer_size=4096:buffer_max=10:func_duration_threshold_us=0");
-  assert(status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  __xray_patch();
-
-  // Create enough entries.
-  for (int i = 0; i != 1 << 20; ++i) {
-    f();
-  }
-
-  // Then we want to verify that we're getting 10 buffers outside of the initial
-  // header.
-  auto finalize_status = __xray_log_finalize();
-  assert(finalize_status == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  auto process_status =
-      __xray_log_process_buffers([](const char *, XRayBuffer) { ++buffers; });
-  std::cout << "buffers = " << buffers << std::endl;
-  assert(process_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  auto flush_status = __xray_log_flushLog();
-  assert(flush_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  // We expect 11 buffers because 1 header buffer + 10 actual FDR buffers.
-  // CHECK: Buffers = 11
-  std::cout << "Buffers = " << buffers << std::endl;
-
-  // In this test we ensure that we can restart the cycle after the flush.
-  status = __xray_log_init_mode(
-      "xray-fdr",
-      "buffer_size=4096:buffer_max=10:func_duration_threshold_us=0");
-  assert(status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  __xray_patch();
-
-  // Create enough entries.
-  for (int i = 0; i != 1 << 20; ++i) {
-    f();
-  }
-
-  // Then we want to verify that we're getting 10 buffers outside of the initial
-  // header.
-  finalize_status = __xray_log_finalize();
-  assert(finalize_status == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  process_status =
-      __xray_log_process_buffers([](const char *, XRayBuffer) { ++buffers; });
-  std::cout << "buffers = " << buffers << std::endl;
-  assert(process_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  flush_status = __xray_log_flushLog();
-  assert(flush_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  // We expect 22 buffers because 1 header buffer + 10 actual FDR buffers, plus
-  // the number of buffers we got from the previous run (also 11).
-  // CHECK: Buffers = 22
-  std::cout << "Buffers = " << buffers << std::endl;
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode-multiple.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc (removed)
@@ -1,111 +0,0 @@
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t
-// RUN: rm -f fdr-logging-test-*
-// RUN: rm -f fdr-unwrite-test-*
-// RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-logging-test- \
-// RUN:     xray_mode=xray-fdr verbosity=1" \
-// RUN: XRAY_FDR_OPTIONS="func_duration_threshold_us=0" \
-// RUN:     %run %t 2>&1 | FileCheck %s
-// RUN: XRAY_OPTIONS="patch_premain=false \
-// RUN:     xray_logfile_base=fdr-unwrite-test- xray_mode=xray-fdr \
-// RUN:     verbosity=1" \
-// RUN: XRAY_FDR_OPTIONS="func_duration_threshold_us=5000" \
-// RUN:     %run %t 2>&1 | FileCheck %s
-// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
-// RUN:     "`ls fdr-logging-test-* | head -1`" \
-// RUN:     | FileCheck %s --check-prefix=TRACE
-// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
-// RUN:     "`ls fdr-unwrite-test-* | head -1`" \
-// RUN:     | FileCheck %s --check-prefix=UNWRITE
-// RUN: rm fdr-logging-test-*
-// RUN: rm fdr-unwrite-test-*
-// FIXME: Make llvm-xray work on non-x86_64 as well.
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <chrono>
-#include <cstdio>
-#include <iostream>
-#include <stdlib.h>
-#include <thread>
-#include <time.h>
-
-thread_local uint64_t var = 0;
-[[clang::xray_always_instrument]] void __attribute__((noinline)) fC() { ++var; }
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) fB() { fC(); }
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) fA() { fB(); }
-
-[[clang::xray_always_instrument, clang::xray_log_args(1)]]
-void __attribute__((noinline)) fArg(int) { }
-
-int main(int argc, char *argv[]) {
-  std::cout << "Logging before init." << std::endl;
-  // CHECK: Logging before init.
-  assert(__xray_log_select_mode("xray-fdr") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  auto status =
-      __xray_log_init_mode("xray-fdr", "buffer_size=16384:buffer_max=10");
-  assert(status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  std::cout << "Init status " << status << std::endl;
-  // CHECK: Init status {{.*}}
-  std::cout << "Patching..." << std::endl;
-  // CHECK: Patching...
-  __xray_patch();
-  fA();
-  fC();
-  fB();
-  fA();
-  fC();
-  std::thread other_thread([]() {
-    fC();
-    fB();
-    fA();
-    fArg(1);
-  });
-  other_thread.join();
-  std::cout << "Joined" << std::endl;
-  // CHECK: Joined
-  std::cout << "Finalize status " << __xray_log_finalize() << std::endl;
-  // CHECK: Finalize status {{.*}}
-  fC();
-  std::cout << "Main execution var = " << var << std::endl;
-  // CHECK: Main execution var = 6
-  std::cout << "Flush status " << __xray_log_flushLog() << std::endl;
-  // CHECK: Flush status {{.*}}
-  __xray_unpatch();
-  return 0;
-}
-
-// Check that we're able to see two threads, each entering and exiting fA().
-// TRACE-DAG: - { type: 0, func-id: [[FIDA:[0-9]+]], function: {{.*fA.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDA]], function: {{.*fA.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FIDA]], function: {{.*fA.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDA]], function: {{.*fA.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-//
-// Do the same as above for fC()
-// TRACE-DAG: - { type: 0, func-id: [[FIDC:[0-9]+]], function: {{.*fC.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDC]], function: {{.*fC.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FIDC]], function: {{.*fC.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDC]], function: {{.*fC.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-
-// Do the same as above for fB()
-// TRACE-DAG: - { type: 0, func-id: [[FIDB:[0-9]+]], function: {{.*fB.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDB]], function: {{.*fB.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FIDB]], function: {{.*fB.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE:     - { type: 0, func-id: [[FIDB]], function: {{.*fB.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-
-// TRACE-DAG: - { type: 0, func-id: [[FIDARG:[0-9]+]], function: 'fArg(int)', args: [ 1 ], cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-enter-arg, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FIDARG]], function: 'fArg(int)', cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-exit, tsc: {{[0-9]+}}, data: '' }
-
-// Assert that when unwriting is enabled with a high threshold time, all the function records are erased. A CPU switch could erroneously fail this test, but
-// is unlikely given the test program.
-// Even with a high threshold, arg1 logging is never unwritten.
-// UNWRITE: header:
-// UNWRITE: records:
-// UNWRITE-NEXT: - { type: 0, func-id: [[FIDARG:[0-9]+]], function: 'fArg(int)', args: [ 1 ], cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS:[0-9]+]], kind: function-enter-arg, tsc: {{[0-9]+}}, data: '' }
-// UNWRITE-NEXT: - { type: 0, func-id: [[FIDARG]], function: 'fArg(int)', cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: function-exit, tsc: {{[0-9]+}}, data: '' }
-// UNWRITE-NOT: function-enter
-// UNWRITE-NOT: function-{{exit|tail-exit}}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-mode.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc (removed)
@@ -1,73 +0,0 @@
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t
-// RUN: rm xray-log.fdr-reinit* || true
-// RUN: XRAY_OPTIONS="verbosity=1" %run %t
-// RUN: rm xray-log.fdr-reinit* || true
-#include "xray/xray_log_interface.h"
-#include <atomic>
-#include <cassert>
-#include <cstddef>
-#include <thread>
-
-volatile uint64_t var = 0;
-
-std::atomic_flag keep_going = ATOMIC_FLAG_INIT;
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) func() {
-  ++var;
-}
-
-int main(int argc, char *argv[]) {
-  // Start a thread that will just keep calling the function, to spam calls to
-  // the function call handler.
-  keep_going.test_and_set(std::memory_order_acquire);
-  std::thread t([] {
-    while (keep_going.test_and_set(std::memory_order_acquire))
-      func();
-  });
-
-  static constexpr char kConfig[] =
-      "buffer_size=1024:buffer_max=10:no_file_flush=true";
-
-  // Then we initialize the FDR mode implementation.
-  assert(__xray_log_select_mode("xray-fdr") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  auto init_status = __xray_log_init_mode("xray-fdr", kConfig);
-  assert(init_status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  // Now we patch the instrumentation points.
-  __xray_patch();
-
-  // Spin for a bit, calling func() enough times.
-  for (auto i = 0; i < 1 << 20; ++i)
-    func();
-
-  // Then immediately finalize the implementation.
-  auto finalize_status = __xray_log_finalize();
-  assert(finalize_status == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-
-  // Once we're here, we should then flush.
-  auto flush_status = __xray_log_flushLog();
-  assert(flush_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-
-  // Without doing anything else, we should re-initialize.
-  init_status = __xray_log_init_mode("xray-fdr", kConfig);
-  assert(init_status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  // Then we spin for a bit again calling func() enough times.
-  for (auto i = 0; i < 1 << 20; ++i)
-    func();
-
-  // Then immediately finalize the implementation.
-  finalize_status = __xray_log_finalize();
-  assert(finalize_status == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-
-  // Once we're here, we should then flush.
-  flush_status = __xray_log_flushLog();
-  assert(flush_status == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-
-  // Finally, we should signal the sibling thread to stop.
-  keep_going.clear(std::memory_order_release);
-
-  // Then join.
-  t.join();
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-reinit.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc (removed)
@@ -1,32 +0,0 @@
-// 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_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 \
-// RUN:   "`ls fdr-logging-1thr-* | head -n1`" | FileCheck %s
-// RUN: rm fdr-logging-1thr-*
-//
-// REQUIRES: x86_64-target-arch
-
-#include "xray/xray_log_interface.h"
-#include <cassert>
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) fn() { }
-
-int main(int argc, char *argv[]) {
-  auto status = __xray_log_init_mode("xray-fdr", "");
-  assert(status == XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  __xray_patch();
-  fn();
-  __xray_unpatch();
-  assert(__xray_log_finalize() == XRAY_LOG_FINALIZED);
-  assert(__xray_log_flushLog() == XRAY_LOG_FLUSHED);
-  return 0;
-}
-
-// CHECK: records:
-// CHECK-NEXT: - { type: 0, func-id: [[FID1:[0-9]+]], function: {{.*fn.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// CHECK-NEXT: - { type: 0, func-id: [[FID1:[0-9]+]], function: {{.*fn.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS:[0-9]+]], kind: function-exit, tsc: {{[0-9]+}}, data: '' }

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-single-thread.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc (removed)
@@ -1,58 +0,0 @@
-// RUN: rm -rf %t && mkdir %t
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t.exe
-// RUN: XRAY_OPTIONS="patch_premain=false \
-// RUN:    xray_logfile_base=%t/ xray_mode=xray-fdr verbosity=1" \
-// RUN:    XRAY_FDR_OPTIONS=func_duration_threshold_us=0 %run %t.exe 2>&1 | \
-// RUN:    FileCheck %s
-// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t.exe %t/*
-// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t.exe %t/* | \
-// RUN:   FileCheck %s --check-prefix TRACE
-// FIXME: Make llvm-xray work on non-x86_64 as well.
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_log_interface.h"
-#include <atomic>
-#include <cassert>
-#include <thread>
-
-std::atomic<uint64_t> var{0};
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) f1() {
-  for (auto i = 0; i < 1 << 20; ++i)
-    ++var;
-}
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) f2() {
-  for (auto i = 0; i < 1 << 20; ++i)
-    ++var;
-}
-
-int main(int argc, char *argv[]) {
-  __xray_patch();
-  assert(__xray_log_init_mode("xray-fdr", "") ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  std::atomic_thread_fence(std::memory_order_acq_rel);
-
-  {
-    std::thread t1([] { f1(); });
-    std::thread t2([] { f2(); });
-    t1.join();
-    t2.join();
-  }
-
-  std::atomic_thread_fence(std::memory_order_acq_rel);
-  __xray_log_finalize();
-  __xray_log_flushLog();
-  __xray_unpatch();
-  return var > 0 ? 0 : 1;
-  // CHECK: {{.*}}XRay: Log file in '{{.*}}'
-  // CHECK-NOT: Failed
-}
-
-// We want to make sure that the order of the function log doesn't matter.
-// TRACE-DAG: - { type: 0, func-id: [[FID1:[0-9]+]], function: {{.*f1.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FID2:[0-9]+]], function: {{.*f2.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FID1]], function: {{.*f1.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS]], kind: {{function-exit|function-tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[FID2]], function: {{.*f2.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS]], kind: {{function-exit|function-tail-exit}}, tsc: {{[0-9]+}}, data: '' }

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fdr-thread-order.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc (removed)
@@ -1,22 +0,0 @@
-// 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
-//
-// After all that, clean up the output xray log.
-//
-// RUN: rm fixedsize-logging-*
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include <cstdio>
-
-[[clang::xray_always_instrument]] void foo() {
-  printf("foo() is always instrumented!");
-}
-
-int main() {
-  // CHECK: XRay: Log file in 'fixedsize-logging-{{.*}}'
-  foo();
-  // CHECK: foo() is always instrumented!
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fixedsize-logging.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc (removed)
@@ -1,103 +0,0 @@
-// Check that when forking in basic logging mode, we get the different tids for child and parent
-// RUN: %clangxx_xray -g -std=c++11 %s -o %t
-// RUN: rm -f fork-basic-logging-test-*
-// RUN: XRAY_OPTIONS="patch_premain=true xray_logfile_base=fork-basic-logging-test- \
-// RUN:     xray_mode=xray-basic verbosity=1 xray_naive_log_func_duration_threshold_us=0" \
-// RUN:     %run %t 2>&1 | FileCheck %s
-// RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \
-// RUN:     "`ls -S fork-basic-logging-test-* | head -1`" \
-// RUN:     | FileCheck %s --check-prefix=TRACE
-
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-// Not ported.
-// UNSUPPORTED: netbsd
-
-#include "xray/xray_log_interface.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <sys/syscall.h>
-
-//modified from sanitizer
-
-static uintptr_t syscall_gettid() {
-  uint64_t retval;
-  asm volatile("syscall" : "=a"(retval) : "a"(__NR_gettid) : "rcx", "r11",
-               "memory", "cc");
-  return retval;
-}
-
-/////////////
-
-static uint64_t parent_tid;
-
-[[clang::xray_always_instrument]]
-uint64_t __attribute__((noinline)) log_syscall_gettid()
-{
-	//don't optimize this function away
-	uint64_t tid = syscall_gettid();
-	printf("Logging tid %lu\n", tid);
-	return tid;
-}
-
-[[clang::xray_always_instrument, clang::xray_log_args(1)]]
-void __attribute__((noinline)) print_parent_tid(uint64_t tid)
-{
-	printf("Parent with tid %lu", tid);
-}
-
-[[clang::xray_always_instrument, clang::xray_log_args(1)]]
-void __attribute__((noinline)) print_child_tid(uint64_t tid)
-{
-	printf("Child with tid %lu", tid);
-}
-
-[[clang::xray_always_instrument]] void __attribute__((noinline)) print_parent_or_child()
-{
-	uint64_t tid = syscall_gettid();
-	if(tid == parent_tid)
-	{
-		print_parent_tid(tid);
-	}
-	else
-	{
-		print_child_tid(tid);
-	}
-}
-
-int main()
-{
-	parent_tid = log_syscall_gettid();
-	if(fork())
-	{
-		print_parent_or_child();
-  		// CHECK-DAG: Parent with tid
-	}
-	else
-	{
-		print_parent_or_child();
-  		// CHECK-DAG: Child with tid
-	}
-	return 0;
-}
-
-// Make sure we know which thread is the parent process
-// TRACE-DAG: - { type: 0, func-id: [[LSGT:[0-9]+]], function: {{.*log_syscall_gettid.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS1:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-
-// TRACE-DAG: - { type: 0, func-id: [[PPOC:[0-9]+]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-//
-// The parent will print its pid
-// TRACE-DAG: - { type: 0, func-id: [[PPTARG:[0-9]+]], function: {{.*print_parent_tid.*}}, args: [ [[THREAD1]] ], cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter-arg, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[PPTARG]], function: {{.*print_parent_tid.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-exit, tsc: {{[0-9]+}}, data: '' }
-//
-// TRACE-DAG  - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }
-
-// TRACE-DAG: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS2:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}}, data: '' }
-//
-// The child will print its pid
-// TRACE-DAG: - { type: 0, func-id: [[PCTARG:[0-9]+]], function: {{.*print_child_tid.*}}, args: [ [[THREAD2]] ], cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-enter-arg, tsc: {{[0-9]+}}, data: '' }
-// TRACE-DAG: - { type: 0, func-id: [[PCTARG]], function: {{.*print_child_tid.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-exit, tsc: {{[0-9]+}}, data: '' }
-//
-// TRACE-DAG: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}}, data: '' }

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/fork_basic_logging.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc (removed)
@@ -1,44 +0,0 @@
-// Check that we can turn a function id to a function address, and also get the
-// 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
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include "xray/xray_interface.h"
-#include <algorithm>
-#include <cassert>
-#include <cstdio>
-#include <iterator>
-#include <set>
-
-[[clang::xray_always_instrument]] void bar(){}
-
-[[clang::xray_always_instrument]] void foo() {
-  bar();
-}
-
-[[clang::xray_always_instrument]] int main(int argc, char *argv[]) {
-  assert(__xray_max_function_id() != 0 && "we need xray instrumentation!");
-  std::set<void *> must_be_instrumented = {reinterpret_cast<void *>(&foo),
-                                           reinterpret_cast<void *>(&bar),
-                                           reinterpret_cast<void *>(&main)};
-  std::set<void *> all_instrumented;
-  for (auto i = __xray_max_function_id(); i != 0; --i) {
-    auto addr = __xray_function_address(i);
-    all_instrumented.insert(reinterpret_cast<void *>(addr));
-  }
-  assert(all_instrumented.size() == __xray_max_function_id() &&
-         "each function id must be assigned to a unique function");
-
-  std::set<void *> not_instrumented;
-  std::set_difference(
-      must_be_instrumented.begin(), must_be_instrumented.end(),
-      all_instrumented.begin(), all_instrumented.end(),
-      std::inserter(not_instrumented, not_instrumented.begin()));
-  assert(
-      not_instrumented.empty() &&
-      "we should see all explicitly instrumented functions with function ids");
-  return not_instrumented.empty() ? 0 : 1;
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/func-id-utils.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc (removed)
@@ -1,95 +0,0 @@
-// Check that we can install an implementation associated with a mode.
-//
-// RUN: rm -f xray-log.logging-modes*
-// RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=none
-// RUN: %run %t | FileCheck %s
-//
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include "xray/xray_interface.h"
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <cstdio>
-#include <string>
-
-[[clang::xray_never_instrument]] void printing_handler(int32_t fid,
-                                                       XRayEntryType) {
-  thread_local volatile bool printing = false;
-  if (printing)
-    return;
-  printing = true;
-  std::printf("printing %d\n", fid);
-  printing = false;
-}
-
-[[clang::xray_never_instrument]] XRayBuffer next_buffer(XRayBuffer buffer) {
-  static const char data[10] = {};
-  static const XRayBuffer first_and_last{data, 10};
-  if (buffer.Data == nullptr)
-    return first_and_last;
-  if (buffer.Data == first_and_last.Data)
-    return XRayBuffer{nullptr, 0};
-  assert(false && "Invalid buffer provided.");
-}
-
-static constexpr char Options[] = "additional_flags";
-
-[[clang::xray_never_instrument]] XRayLogInitStatus
-printing_init(size_t BufferSize, size_t MaxBuffers, void *Config,
-              size_t ArgsSize) {
-  // We require that the printing init is called through the
-  // __xray_log_init_mode(...) implementation, and that the promised contract is
-  // enforced.
-  assert(BufferSize == 0);
-  assert(MaxBuffers == 0);
-  assert(Config != nullptr);
-  assert(ArgsSize == 0 || ArgsSize == sizeof(Options));
-  __xray_log_set_buffer_iterator(next_buffer);
-  return XRayLogInitStatus::XRAY_LOG_INITIALIZED;
-}
-
-[[clang::xray_never_instrument]] XRayLogInitStatus printing_finalize() {
-  return XRayLogInitStatus::XRAY_LOG_FINALIZED;
-}
-
-[[clang::xray_never_instrument]] XRayLogFlushStatus printing_flush_log() {
-  __xray_log_remove_buffer_iterator();
-  return XRayLogFlushStatus::XRAY_LOG_FLUSHED;
-}
-
-[[clang::xray_always_instrument]] void callme() { std::printf("called me!\n"); }
-
-static auto buffer_counter = 0;
-
-void process_buffer(const char *, XRayBuffer) { ++buffer_counter; }
-
-int main(int argc, char **argv) {
-  assert(__xray_log_register_mode("custom",
-                                  {printing_init, printing_finalize,
-                                   printing_handler, printing_flush_log}) ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  assert(__xray_log_select_mode("custom") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  assert(__xray_log_get_current_mode() != nullptr);
-  std::string current_mode = __xray_log_get_current_mode();
-  assert(current_mode == "custom");
-  assert(__xray_patch() == XRayPatchingStatus::SUCCESS);
-  assert(__xray_log_init_mode("custom", "flags_config_here=true") ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  // Also test that we can use the "binary" version of the
-  // __xray_log_niit_mode(...) API.
-  assert(__xray_log_init_mode_bin("custom", Options, sizeof(Options)) ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-
-  // CHECK: printing {{.*}}
-  callme(); // CHECK: called me!
-  // CHECK: printing {{.*}}
-  assert(__xray_log_finalize() == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  assert(__xray_log_process_buffers(process_buffer) ==
-         XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  assert(buffer_counter == 1);
-  assert(__xray_log_flushLog() == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  assert(__xray_log_select_mode("not-found") ==
-         XRayLogRegisterStatus::XRAY_MODE_NOT_FOUND);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/logging-modes.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc (removed)
@@ -1,23 +0,0 @@
-// Make sure that we don't get the inmemory logging implementation enabled when
-// 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
-//
-// Make sure we clean out the logs in case there was a bug.
-//
-// RUN: rm -f optional-inmemory-log.xray-*
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include <cstdio>
-
-[[clang::xray_always_instrument]] void foo() {
-  printf("foo() is always instrumented!");
-}
-
-int main() {
-  // CHECK-NOT: XRay: Log file in 'optional-inmemory-log.xray-{{.*}}'
-  foo();
-  // CHECK: foo() is always instrumented!
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/optional-inmemory-log.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc (removed)
@@ -1,49 +0,0 @@
-// Check that we can patch and un-patch on demand, and that logging gets invoked
-// appropriately.
-//
-// RUN: %clangxx_xray -fxray-instrument -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="patch_premain=false" %run %t 2>&1 | FileCheck %s
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include "xray/xray_interface.h"
-
-#include <cstdio>
-
-bool called = false;
-
-void test_handler(int32_t fid, XRayEntryType type) {
-  printf("called: %d, type=%d\n", fid, static_cast<int32_t>(type));
-  called = true;
-}
-
-[[clang::xray_always_instrument]] void always_instrument() {
-  printf("always instrumented called\n");
-}
-
-int main() {
-  __xray_set_handler(test_handler);
-  always_instrument();
-  // CHECK: always instrumented called
-  auto status = __xray_patch();
-  printf("patching status: %d\n", static_cast<int32_t>(status));
-  // CHECK-NEXT: patching status: 1
-  always_instrument();
-  // CHECK-NEXT: called: {{.*}}, type=0
-  // CHECK-NEXT: always instrumented called
-  // CHECK-NEXT: called: {{.*}}, type=1
-  status = __xray_unpatch();
-  printf("patching status: %d\n", static_cast<int32_t>(status));
-  // CHECK-NEXT: patching status: 1
-  always_instrument();
-  // CHECK-NEXT: always instrumented called
-  status = __xray_patch();
-  printf("patching status: %d\n", static_cast<int32_t>(status));
-  // CHECK-NEXT: patching status: 1
-  __xray_remove_handler();
-  always_instrument();
-  // CHECK-NEXT: always instrumented called
-  status = __xray_unpatch();
-  printf("patching status: %d\n", static_cast<int32_t>(status));
-  // CHECK-NEXT: patching status: 1
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/patching-unpatching.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc (removed)
@@ -1,38 +0,0 @@
-// Test to check if we handle pic code properly.
-
-// 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_logfile_base=pic-test-logging-" %run %t 2>&1 | FileCheck %s
-// After all that, clean up the output xray log.
-//
-// RUN: rm -f pic-test-logging-*
-
-// UNSUPPORTED: target-is-mips64,target-is-mips64el
-
-#include <cstdio>
-
-[[clang::xray_always_instrument]]
-unsigned short foo (unsigned b);
-
-[[clang::xray_always_instrument]]
-unsigned short bar (unsigned short a)
-{
-  printf("bar() is always instrumented!\n");
-  return foo(a);
-}
-
-unsigned short foo (unsigned b)
-{
-  printf("foo() is always instrumented!\n");
-  return b + b + 5;
-}
-
-int main ()
-{
-  // CHECK: XRay: Log file in 'pic-test-logging-{{.*}}'
-  bar(10);
-  // CHECK: bar() is always instrumented!
-  // CHECK-NEXT: foo() is always instrumented!
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/pic_test.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc (removed)
@@ -1,58 +0,0 @@
-// Check that we can get a profile from a single-threaded application, on
-// demand through the XRay logging implementation API.
-//
-// FIXME: Make -fxray-modes=xray-profiling part of the default?
-// RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=xray-profiling
-// RUN: rm -f xray-log.profiling-multi-*
-// RUN: XRAY_OPTIONS=verbosity=1 \
-// RUN:     XRAY_PROFILING_OPTIONS=no_flush=1 %run %t
-// RUN: XRAY_OPTIONS=verbosity=1 %run %t
-// RUN: PROFILES=`ls xray-log.profiling-multi-* | wc -l`
-// RUN: [ $PROFILES -eq 1 ]
-// RUN: rm -f xray-log.profiling-multi-*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_interface.h"
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <cstdio>
-#include <string>
-#include <thread>
-
-[[clang::xray_always_instrument]] void f2() { return; }
-[[clang::xray_always_instrument]] void f1() { f2(); }
-[[clang::xray_always_instrument]] void f0() { f1(); }
-
-using namespace std;
-
-volatile int buffer_counter = 0;
-
-[[clang::xray_never_instrument]] void process_buffer(const char *, XRayBuffer) {
-  // FIXME: Actually assert the contents of the buffer.
-  ++buffer_counter;
-}
-
-[[clang::xray_always_instrument]] int main(int, char **) {
-  assert(__xray_log_select_mode("xray-profiling") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  assert(__xray_log_get_current_mode() != nullptr);
-  std::string current_mode = __xray_log_get_current_mode();
-  assert(current_mode == "xray-profiling");
-  assert(__xray_patch() == XRayPatchingStatus::SUCCESS);
-  assert(__xray_log_init_mode("xray-profiling", "") ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  std::thread t0([] { f0(); });
-  std::thread t1([] { f0(); });
-  f0();
-  t0.join();
-  t1.join();
-  assert(__xray_log_finalize() == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  assert(__xray_log_process_buffers(process_buffer) ==
-         XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  // We're running three threads, so we expect four buffers (including the file
-  // header buffer).
-  assert(buffer_counter == 4);
-  assert(__xray_log_flushLog() == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/profiling-multi-threaded.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc (removed)
@@ -1,68 +0,0 @@
-// Check that we can get a profile from a single-threaded application, on
-// demand through the XRay logging implementation API.
-//
-// FIXME: Make -fxray-modes=xray-profiling part of the default?
-// RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=xray-profiling
-// RUN: rm -f xray-log.profiling-single-*
-// RUN: XRAY_OPTIONS=verbosity=1 \
-// RUN:     XRAY_PROFILING_OPTIONS=no_flush=true %run %t
-// RUN: XRAY_OPTIONS=verbosity=1 %run %t
-// RUN: PROFILES=`ls xray-log.profiling-single-* | wc -l`
-// RUN: [ $PROFILES -eq 2 ]
-// RUN: rm -f xray-log.profiling-single-*
-//
-// REQUIRES: x86_64-target-arch
-// REQUIRES: built-in-llvm-tree
-
-#include "xray/xray_interface.h"
-#include "xray/xray_log_interface.h"
-#include <cassert>
-#include <cstdio>
-#include <string>
-
-[[clang::xray_always_instrument]] void f2() { return; }
-[[clang::xray_always_instrument]] void f1() { f2(); }
-[[clang::xray_always_instrument]] void f0() { f1(); }
-
-using namespace std;
-
-volatile int buffer_counter = 0;
-
-[[clang::xray_never_instrument]] void process_buffer(const char *, XRayBuffer) {
-  // FIXME: Actually assert the contents of the buffer.
-  ++buffer_counter;
-}
-
-[[clang::xray_always_instrument]] int main(int, char **) {
-  assert(__xray_log_select_mode("xray-profiling") ==
-         XRayLogRegisterStatus::XRAY_REGISTRATION_OK);
-  assert(__xray_log_get_current_mode() != nullptr);
-  std::string current_mode = __xray_log_get_current_mode();
-  assert(current_mode == "xray-profiling");
-  assert(__xray_patch() == XRayPatchingStatus::SUCCESS);
-  assert(__xray_log_init_mode("xray-profiling", "") ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  f0();
-  assert(__xray_log_finalize() == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  f0();
-  assert(__xray_log_process_buffers(process_buffer) ==
-         XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  // There's always at least one buffer, containing the profile file header. We
-  // assert that we have two, to indicate that we're expecting exactly one
-  // thread's worth of data.
-  assert(buffer_counter == 2);
-  assert(__xray_log_flushLog() == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-
-  // Let's reset the counter.
-  buffer_counter = 0;
-
-  assert(__xray_log_init_mode("xray-profiling", "") ==
-         XRayLogInitStatus::XRAY_LOG_INITIALIZED);
-  f0();
-  assert(__xray_log_finalize() == XRayLogInitStatus::XRAY_LOG_FINALIZED);
-  f0();
-  assert(__xray_log_process_buffers(process_buffer) ==
-         XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-  assert(buffer_counter == 2);
-  assert(__xray_log_flushLog() == XRayLogFlushStatus::XRAY_LOG_FLUSHED);
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/profiling-single-threaded.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Removed: compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc?rev=367651&view=auto
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc (removed)
@@ -1,26 +0,0 @@
-// Ensure that we have a quiet startup when we don't have the XRay
-// instrumentation sleds.
-//
-// RUN: %clangxx -std=c++11 %s -o %t %xraylib
-// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1" %run %t 2>&1 | \
-// RUN:    FileCheck %s --check-prefix NOISY
-// RUN: XRAY_OPTIONS="patch_premain=true verbosity=0" %run %t 2>&1 | \
-// RUN:    FileCheck %s --check-prefix QUIET
-// RUN: XRAY_OPTIONS="" %run %t 2>&1 | FileCheck %s --check-prefix DEFAULT
-//
-// FIXME: Understand how to make this work on other platforms
-// REQUIRES: built-in-llvm-tree
-// REQUIRES: x86_64-target-arch
-#include <iostream>
-
-using namespace std;
-
-int main(int, char**) {
-  // NOISY: {{.*}}XRay instrumentation map missing. Not initializing XRay.
-  // QUIET-NOT: {{.*}}XRay instrumentation map missing. Not initializing XRay.
-  // DEFAULT-NOT: {{.*}}XRay instrumentation map missing. Not initializing XRay.
-  cout << "Hello, XRay!" << endl;
-  // NOISY: Hello, XRay!
-  // QUIET: Hello, XRay!
-  // DEFAULT: Hello, XRay!
-}

Copied: compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cpp (from r367642, compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cpp?p2=compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cpp&p1=compiler-rt/trunk/test/xray/TestCases/Posix/quiet-start.cc&r1=367642&r2=367652&rev=367652&view=diff
==============================================================================
    (empty)

Modified: compiler-rt/trunk/test/xray/lit.cfg.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/lit.cfg.py?rev=367652&r1=367651&r2=367652&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/lit.cfg.py (original)
+++ compiler-rt/trunk/test/xray/lit.cfg.py Thu Aug  1 22:49:58 2019
@@ -51,7 +51,7 @@ config.substitutions.append(
         % (libdl_flag, config.compiler_rt_libdir, config.target_suffix)))
 
 # Default test suffixes.
-config.suffixes = ['.c', '.cc', '.cpp']
+config.suffixes = ['.c', '.cpp']
 
 if config.host_os not in ['FreeBSD', 'Linux', 'NetBSD', 'OpenBSD']:
   config.unsupported = True




More information about the llvm-commits mailing list