This is an archive of the discontinued LLVM Phabricator instance.

Differential D106415

[test-suite] Disable XRay tests if unavailable.
ClosedPublic

Authored by Meinersbur on Jul 20 2021, 6:18 PM.

Details

Reviewers
mtrofin
MaskRay
dberris
dblaikie
paquette
MatzeB
eizan
Commits
rT8e6f9886fd73: [test-suite] Disable XRay tests if unavailable.
Summary

In addition to testing the -fxray-instrument command-line flag, test the availability of the XRay headers. The headers are unavailable if e.g. clang is compiled without compiler-rt.

Also move all introspection tests into the parent XRay directory since they are the same for both tests.

Diff Detail

Repository
rT test-suite

Event Timeline

Meinersbur created this revision.Jul 20 2021, 6:18 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJul 20 2021, 6:18 PM
Meinersbur requested review of this revision.Jul 20 2021, 6:18 PM
Meinersbur mentioned this in D101467: [docs] Add the compiler-rt requirement to the test suite doc.
MaskRay added a comment.Jul 20 2021, 6:21 PM

(The official documentation uses XRay instead of X-Ray)

Meinersbur updated this revision to Diff 360334.Jul 20 2021, 6:26 PM
  • Rename include introspection variable.
Harbormaster completed remote builds in B115231: Diff 360334.Jul 20 2021, 6:26 PM
Meinersbur updated this revision to Diff 360335.Jul 20 2021, 6:27 PM
  • Rename X-Ray to XRay
Harbormaster completed remote builds in B115232: Diff 360335.Jul 20 2021, 6:27 PM
Meinersbur retitled this revision from [test-suite] Disable X-Ray tests if unavailable. to [test-suite] Disable XRay tests if unavailable..Jul 20 2021, 6:29 PM
Meinersbur edited the summary of this revision. (Show Details)
MaskRay accepted this revision.Jul 20 2021, 6:35 PM

LGTM.

This revision is now accepted and ready to land.Jul 20 2021, 6:35 PM
Closed by commit rT8e6f9886fd73: [test-suite] Disable XRay tests if unavailable. (authored by Meinersbur). · Explain WhyJul 20 2021, 7:20 PM
This revision was automatically updated to reflect the committed changes.
Meinersbur added a commit: rT8e6f9886fd73: [test-suite] Disable XRay tests if unavailable..

Revision Contents

PathSize
MicroBenchmarks/
XRay/
17 lines
FDRMode/
16 lines
ReturnReference/
26 lines

Diff 360344

MicroBenchmarks/XRay/CMakeLists.txt

include(CheckIncludeFiles)
check_cxx_compiler_flag(-fxray-instrument COMPILER_HAS_FXRAY_INSTRUMENT)
check_include_files("xray/xray_interface.h" HAVE_XRAY_INTERFACE_INCLUDE LANGUAGE CXX)
if(COMPILER_HAS_FXRAY_INSTRUMENT AND HAVE_XRAY_INTERFACE_INCLUDE AND ARCH STREQUAL "x86" AND NOT TARGET_OS STREQUAL "Darwin")
message(STATUS "XRay tests enabled")
add_subdirectory(ReturnReference) add_subdirectory(ReturnReference)
if(NOT TARGET_OS STREQUAL "Darwin")
# FDRMode test is failing on Darwin because
# `__xray_log_select_mode("xray-fdr")` returns `XRAY_MODE_NOT_FOUND`.
#
# Disable the test until it is fixed. rdar://problem/44578416
add_subdirectory(FDRMode) add_subdirectory(FDRMode)
else()
message(STATUS "Compiler does not support XRay; tests disabled")
endif() endif()

MicroBenchmarks/XRay/FDRMode/CMakeLists.txt

check_cxx_compiler_flag(-fxray-instrument COMPILER_HAS_FXRAY_INSTRUMENT) # FDRMode test is failing on Darwin because
if(ARCH STREQUAL "x86" AND COMPILER_HAS_FXRAY_INSTRUMENT) # `__xray_log_select_mode("xray-fdr")` returns `XRAY_MODE_NOT_FOUND`.
list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument) list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument)
list(APPEND LDFLAGS -fxray-instrument) list(APPEND LDFLAGS -fxray-instrument)
llvm_test_run() llvm_test_run()
llvm_test_executable(fdrmode-bench fdrmode-bench.cc) llvm_test_executable(fdrmode-bench fdrmode-bench.cc)
target_link_libraries(fdrmode-bench benchmark) target_link_libraries(fdrmode-bench benchmark)
endif()

MicroBenchmarks/XRay/ReturnReference/CMakeLists.txt

check_cxx_compiler_flag(-fxray-instrument COMPILER_HAS_FXRAY_INSTRUMENT) # ReturnReference is currently failing on Darwin.
if(ARCH STREQUAL "x86" AND COMPILER_HAS_FXRAY_INSTRUMENT AND NOT TARGET_OS STREQUAL "Darwin")
# retref is currently failing on Darwin.
# #
# ld: in section __DATA,xray_instr_map reloc 0: X86_64_RELOC_SUBTRACTOR must # ld: in section __DATA,xray_instr_map reloc 0: X86_64_RELOC_SUBTRACTOR must
# have r_extern=1 file # have r_extern=1 file
# 'MicroBenchmarks/XRay/ReturnReference/CMakeFiles/retref-bench.dir/retref-bench.cc.o' # 'MicroBenchmarks/XRay/ReturnReference/CMakeFiles/retref-bench.dir/retref-bench.cc.o'
# for architecture x86_64 # for architecture x86_64
list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument) list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument)
list(APPEND LDFLAGS -fxray-instrument) list(APPEND LDFLAGS -fxray-instrument)
llvm_test_run() llvm_test_run()
llvm_test_executable(retref-bench retref-bench.cc) llvm_test_executable(retref-bench retref-bench.cc)
target_link_libraries(retref-bench benchmark) target_link_libraries(retref-bench benchmark)
endif()