[llvm] [Offload] Change x86_64-pc-linux to x86_64-unknown-linux (PR #107023)

via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 2 14:47:43 PDT 2024 

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-offload

Author: Jan Patrick Lehr (jplehr)

<details>
<summary>Changes</summary>

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.

---

Patch is 39.75 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/107023.diff


45 Files Affected:

- (modified) offload/CMakeLists.txt (+2-2) 
- (modified) offload/plugins-nextgen/host/CMakeLists.txt (+1-1) 
- (modified) offload/test/api/is_initial_device.c (+3-3) 
- (modified) offload/test/lit.cfg (+2-2) 
- (modified) offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp (+1-1) 
- (modified) offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp (+1-1) 
- (modified) offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp (+1-1) 
- (modified) offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp (+1-1) 
- (modified) offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp (+1-1) 
- (modified) offload/test/mapping/map_both_pointer_pointee.c (+1-1) 
- (modified) offload/test/mapping/target_pointers_members_map.cpp (+1-1) 
- (modified) offload/test/offloading/CUDA/basic_launch.cu (+2-2) 
- (modified) offload/test/offloading/CUDA/basic_launch_blocks_and_threads.cu (+2-2) 
- (modified) offload/test/offloading/CUDA/basic_launch_multi_arg.cu (+2-2) 
- (modified) offload/test/offloading/CUDA/launch_tu.cu (+2-2) 
- (modified) offload/test/offloading/dynamic-schedule-non-spmd.cpp (+2-2) 
- (modified) offload/test/offloading/dynamic-schedule.cpp (+2-2) 
- (modified) offload/test/offloading/fortran/dtype-array-constant-index-map.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/dump_map_tables.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-depend.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-all-common-block-members.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-common-block.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-first-common-block-member.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-mix-imp-exp-common-block-members.f90 (+2-2) 
- (modified) offload/test/offloading/fortran/target-map-second-common-block-member.f90 (+2-2) 
- (modified) offload/test/offloading/high_trip_count_block_limit.cpp (+2-2) 
- (modified) offload/test/offloading/schedule.c (+2-2) 
- (modified) offload/test/sanitizer/double_free.c (+3-3) 
- (modified) offload/test/sanitizer/double_free_racy.c (+2-2) 
- (modified) offload/test/sanitizer/free_host_ptr.c (+3-3) 
- (modified) offload/test/sanitizer/free_wrong_ptr_kind.c (+5-5) 
- (modified) offload/test/sanitizer/free_wrong_ptr_kind.cpp (+4-4) 
- (modified) offload/test/sanitizer/kernel_crash.c (+8-9) 
- (modified) offload/test/sanitizer/kernel_crash_async.c (+4-5) 
- (modified) offload/test/sanitizer/kernel_crash_many.c (+12-13) 
- (modified) offload/test/sanitizer/kernel_crash_single.c (+6-7) 
- (modified) offload/test/sanitizer/kernel_trap.c (+2-2) 
- (modified) offload/test/sanitizer/kernel_trap.cpp (+2-2) 
- (modified) offload/test/sanitizer/kernel_trap_async.c (+2-2) 
- (modified) offload/test/sanitizer/kernel_trap_many.c (+4-5) 
- (modified) offload/test/sanitizer/ptr_outside_alloc_1.c (+2-2) 
- (modified) offload/test/sanitizer/ptr_outside_alloc_2.c (+2-2) 
- (modified) offload/test/sanitizer/use_after_free_1.c (+2-2) 
- (modified) offload/test/sanitizer/use_after_free_2.c (+2-2) 


``````````diff
diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt
index d91b5fa1959295..9ffe8f56b76e67 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 817d128f924109..0ab827a355379d 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 f1a85fec6403fe..d48858f75ddf48 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 <omp.h>
 #include <stdio.h>
diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index dc39ecb6708d9a..9ddef42cf90370 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 dddbd332eb7462..d545e98ef6c3e3 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 bf510763526ff2..f575d78e2f7811 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 <cstdio>
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 d6092213a8f930..cc823ed636bc13 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 <assert.h>
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 27ea747e34e261..803158f1144050 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 <cstdio>
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 b7f6ef5642e2b8..817e9684a8a2e6 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 <cstdio>
diff --git a/offload/test/mapping/map_both_pointer_pointee.c b/offload/test/mapping/map_both_pointer_pointee.c
index 65d7d3d4d2bff1..c4894ed97af577 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 daf98199e2caf7..fd5498f5878391 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 <cstdio>
diff --git a/offload/test/offloading/CUDA/basic_launch.cu b/offload/test/offloading/CUDA/basic_launch.cu
index 79f01f48b6c2ad..0846031a3f1aef 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 <stdio.h>
 
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 d4a6bc9ddfb3fa..541cb58ce71df5 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 <stdio.h>
 
diff --git a/offload/test/offloading/CUDA/basic_launch_multi_arg.cu b/offload/test/offloading/CUDA/basic_launch_multi_arg.cu
index c11c194b5e0611..1f84a0e1288d4c 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 <stdio.h>
 
diff --git a/offload/test/offloading/CUDA/launch_tu.cu b/offload/test/offloading/CUDA/launch_tu.cu
index aad3d509752376..17be0a1045f791 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 <stdio.h>
 
diff --git a/offload/test/offloading/dynamic-schedule-non-spmd.cpp b/offload/test/offloading/dynamic-schedule-non-spmd.cpp
index ae3a480b0090b4..b970f593043051 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 500528f5ccb677..6d68982686a83a 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 580eef42e51a80..7e168b846f858c 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 cb66ef348e3c2e..e25b05b9e04db5 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 928eb671c97068..1bb320d6bd93c1 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 def1e7c6630731..f92e5818a76405 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 8fcd504950515b..d2705db5d6fffb 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 47f50840befd3e..857e79c5fa6e21 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 69c1fa13501d21..57a7380221ad81 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 672630aec7d7ce..a634cd023c57c1 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 3aa937eb9adc6d..fce876cfb02136 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 d0e39274e27d6e..12d76d80d72fc0 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 aed97073c898ce..92418cea8bd332 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 a3d8b06f1c7381..c229e0297d0eab 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 
+/...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/107023

More information about the llvm-commits mailing list