[XRay] [test-suite] Don't use llvm_multisource macro for XRay tests and use .test files

[eizan]

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

[dberris]

LGTM, but let's see what @MatzeB thinks about this approach.

[MatzeB]

LGTM when you switch to llvm_test_executable(), thanks.

MicroBenchmarks/XRay/CMakeLists.txt

5–7 ↗

(On Diff #107473)

You should use llvm_test_executable() instead of add_executable. That way you can keep using list(APPEND CPPFLAGS) and will automatically get some dependencies right (everything in the test-suite has to depend on the time-it tool, as we use that to measure the compile time).

[eizan]

• Replace add_executable() with llvm_test_run() in XRay CMakeLists.txt

[MatzeB]

LGTM

MicroBenchmarks/XRay/CMakeLists.txt

7 ↗

(On Diff #109531)

I'm surprised you had to put llvm_test_run here. I assume you were getting errors otherwise, so it's fine to move forward with the patch as is. I'll investigate why this couldn't be left out separately.

[dberris]

Thanks @MatzeB -- I ran out of time today. If you don't get to landing this, I'll go land this next week.

Cheers

test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt

 check_cxx_compiler_flag(-fxray-instrument COMPILER_HAS_FXRAY_INSTRUMENT)
 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()

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_RDTSCP_Cost

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatched

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedThenUnpatched

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedWithLogHandler

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedUnPatched

test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test

+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnNeverInstrumented