Author: Joseph Huber Date: 2026-01-29T08:10:27-06:00 New Revision: 9ae6d8f565515a0199b18d6f156b1a41f328af1a
URL: https://github.com/llvm/llvm-project/commit/9ae6d8f565515a0199b18d6f156b1a41f328af1a DIFF: https://github.com/llvm/llvm-project/commit/9ae6d8f565515a0199b18d6f156b1a41f328af1a.diff LOG: [Clang] Try to fix HIPSPV tests after #168043 Summary: https://github.com/llvm/llvm-project/pull/168043 seems to not have specified the target triple for the tests so different architectures fail these tests. Try to set it manually. If this doesn't clear up the bots I'll revert both. Added: Modified: clang/test/Driver/hipspv-link-static-library.hip clang/test/Driver/hipspv-toolchain.hip Removed: ################################################################################ diff --git a/clang/test/Driver/hipspv-link-static-library.hip b/clang/test/Driver/hipspv-link-static-library.hip index b8f406ca0b79b..5b9dcef717213 100644 --- a/clang/test/Driver/hipspv-link-static-library.hip +++ b/clang/test/Driver/hipspv-link-static-library.hip @@ -20,6 +20,7 @@ // RUN: 2>&1 | FileCheck -check-prefixes=ALL,SDL %s // RUN: %clang --offload-new-driver -fgpu-rdc \ +// RUN: --target=x86_64-linux-gnu \ // RUN: --offload=spirv64-unknown-chipstar \ // RUN: -nogpuinc -nogpulib %s -c -o %t/tu0.o // RUN: %clang --offload-new-driver -fgpu-rdc \ @@ -28,6 +29,7 @@ // RUN: llvm-ar cr %t/libSDL2.a %t/tu1.o // RUN: %clang --offload-new-driver -fgpu-rdc \ +// RUN: --target=x86_64-linux-gnu \ // 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-toolchain.hip b/clang/test/Driver/hipspv-toolchain.hip index bac7b533a3fa7..3749a41a7181c 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 --offload-new-driver -target x86_64-linux-gnu -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 --offload-new-driver -target x86_64-linux-gnu -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,8 +100,8 @@ // RUN: | FileCheck -DVERSION=%llvm-version-major \ // RUN: --check-prefix=VERSIONED %s -// RUN: env "PATH=%t/versioned" %clang --offload-new-driver -nogpuinc \ -// RUN: -nogpulib --offload=spirv64-unknown-chipstar \ +// RUN: env "PATH=%t/versioned" %clang -target x86_64-linux-gnu --offload-new-driver \ +// RUN: -nogpuinc -nogpulib --offload=spirv64-unknown-chipstar \ // RUN: --hip-path=%S/Inputs/hipspv -Xoffload-compiler '-###' -c %s \ // RUN: -o /dev/null 2>&1 \ // RUN: | FileCheck -DVERSION=%llvm-version-major --check-prefix=VERSIONED %s _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
