[test-suite] r310909 - [XRay] [test-suite] Don't use llvm_multisource macro for XRay tests and use .test files
Dean Michael Berris via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 14 23:40:37 PDT 2017
Author: dberris
Date: Mon Aug 14 23:40:37 2017
New Revision: 310909
URL: http://llvm.org/viewvc/llvm-project?rev=310909&view=rev
Log:
[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
Added:
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test
test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test
Modified:
test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt
Modified: test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt?rev=310909&r1=310908&r2=310909&view=diff
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt (original)
+++ test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt Mon Aug 14 23:40:37 2017
@@ -3,11 +3,21 @@ if("${ARCH}" STREQUAL "x86" AND ${COMPIL
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()
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_RDTSCP_Cost
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatched
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedThenUnpatched
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedWithLogHandler
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedUnPatched
Added: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test?rev=310909&view=auto
==============================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test (added)
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test Mon Aug 14 23:40:37 2017
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnNeverInstrumented
More information about the llvm-commits
mailing list