Skip to content

Commit c450dd7

Browse files
authored
[OpenMP][test] Support target= in tests (#142380)
LLVM is moving towards the `target=<target triple RE>` syntax in `XFAIL: ` etc., and I'll need the same in a subsequent patch. This patch adds the necessary infrastructure. Tested on `sparc-sun-solaris2.11`, `sparcv9-sun-solaris2.11`, `sparc-unknown-linux-gnu`, `sparc64-unknown-linux-gnu`, `i386-pc-solaris2.11`, `amd64-pc-solaris2.11`, `i686-pc-linux-gnu`, and `x86_64-pc-linux-gnu`.
1 parent f03d1b0 commit c450dd7

File tree

7 files changed

+16
-3
lines changed

7 files changed

+16
-3
lines changed

openmp/libompd/test/lit.site.cfg.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ config.library_dir = "@LIBOMP_LIBRARY_DIR@"
1212
config.ompd_library_dir = "@CMAKE_CURRENT_BINARY_DIR@/../src/"
1313
config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
1414
config.operating_system = "@CMAKE_SYSTEM_NAME@"
15+
config.target_triple = "@LLVM_TARGET_TRIPLE@"
1516

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

21+
import lit.llvm
22+
lit.llvm.initialize(lit_config, config)
23+
2024
# Let the main config do the real work.
2125
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")

openmp/runtime/test/lit.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ if config.operating_system != 'Haiku':
7070
libs += " -latomic"
7171

7272
# Allow REQUIRES / UNSUPPORTED / XFAIL to work
73-
config.target_triple = [ ]
7473
for feature in config.test_compiler_features:
7574
config.available_features.add(feature)
7675

openmp/runtime/test/lit.site.cfg.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1212
config.library_dir = "@LIBOMP_LIBRARY_DIR@"
1313
config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
1414
config.operating_system = "@CMAKE_SYSTEM_NAME@"
15+
config.target_triple = "@LLVM_TARGET_TRIPLE@"
1516
config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
1617
config.using_hwloc = @LIBOMP_USE_HWLOC@
1718
config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_OPTIONAL@
@@ -24,5 +25,8 @@ config.target_arch = "@LIBOMP_ARCH@"
2425
config.compiler_frontend_variant = "@CMAKE_C_COMPILER_FRONTEND_VARIANT@"
2526
config.compiler_simulate_id = "@CMAKE_C_SIMULATE_ID@"
2627

28+
import lit.llvm
29+
lit.llvm.initialize(lit_config, config)
30+
2731
# Let the main config do the real work.
2832
lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")

openmp/tools/archer/tests/lit.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ if config.has_libatomic:
5858
libs += " -latomic"
5959

6060
# Allow XFAIL to work
61-
config.target_triple = [ ]
6261
for feature in config.test_compiler_features:
6362
config.available_features.add(feature)
6463

openmp/tools/archer/tests/lit.site.cfg.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1111
config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
1212
config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
1313
config.operating_system = "@CMAKE_SYSTEM_NAME@"
14+
config.target_triple = "@LLVM_TARGET_TRIPLE@"
1415
config.has_libatomic = @LIBARCHER_HAVE_LIBATOMIC@
1516
config.has_tsan = @OPENMP_TEST_ENABLE_TSAN@
1617

1718
config.test_archer_flags = "@LIBARCHER_TEST_FLAGS@"
1819
config.libarcher_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1920

21+
import lit.llvm
22+
lit.llvm.initialize(lit_config, config)
23+
2024
# Let the main config do the real work.
2125
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")

openmp/tools/multiplex/tests/lit.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ if 'CHECK_OPENMP_ENV' in os.environ:
6363
config.environment[name] = value
6464

6565
# Allow XFAIL to work
66-
config.target_triple = [ ]
6766
for feature in config.test_compiler_features:
6867
config.available_features.add(feature)
6968

openmp/tools/multiplex/tests/lit.site.cfg.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
1111
config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
1212
config.ompt_print_callback_dir = "@OMPT_PRINT_CALLBACKS_DIR@"
1313
config.operating_system = "@CMAKE_SYSTEM_NAME@"
14+
config.target_triple = "@LLVM_TARGET_TRIPLE@"
15+
16+
import lit.llvm
17+
lit.llvm.initialize(lit_config, config)
1418

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

0 commit comments

Comments
 (0)