https://github.com/linehill created https://github.com/llvm/llvm-project/pull/178664
None From 8f81f7b995affc993307bb724d8baba486700ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henry=20Linjam=C3=A4ki?= <[email protected]> Date: Thu, 29 Jan 2026 16:11:05 +0200 Subject: [PATCH] [HIPSPV] Fix CI failures from #168043 --- clang/test/Driver/hipspv-link-static-library.hip | 6 +++--- clang/test/Driver/hipspv-pass-plugin.hip | 12 ++++++++---- clang/test/Driver/hipspv-toolchain.hip | 11 ++++++----- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/clang/test/Driver/hipspv-link-static-library.hip b/clang/test/Driver/hipspv-link-static-library.hip index b8f406ca0b79b..a11734952c93d 100644 --- a/clang/test/Driver/hipspv-link-static-library.hip +++ b/clang/test/Driver/hipspv-link-static-library.hip @@ -19,15 +19,15 @@ // RUN: --no-offload-new-driver %t/libSDL.a \ // RUN: 2>&1 | FileCheck -check-prefixes=ALL,SDL %s -// RUN: %clang --offload-new-driver -fgpu-rdc \ +// RUN: %clang --target=x86_64-linux-gnu --offload-new-driver -fgpu-rdc \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: -nogpuinc -nogpulib %s -c -o %t/tu0.o -// RUN: %clang --offload-new-driver -fgpu-rdc \ +// RUN: %clang --target=x86_64-linux-gnu --offload-new-driver -fgpu-rdc \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: -nogpuinc -nogpulib %s -c -o %t/tu1.o // RUN: llvm-ar cr %t/libSDL2.a %t/tu1.o -// RUN: %clang --offload-new-driver -fgpu-rdc \ +// RUN: %clang --target=x86_64-linux-gnu --offload-new-driver -fgpu-rdc \ // RUN: -Xoffload-compiler-spirv64-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -no-hip-rt %t/tu0.o %t/libSDL2.a \ // A hacky trick to print clang commands invoked by clang-linker-wrapper diff --git a/clang/test/Driver/hipspv-pass-plugin.hip b/clang/test/Driver/hipspv-pass-plugin.hip index 3b1f06b307405..984ddcc2dd0a7 100644 --- a/clang/test/Driver/hipspv-pass-plugin.hip +++ b/clang/test/Driver/hipspv-pass-plugin.hip @@ -16,27 +16,31 @@ // RUN: --no-offload-new-driver -nogpuinc -nogpulib %s \ // RUN: 2>&1 | FileCheck --check-prefixes=ALL,NO-PLUGIN %s -// RUN: %clang --offload-new-driver -nogpuinc -nogpulib \ +// RUN: %clang -target x86_64-linux-gnu --offload-new-driver \ +// RUN: -nogpuinc -nogpulib \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefixes=ALL,FROM-HIP-PATH -// RUN: %clang --offload-new-driver -nogpuinc -nogpulib \ +// RUN: %clang -target x86_64-linux-gnu --offload-new-driver +// RUN: -nogpuinc -nogpulib \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: -Xoffload-compiler-spirv64-unknown-chipstar \ // RUN: --hipspv-pass-plugin=%S/Inputs/pass-plugin.so -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefixes=ALL,FROM-OPTION -// RUN: not %clang --offload-new-driver -nogpuinc -nogpulib \ +// RUN: not %clang -target x86_64-linux-gnu --offload-new-driver \ +// RUN: -nogpuinc -nogpulib \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: -Xoffload-compiler-spirv64-unknown-chipstar \ // RUN: --hipspv-pass-plugin=foo.so -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefixes=ALL,FROM-OPTION-INVALID -// RUN: %clang --offload-new-driver -nogpuinc -nogpulib \ +// RUN: %clang -target x86_64-linux-gnu --offload-new-driver \ +// RUN: -nogpuinc -nogpulib \ // RUN: --offload=spirv64-unknown-chipstar -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefixes=ALL,NO-PLUGIN diff --git a/clang/test/Driver/hipspv-toolchain.hip b/clang/test/Driver/hipspv-toolchain.hip index bac7b533a3fa7..c6cea3d9ecfa5 100644 --- a/clang/test/Driver/hipspv-toolchain.hip +++ b/clang/test/Driver/hipspv-toolchain.hip @@ -55,8 +55,8 @@ // Check the clang command, invoked by the linker wrapper, selects the HIPSPV // toolchain for the new offload driver. -// RUN: %clang --offload-new-driver -nogpuinc -nogpulib \ -// RUN: --offload=spirv64-unknown-chipstar \ +// RUN: %clang -target x86_64-linux-gnu --offload-new-driver -nogpuinc +// RUN: -nogpulib --offload=spirv64-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHIPSTAR @@ -72,8 +72,8 @@ // CHIPSTAR-SAME: "--spirv-ext=-all,+SPV_INTEL_function_pointers,+SPV_INTEL_subgroups" // CHIPSTAR-SAME: [[LOWER_BC]] "-o" "[[SPIRV_OUT:.*img]]" -// RUN: %clang --offload-new-driver -nogpuinc -nogpulib \ -// RUN: --offload=spirv64v1.3-unknown-chipstar \ +// RUN: %clang -target x86_64-linux-gnu --offload-new-driver -nogpuinc \ +// RUN: -nogpulib --offload=spirv64v1.3-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -Xoffload-compiler \ // RUN: '-###' -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHIPSTAR_SUBARCH @@ -100,7 +100,8 @@ // RUN: | FileCheck -DVERSION=%llvm-version-major \ // RUN: --check-prefix=VERSIONED %s -// RUN: env "PATH=%t/versioned" %clang --offload-new-driver -nogpuinc \ +// RUN: env "PATH=%t/versioned" %clang -target x86_64-linux-gnu \ +// RUN: --offload-new-driver -nogpuinc \ // RUN: -nogpulib --offload=spirv64-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -Xoffload-compiler '-###' -c %s \ // RUN: -o /dev/null 2>&1 \ _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
