From 0cf94193a6accbd9d16ed302ea6fbdbdfec630f8 Mon Sep 17 00:00:00 2001 From: JP Lehr Date: Mon, 2 Sep 2024 16:04:49 -0500 Subject: [PATCH] [Offload] Change x86_64-pc-linux to x86_64-unknown-linux It appears that the RUNTIMES build prefers the x86-64-unknown-linux-gnu triple notation for the host. This fixes runtime / test breakages when compiler-rt is used as the CLANG_DEFAULT_RTLIB. --- offload/CMakeLists.txt | 4 +-- offload/plugins-nextgen/host/CMakeLists.txt | 2 +- offload/test/api/is_initial_device.c | 6 ++--- offload/test/lit.cfg | 4 +-- ...re_mapper_nested_default_mappers_array.cpp | 2 +- ...nested_default_mappers_array_subscript.cpp | 2 +- ...sted_default_mappers_complex_structure.cpp | 2 +- ...r_nested_default_mappers_ptr_subscript.cpp | 2 +- ...lare_mapper_nested_default_mappers_var.cpp | 2 +- .../test/mapping/map_both_pointer_pointee.c | 2 +- .../mapping/target_pointers_members_map.cpp | 2 +- offload/test/offloading/CUDA/basic_launch.cu | 4 +-- .../CUDA/basic_launch_blocks_and_threads.cu | 4 +-- .../offloading/CUDA/basic_launch_multi_arg.cu | 4 +-- offload/test/offloading/CUDA/launch_tu.cu | 4 +-- .../offloading/dynamic-schedule-non-spmd.cpp | 4 +-- offload/test/offloading/dynamic-schedule.cpp | 4 +-- .../dtype-array-constant-index-map.f90 | 4 +-- .../offloading/fortran/dump_map_tables.f90 | 4 +-- .../test/offloading/fortran/target-depend.f90 | 4 +-- .../target-map-all-common-block-members.f90 | 4 +-- .../fortran/target-map-common-block.f90 | 4 +-- ...t-map-declare-target-link-common-block.f90 | 4 +-- .../target-map-first-common-block-member.f90 | 4 +-- ...t-map-mix-imp-exp-common-block-members.f90 | 4 +-- .../target-map-second-common-block-member.f90 | 4 +-- .../high_trip_count_block_limit.cpp | 4 +-- offload/test/offloading/schedule.c | 4 +-- offload/test/sanitizer/double_free.c | 6 ++--- offload/test/sanitizer/double_free_racy.c | 4 +-- offload/test/sanitizer/free_host_ptr.c | 6 ++--- offload/test/sanitizer/free_wrong_ptr_kind.c | 10 ++++---- .../test/sanitizer/free_wrong_ptr_kind.cpp | 8 +++--- offload/test/sanitizer/kernel_crash.c | 17 ++++++------- offload/test/sanitizer/kernel_crash_async.c | 9 +++---- offload/test/sanitizer/kernel_crash_many.c | 25 +++++++++---------- offload/test/sanitizer/kernel_crash_single.c | 13 +++++----- offload/test/sanitizer/kernel_trap.c | 4 +-- offload/test/sanitizer/kernel_trap.cpp | 4 +-- offload/test/sanitizer/kernel_trap_async.c | 4 +-- offload/test/sanitizer/kernel_trap_many.c | 9 +++---- offload/test/sanitizer/ptr_outside_alloc_1.c | 4 +-- offload/test/sanitizer/ptr_outside_alloc_2.c | 4 +-- offload/test/sanitizer/use_after_free_1.c | 4 +-- offload/test/sanitizer/use_after_free_2.c | 4 +-- 45 files changed, 114 insertions(+), 119 deletions(-) diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt index d91b5fa195929..9ffe8f56b76e6 100644 --- a/offload/CMakeLists.txt +++ b/offload/CMakeLists.txt @@ -192,8 +192,8 @@ set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64le-ibm-linux set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64le-ibm-linux-gnu-LTO") set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu") set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu-LTO") -set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu") -set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu-LTO") +set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu") +set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu-LTO") set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda") set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-LTO") set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-JIT-LTO") diff --git a/offload/plugins-nextgen/host/CMakeLists.txt b/offload/plugins-nextgen/host/CMakeLists.txt index 817d128f92410..0ab827a355379 100644 --- a/offload/plugins-nextgen/host/CMakeLists.txt +++ b/offload/plugins-nextgen/host/CMakeLists.txt @@ -49,7 +49,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64$") set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}" PARENT_SCOPE) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64$") list(APPEND LIBOMPTARGET_SYSTEM_TARGETS - "x86_64-pc-linux-gnu" "x86_64-pc-linux-gnu-LTO") + "x86_64-unknown-linux-gnu" "x86_64-unknown-linux-gnu-LTO") set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}" PARENT_SCOPE) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64$") list(APPEND LIBOMPTARGET_SYSTEM_TARGETS diff --git a/offload/test/api/is_initial_device.c b/offload/test/api/is_initial_device.c index f1a85fec6403f..d48858f75ddf4 100644 --- a/offload/test/api/is_initial_device.c +++ b/offload/test/api/is_initial_device.c @@ -1,8 +1,8 @@ -// RUN: %libomptarget-compile-run-and-check-x86_64-pc-linux-gnu -// RUN: %libomptarget-compile-x86_64-pc-linux-gnu -DUNUSED -Wall -Werror +// RUN: %libomptarget-compile-run-and-check-x86_64-unknown-linux-gnu +// RUN: %libomptarget-compile-x86_64-unknown-linux-gnu -DUNUSED -Wall -Werror // only run for x86_64 host offloading: -// REQUIRES: x86_64-pc-linux-gnu +// REQUIRES: x86_64-unknown-linux-gnu #include #include diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg index dc39ecb6708d9..9ddef42cf9037 100644 --- a/offload/test/lit.cfg +++ b/offload/test/lit.cfg @@ -188,8 +188,8 @@ def add_libraries(source): host_targets = [ "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-gnu-LTO", - "x86_64-pc-linux-gnu", - "x86_64-pc-linux-gnu-LTO", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-gnu-LTO", "s390x-ibm-linux-gnu", "s390x-ibm-linux-gnu-LTO", ] diff --git a/offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp b/offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp index dddbd332eb746..d545e98ef6c3e 100644 --- a/offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp +++ b/offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda // UNSUPPORTED: clang diff --git a/offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp b/offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp index bf510763526ff..f575d78e2f781 100644 --- a/offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp +++ b/offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda #include diff --git a/offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp b/offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp index d6092213a8f93..cc823ed636bc1 100644 --- a/offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp +++ b/offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda #include diff --git a/offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp b/offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp index 27ea747e34e26..803158f114405 100644 --- a/offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp +++ b/offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda #include diff --git a/offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp b/offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp index b7f6ef5642e2b..817e9684a8a2e 100644 --- a/offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp +++ b/offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda #include diff --git a/offload/test/mapping/map_both_pointer_pointee.c b/offload/test/mapping/map_both_pointer_pointee.c index 65d7d3d4d2bff..c4894ed97af57 100644 --- a/offload/test/mapping/map_both_pointer_pointee.c +++ b/offload/test/mapping/map_both_pointer_pointee.c @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda // REQUIRES: unified_shared_memory diff --git a/offload/test/mapping/target_pointers_members_map.cpp b/offload/test/mapping/target_pointers_members_map.cpp index daf98199e2caf..fd5498f587839 100644 --- a/offload/test/mapping/target_pointers_members_map.cpp +++ b/offload/test/mapping/target_pointers_members_map.cpp @@ -1,7 +1,7 @@ // RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu -// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu +// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu // RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda #include diff --git a/offload/test/offloading/CUDA/basic_launch.cu b/offload/test/offloading/CUDA/basic_launch.cu index 79f01f48b6c2a..0846031a3f1ae 100644 --- a/offload/test/offloading/CUDA/basic_launch.cu +++ b/offload/test/offloading/CUDA/basic_launch.cu @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO #include diff --git a/offload/test/offloading/CUDA/basic_launch_blocks_and_threads.cu b/offload/test/offloading/CUDA/basic_launch_blocks_and_threads.cu index d4a6bc9ddfb3f..541cb58ce71df 100644 --- a/offload/test/offloading/CUDA/basic_launch_blocks_and_threads.cu +++ b/offload/test/offloading/CUDA/basic_launch_blocks_and_threads.cu @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO #include diff --git a/offload/test/offloading/CUDA/basic_launch_multi_arg.cu b/offload/test/offloading/CUDA/basic_launch_multi_arg.cu index c11c194b5e061..1f84a0e1288d4 100644 --- a/offload/test/offloading/CUDA/basic_launch_multi_arg.cu +++ b/offload/test/offloading/CUDA/basic_launch_multi_arg.cu @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO #include diff --git a/offload/test/offloading/CUDA/launch_tu.cu b/offload/test/offloading/CUDA/launch_tu.cu index aad3d50975237..17be0a1045f79 100644 --- a/offload/test/offloading/CUDA/launch_tu.cu +++ b/offload/test/offloading/CUDA/launch_tu.cu @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO #include diff --git a/offload/test/offloading/dynamic-schedule-non-spmd.cpp b/offload/test/offloading/dynamic-schedule-non-spmd.cpp index ae3a480b0090b..b970f59304305 100644 --- a/offload/test/offloading/dynamic-schedule-non-spmd.cpp +++ b/offload/test/offloading/dynamic-schedule-non-spmd.cpp @@ -4,8 +4,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/offloading/dynamic-schedule.cpp b/offload/test/offloading/dynamic-schedule.cpp index 500528f5ccb67..6d68982686a83 100644 --- a/offload/test/offloading/dynamic-schedule.cpp +++ b/offload/test/offloading/dynamic-schedule.cpp @@ -4,8 +4,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/offloading/fortran/dtype-array-constant-index-map.f90 b/offload/test/offloading/fortran/dtype-array-constant-index-map.f90 index 580eef42e51a8..7e168b846f858 100644 --- a/offload/test/offloading/fortran/dtype-array-constant-index-map.f90 +++ b/offload/test/offloading/fortran/dtype-array-constant-index-map.f90 @@ -10,8 +10,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic module test_0 diff --git a/offload/test/offloading/fortran/dump_map_tables.f90 b/offload/test/offloading/fortran/dump_map_tables.f90 index cb66ef348e3c2..e25b05b9e04db 100644 --- a/offload/test/offloading/fortran/dump_map_tables.f90 +++ b/offload/test/offloading/fortran/dump_map_tables.f90 @@ -5,8 +5,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic diff --git a/offload/test/offloading/fortran/target-depend.f90 b/offload/test/offloading/fortran/target-depend.f90 index 928eb671c9706..1bb320d6bd93c 100644 --- a/offload/test/offloading/fortran/target-depend.f90 +++ b/offload/test/offloading/fortran/target-depend.f90 @@ -5,8 +5,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-all-common-block-members.f90 b/offload/test/offloading/fortran/target-map-all-common-block-members.f90 index def1e7c663073..f92e5818a7640 100644 --- a/offload/test/offloading/fortran/target-map-all-common-block-members.f90 +++ b/offload/test/offloading/fortran/target-map-all-common-block-members.f90 @@ -6,8 +6,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-common-block.f90 b/offload/test/offloading/fortran/target-map-common-block.f90 index 8fcd504950515..d2705db5d6fff 100644 --- a/offload/test/offloading/fortran/target-map-common-block.f90 +++ b/offload/test/offloading/fortran/target-map-common-block.f90 @@ -6,8 +6,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 b/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 index 47f50840befd3..857e79c5fa6e2 100644 --- a/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 +++ b/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 @@ -7,8 +7,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-first-common-block-member.f90 b/offload/test/offloading/fortran/target-map-first-common-block-member.f90 index 69c1fa13501d2..57a7380221ad8 100644 --- a/offload/test/offloading/fortran/target-map-first-common-block-member.f90 +++ b/offload/test/offloading/fortran/target-map-first-common-block-member.f90 @@ -6,8 +6,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-mix-imp-exp-common-block-members.f90 b/offload/test/offloading/fortran/target-map-mix-imp-exp-common-block-members.f90 index 672630aec7d7c..a634cd023c57c 100644 --- a/offload/test/offloading/fortran/target-map-mix-imp-exp-common-block-members.f90 +++ b/offload/test/offloading/fortran/target-map-mix-imp-exp-common-block-members.f90 @@ -7,8 +7,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/fortran/target-map-second-common-block-member.f90 b/offload/test/offloading/fortran/target-map-second-common-block-member.f90 index 3aa937eb9adc6..fce876cfb0213 100644 --- a/offload/test/offloading/fortran/target-map-second-common-block-member.f90 +++ b/offload/test/offloading/fortran/target-map-second-common-block-member.f90 @@ -6,8 +6,8 @@ ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO ! UNSUPPORTED: aarch64-unknown-linux-gnu ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -! UNSUPPORTED: x86_64-pc-linux-gnu -! UNSUPPORTED: x86_64-pc-linux-gnu-LTO +! UNSUPPORTED: x86_64-unknown-linux-gnu +! UNSUPPORTED: x86_64-unknown-linux-gnu-LTO ! RUN: %libomptarget-compile-fortran-run-and-check-generic program main diff --git a/offload/test/offloading/high_trip_count_block_limit.cpp b/offload/test/offloading/high_trip_count_block_limit.cpp index d0e39274e27d6..12d76d80d72fc 100644 --- a/offload/test/offloading/high_trip_count_block_limit.cpp +++ b/offload/test/offloading/high_trip_count_block_limit.cpp @@ -4,8 +4,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO // clang-format on diff --git a/offload/test/offloading/schedule.c b/offload/test/offloading/schedule.c index aed97073c898c..92418cea8bd33 100644 --- a/offload/test/offloading/schedule.c +++ b/offload/test/offloading/schedule.c @@ -4,8 +4,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/double_free.c b/offload/test/sanitizer/double_free.c index a3d8b06f1c738..c229e0297d0ea 100644 --- a/offload/test/sanitizer/double_free.c +++ b/offload/test/sanitizer/double_free.c @@ -1,14 +1,14 @@ // clang-format off // RUN: %libomptarget-compileopt-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG // RUN: %libomptarget-compileopt-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,DEBUG // clang-format on // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/double_free_racy.c b/offload/test/sanitizer/double_free_racy.c index 4ebd8f36efa10..845b479c3fb1f 100644 --- a/offload/test/sanitizer/double_free_racy.c +++ b/offload/test/sanitizer/double_free_racy.c @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/free_host_ptr.c b/offload/test/sanitizer/free_host_ptr.c index 1ec68635499a9..81653080cabf1 100644 --- a/offload/test/sanitizer/free_host_ptr.c +++ b/offload/test/sanitizer/free_host_ptr.c @@ -1,14 +1,14 @@ // clang-format off // RUN: %libomptarget-compileopt-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG // RUN: %libomptarget-compileopt-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,DEBUG // clang-format on // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/free_wrong_ptr_kind.c b/offload/test/sanitizer/free_wrong_ptr_kind.c index 7c5a4ff708502..aeec00162f603 100644 --- a/offload/test/sanitizer/free_wrong_ptr_kind.c +++ b/offload/test/sanitizer/free_wrong_ptr_kind.c @@ -1,14 +1,14 @@ // clang-format off // RUN: %libomptarget-compileopt-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG // RUN: %libomptarget-compileopt-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,DEBUG // clang-format on // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -22,8 +22,8 @@ int main(void) { } // clang-format off -// CHECK: OFFLOAD ERROR: deallocation requires device memory but allocation was pinned host memory: 0x -// CHECK: dataDelete +// CHECK: OFFLOAD ERROR: deallocation requires device memory but allocation was pinned host memory: 0x +// CHECK: dataDelete // CHECK: omp_target_free // NDEBG: main // DEBUG: main {{.*}}free_wrong_ptr_kind.c:22 diff --git a/offload/test/sanitizer/free_wrong_ptr_kind.cpp b/offload/test/sanitizer/free_wrong_ptr_kind.cpp index 7ebb8c438433a..b801abc37199b 100644 --- a/offload/test/sanitizer/free_wrong_ptr_kind.cpp +++ b/offload/test/sanitizer/free_wrong_ptr_kind.cpp @@ -1,14 +1,14 @@ // clang-format off // RUN: %libomptarget-compileoptxx-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG // RUN: %libomptarget-compileoptxx-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_ALLOCATION_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,DEBUG // clang-format on // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -26,7 +26,7 @@ int main(void) { // clang-format off // CHECK: OFFLOAD ERROR: deallocation requires pinned host memory but allocation was managed memory: 0x -// CHECK: dataDelete +// CHECK: dataDelete // CHECK: llvm_omp_target_free_host // NDEBG: main // DEBUG: main {{.*}}free_wrong_ptr_kind.cpp:25 diff --git a/offload/test/sanitizer/kernel_crash.c b/offload/test/sanitizer/kernel_crash.c index c69219d97d3d0..1406af47c7ba9 100644 --- a/offload/test/sanitizer/kernel_crash.c +++ b/offload/test/sanitizer/kernel_crash.c @@ -1,7 +1,6 @@ - // clang-format off // RUN: %libomptarget-compile-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG // RUN: %not --crash %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK // RUN: %libomptarget-compile-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,DEBUG @@ -12,8 +11,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -36,12 +35,12 @@ int main(void) { } } // TRACE: Display 1 of the 3 last kernel launch traces -// TRACE: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l30) +// TRACE: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l29) // TRACE: launchKernel // NDEBG: main -// DEBUG: main {{.*}}kernel_crash.c:30 +// DEBUG: main {{.*}}kernel_crash.c:29 // // CHECK: Display last 3 kernels launched: -// CHECK: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l30) -// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l27) -// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l24) +// CHECK: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l29) +// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l26) +// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l23) diff --git a/offload/test/sanitizer/kernel_crash_async.c b/offload/test/sanitizer/kernel_crash_async.c index 6a0461b0045b2..ee22ba504018b 100644 --- a/offload/test/sanitizer/kernel_crash_async.c +++ b/offload/test/sanitizer/kernel_crash_async.c @@ -1,4 +1,3 @@ - // clang-format off // RUN: %libomptarget-compileopt-generic // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE @@ -12,8 +11,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -34,7 +33,7 @@ int main(void) { #pragma omp taskwait } -// TRACE: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l30) +// TRACE: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l29) // TRACE: launchKernel // -// CHECK: Kernel {{[0-9]}}: {{.*}} (__omp_offloading_{{.*}}_main_l30) +// CHECK: Kernel {{[0-9]}}: {{.*}} (__omp_offloading_{{.*}}_main_l29) diff --git a/offload/test/sanitizer/kernel_crash_many.c b/offload/test/sanitizer/kernel_crash_many.c index 25986e0a459c1..f1d17ca2b76e2 100644 --- a/offload/test/sanitizer/kernel_crash_many.c +++ b/offload/test/sanitizer/kernel_crash_many.c @@ -1,7 +1,6 @@ - // clang-format off // RUN: %libomptarget-compile-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=24 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=24 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,NDEBG // RUN: %libomptarget-compile-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=16 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK,DEBUG // clang-format on @@ -10,8 +9,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -30,42 +29,42 @@ int main(void) { } } // CHECK: Display 8 of the 8 last kernel launch traces -// CHECK: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l27) +// CHECK: Kernel 0: {{.*}} (__omp_offloading_{{.*}}_main_l26) // CHECK: launchKernel // NDEBG: main -// DEBUG: main {{.*}}kernel_crash_many.c:27 +// DEBUG: main {{.*}}kernel_crash_many.c:26 // -// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 3: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 3: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 4: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 4: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 5: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 5: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 6: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 6: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: // -// CHECK: Kernel 7: {{.*}} (__omp_offloading_{{.*}}_main_l23) +// CHECK: Kernel 7: {{.*}} (__omp_offloading_{{.*}}_main_l22) // CHECK: launchKernel // NDEBG: main // DEBUG: main {{.*}}kernel_crash_many.c: diff --git a/offload/test/sanitizer/kernel_crash_single.c b/offload/test/sanitizer/kernel_crash_single.c index 075c3de7ffabb..8baa0a850bf15 100644 --- a/offload/test/sanitizer/kernel_crash_single.c +++ b/offload/test/sanitizer/kernel_crash_single.c @@ -1,7 +1,6 @@ - // clang-format off // RUN: %libomptarget-compile-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG // RUN: %not --crash %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=CHECK // RUN: %libomptarget-compile-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=1 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,DEBUG @@ -12,8 +11,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -27,10 +26,10 @@ int main(void) { } } // TRACE: Display kernel launch trace -// TRACE: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l24) +// TRACE: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l23) // TRACE: launchKernel // NDEBG: main -// DEBUG: main {{.*}}kernel_crash_single.c:24 +// DEBUG: main {{.*}}kernel_crash_single.c:23 // // CHECK: Display only launched kernel: -// CHECK: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l24) +// CHECK: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l23) diff --git a/offload/test/sanitizer/kernel_trap.c b/offload/test/sanitizer/kernel_trap.c index db243001c9056..91c4c7229159b 100644 --- a/offload/test/sanitizer/kernel_trap.c +++ b/offload/test/sanitizer/kernel_trap.c @@ -12,8 +12,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/kernel_trap.cpp b/offload/test/sanitizer/kernel_trap.cpp index 899b608d579a7..c67b3857fabba 100644 --- a/offload/test/sanitizer/kernel_trap.cpp +++ b/offload/test/sanitizer/kernel_trap.cpp @@ -12,8 +12,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/kernel_trap_async.c b/offload/test/sanitizer/kernel_trap_async.c index ee0d772fef9b8..391ff0c7dcaa4 100644 --- a/offload/test/sanitizer/kernel_trap_async.c +++ b/offload/test/sanitizer/kernel_trap_async.c @@ -12,8 +12,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/kernel_trap_many.c b/offload/test/sanitizer/kernel_trap_many.c index b3bdad9f07b4a..f2e63794168b2 100644 --- a/offload/test/sanitizer/kernel_trap_many.c +++ b/offload/test/sanitizer/kernel_trap_many.c @@ -1,7 +1,6 @@ - // clang-format off // RUN: %libomptarget-compile-generic -// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=24 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG +// RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=24 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,NDEBG // RUN: %libomptarget-compile-generic -g // RUN: %not --crash env -u LLVM_DISABLE_SYMBOLIZATION OFFLOAD_TRACK_NUM_KERNEL_LAUNCH_TRACES=16 %libomptarget-run-generic 2>&1 | %fcheck-generic --check-prefixes=TRACE,DEBUG // clang-format on @@ -10,8 +9,8 @@ // UNSUPPORTED: nvptx64-nvidia-cuda-LTO // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO @@ -29,7 +28,7 @@ int main(void) { __builtin_trap(); } } -// TRACE: OFFLOAD ERROR: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l27) +// TRACE: OFFLOAD ERROR: Kernel {{.*}} (__omp_offloading_{{.*}}_main_l26) // TRACE: OFFLOAD ERROR: execution interrupted by hardware trap instruction // TRACE: launchKernel // NDEBG: main diff --git a/offload/test/sanitizer/ptr_outside_alloc_1.c b/offload/test/sanitizer/ptr_outside_alloc_1.c index 38742b783e8e9..0e72941afde87 100644 --- a/offload/test/sanitizer/ptr_outside_alloc_1.c +++ b/offload/test/sanitizer/ptr_outside_alloc_1.c @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/ptr_outside_alloc_2.c b/offload/test/sanitizer/ptr_outside_alloc_2.c index ac47c8922f09e..750d54b86317c 100644 --- a/offload/test/sanitizer/ptr_outside_alloc_2.c +++ b/offload/test/sanitizer/ptr_outside_alloc_2.c @@ -5,8 +5,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/use_after_free_1.c b/offload/test/sanitizer/use_after_free_1.c index cebcdee180347..0ed86f66332ce 100644 --- a/offload/test/sanitizer/use_after_free_1.c +++ b/offload/test/sanitizer/use_after_free_1.c @@ -7,8 +7,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO diff --git a/offload/test/sanitizer/use_after_free_2.c b/offload/test/sanitizer/use_after_free_2.c index 587d04a6ff352..f4e7f0fa0184d 100644 --- a/offload/test/sanitizer/use_after_free_2.c +++ b/offload/test/sanitizer/use_after_free_2.c @@ -5,8 +5,8 @@ // UNSUPPORTED: aarch64-unknown-linux-gnu // UNSUPPORTED: aarch64-unknown-linux-gnu-LTO -// UNSUPPORTED: x86_64-pc-linux-gnu -// UNSUPPORTED: x86_64-pc-linux-gnu-LTO +// UNSUPPORTED: x86_64-unknown-linux-gnu +// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO // UNSUPPORTED: s390x-ibm-linux-gnu // UNSUPPORTED: s390x-ibm-linux-gnu-LTO