This is an archive of the discontinued LLVM Phabricator instance.

Differential D95293

[OpenMP] Fixed test environment of `check-libomptarget-nvptx`
ClosedPublic

Authored by tianshilei1992 on Jan 23 2021, 12:28 PM.

Details

Reviewers
jdoerfert
JonChesterfield
Commits
rGcfd978d5d3c8: [OpenMP] Fixed test environment of `check-libomptarget-nvptx`
Summary

D95161 removed the option --libomptarget-nvptx-path, which is used in
the tests for libomptarget-nvptx.

Diff Detail

Event Timeline

tianshilei1992 created this revision.Jan 23 2021, 12:28 PM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptJan 23 2021, 12:28 PM
tianshilei1992 requested review of this revision.Jan 23 2021, 12:28 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2021, 12:28 PM
Herald added subscribers: openmp-commits, sstefan1. · View Herald Transcript
jdoerfert accepted this revision.Jan 23 2021, 12:47 PM

LG

This revision is now accepted and ready to land.Jan 23 2021, 12:47 PM
Harbormaster completed remote builds in B86424: Diff 318781.Jan 23 2021, 12:55 PM
Closed by commit rGcfd978d5d3c8: [OpenMP] Fixed test environment of `check-libomptarget-nvptx` (authored by tianshilei1992). · Explain WhyJan 24 2021, 10:18 AM
This revision was automatically updated to reflect the committed changes.
tianshilei1992 added a commit: rGcfd978d5d3c8: [OpenMP] Fixed test environment of `check-libomptarget-nvptx`.

Revision Contents

PathSize
openmp/
libomptarget/
deviceRTLs/
nvptx/
test/
4 lines

Diff 318848

openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg

Show All 26 Lines
# test_exec_root: The root object directory where output is placed # test_exec_root: The root object directory where output is placed
config.test_exec_root = config.binary_dir config.test_exec_root = config.binary_dir
# test format # test format
config.test_format = lit.formats.ShTest() config.test_format = lit.formats.ShTest()
# compiler flags # compiler flags
config.test_flags = " -I " + config.omp_header_directory + \ config.test_flags = " -I " + config.omp_header_directory + \
" -L " + config.library_dir + \ " -L " + config.library_dir
" --libomptarget-nvptx-path=" + config.library_dir;
if config.omp_host_rtl_directory: if config.omp_host_rtl_directory:
config.test_flags = config.test_flags + \ config.test_flags = config.test_flags + \
" -L " + config.omp_host_rtl_directory " -L " + config.omp_host_rtl_directory
config.test_flags = config.test_flags + " " + config.test_extra_flags config.test_flags = config.test_flags + " " + config.test_extra_flags
# Setup environment to find dynamic library at runtime. # Setup environment to find dynamic library at runtime.
prepend_library_path('LIBRARY_PATH', config.library_dir, ":")
prepend_library_path('LD_LIBRARY_PATH', config.library_dir, ":") prepend_library_path('LD_LIBRARY_PATH', config.library_dir, ":")
prepend_library_path('LD_LIBRARY_PATH', config.omp_host_rtl_directory, ":") prepend_library_path('LD_LIBRARY_PATH', config.omp_host_rtl_directory, ":")
# Forbid fallback to host. # Forbid fallback to host.
config.environment["OMP_TARGET_OFFLOAD"] = "MANDATORY" config.environment["OMP_TARGET_OFFLOAD"] = "MANDATORY"
# substitutions # substitutions
config.substitutions.append(("%compilexx-run-and-check", config.substitutions.append(("%compilexx-run-and-check",
Show All 18 Lines