diff options
| author | Dean Michael Berris <dberris@google.com> | 2017-08-15 06:40:37 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2017-08-15 06:40:37 +0000 |
| commit | bd19daad5b7d759766b51d7372e83097c119eef5 (patch) | |
| tree | 6aa3d2d40eca029f436a9e2b93baa6d31e173b81 /MicroBenchmarks | |
| parent | ee28064127f011db5b518c98ae4503b144ab8503 (diff) | |
[XRay] [test-suite] Don't use llvm_multisource macro for XRay tests and use .test files
Summary:
Fix up CMakeLists.txt and add multiple .test files for MicroBenchmarks/XRay/
Follow-up work as suggested by https://reviews.llvm.org/D32272#794759
Reviewers: dberris, MatzeB
Reviewed By: dberris, MatzeB
Subscribers: MatzeB, llvm-commits, mgorny
Differential Revision: https://reviews.llvm.org/D35672
Patch By: eizan
git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@310909 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'MicroBenchmarks')
7 files changed, 21 insertions, 5 deletions
diff --git a/MicroBenchmarks/XRay/CMakeLists.txt b/MicroBenchmarks/XRay/CMakeLists.txt index 01502a21..43bcbb2c 100644 --- a/MicroBenchmarks/XRay/CMakeLists.txt +++ b/MicroBenchmarks/XRay/CMakeLists.txt @@ -3,11 +3,21 @@ if("${ARCH}" STREQUAL "x86" AND ${COMPILER_HAS_FXRAY_INSTRUMENT}) file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument) - set(Source retref-bench.cc) list(APPEND LDFLAGS -fxray-instrument) - set(RUN_OPTIONS --benchmark_repetitions=10 --benchmark_report_aggregates_only=true) - - set(PROG retref-bench) - llvm_multisource() + llvm_test_run(--benchmark_filter=dummy_skip_ignore) + llvm_test_executable(retref-bench retref-bench.cc) target_link_libraries(retref-bench benchmark) + + file(COPY retref-bench_BM_ReturnNeverInstrumented.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(COPY retref-bench_BM_ReturnInstrumentedUnPatched.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(COPY retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(COPY retref-bench_BM_ReturnInstrumentedPatched.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(COPY retref-bench_BM_RDTSCP_Cost.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(COPY retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") endif() diff --git a/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test b/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test new file mode 100644 index 00000000..fae233dc --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_RDTSCP_Cost diff --git a/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test new file mode 100644 index 00000000..f94bd287 --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatched diff --git a/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test new file mode 100644 index 00000000..fc9031d6 --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedThenUnpatched diff --git a/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test new file mode 100644 index 00000000..b32befe4 --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedWithLogHandler diff --git a/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test new file mode 100644 index 00000000..b72fe6f9 --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedUnPatched diff --git a/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test b/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test new file mode 100644 index 00000000..8acc831b --- /dev/null +++ b/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test @@ -0,0 +1 @@ +RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnNeverInstrumented |