Skip to content

[OpenMP][test] Support target= in tests #142380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions openmp/libompd/test/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ config.library_dir = "@LIBOMP_LIBRARY_DIR@"
config.ompd_library_dir = "@CMAKE_CURRENT_BINARY_DIR@/../src/"
config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
config.operating_system = "@CMAKE_SYSTEM_NAME@"
config.target_triple = "@LLVM_TARGET_TRIPLE@"

config.ompt_plugin = "@OMPT_PLUGIN@"
config.ompt_include_dir = "@LIBOMP_INCLUDE_DIR@"
config.ompd_module = "@CMAKE_CURRENT_BINARY_DIR@/../gdb-plugin/python-module/ompd/"

import lit.llvm
lit.llvm.initialize(lit_config, config)

# Let the main config do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
1 change: 0 additions & 1 deletion openmp/runtime/test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ if config.operating_system != 'Haiku':
libs += " -latomic"

# Allow REQUIRES / UNSUPPORTED / XFAIL to work
config.target_triple = [ ]
for feature in config.test_compiler_features:
config.available_features.add(feature)

Expand Down
4 changes: 4 additions & 0 deletions openmp/runtime/test/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
config.library_dir = "@LIBOMP_LIBRARY_DIR@"
config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
config.operating_system = "@CMAKE_SYSTEM_NAME@"
config.target_triple = "@LLVM_TARGET_TRIPLE@"
config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
config.using_hwloc = @LIBOMP_USE_HWLOC@
config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_OPTIONAL@
Expand All @@ -24,5 +25,8 @@ config.target_arch = "@LIBOMP_ARCH@"
config.compiler_frontend_variant = "@CMAKE_C_COMPILER_FRONTEND_VARIANT@"
config.compiler_simulate_id = "@CMAKE_C_SIMULATE_ID@"

import lit.llvm
lit.llvm.initialize(lit_config, config)

# Let the main config do the real work.
lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")
1 change: 0 additions & 1 deletion openmp/tools/archer/tests/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ if config.has_libatomic:
libs += " -latomic"

# Allow XFAIL to work
config.target_triple = [ ]
for feature in config.test_compiler_features:
config.available_features.add(feature)

Expand Down
4 changes: 4 additions & 0 deletions openmp/tools/archer/tests/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
config.operating_system = "@CMAKE_SYSTEM_NAME@"
config.target_triple = "@LLVM_TARGET_TRIPLE@"
config.has_libatomic = @LIBARCHER_HAVE_LIBATOMIC@
config.has_tsan = @OPENMP_TEST_ENABLE_TSAN@

config.test_archer_flags = "@LIBARCHER_TEST_FLAGS@"
config.libarcher_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"

import lit.llvm
lit.llvm.initialize(lit_config, config)

# Let the main config do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
1 change: 0 additions & 1 deletion openmp/tools/multiplex/tests/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ if 'CHECK_OPENMP_ENV' in os.environ:
config.environment[name] = value

# Allow XFAIL to work
config.target_triple = [ ]
for feature in config.test_compiler_features:
config.available_features.add(feature)

Expand Down
4 changes: 4 additions & 0 deletions openmp/tools/multiplex/tests/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
config.ompt_print_callback_dir = "@OMPT_PRINT_CALLBACKS_DIR@"
config.operating_system = "@CMAKE_SYSTEM_NAME@"
config.target_triple = "@LLVM_TARGET_TRIPLE@"

import lit.llvm
lit.llvm.initialize(lit_config, config)

# Let the main config do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
Loading