[clang] [Clang][retry] Lift HIPSPV onto the new offload driver (PR #178664)

[Farzon Lotfi via cfe-commits]

Henry =?utf-8?q?Linjamäki?= <henry.linjamaki at tuni.fi>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/178664 at github.com>


================
@@ -2,37 +2,92 @@
 
 // RUN: %clang -### -target x86_64-linux-gnu --offload=spirv64 \
 // RUN:   --no-offload-new-driver --hip-path=%S/Inputs/hipspv -nohipwrapperinc %s \
-// RUN: 2>&1 | FileCheck %s
+// RUN: 2>&1 | FileCheck --check-prefixes=CHECK,OLD \
+// RUN:   -DTRIPLE=spirv64 %s
----------------
farzonl wrote:

This test is also failing on the HLSL MacOs test runner
https://github.com/llvm/llvm-project/actions/runs/21525522898/job/62027988341?pr=178931
```
FAIL: Clang :: Driver/hipspv-toolchain.hip (13041 of 23458)
******************** TEST 'Clang :: Driver/hipspv-toolchain.hip' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 3
/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang -### -target x86_64-linux-gnu --offload=spirv64    --no-offload-new-driver --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -nohipwrapperinc /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip  2>&1 | /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck --check-prefixes=CHECK,OLD    -DTRIPLE=spirv64 /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang '-###' -target x86_64-linux-gnu --offload=spirv64 --no-offload-new-driver --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -nohipwrapperinc /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck --check-prefixes=CHECK,OLD -DTRIPLE=spirv64 /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# RUN: at line 8
/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang -### -target x86_64-linux-gnu    --offload=spirv64-unknown-chipstar    --offload-new-driver --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -nohipwrapperinc /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip  2>&1 | /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck --check-prefixes=CHECK,NEW    -DTRIPLE=spirv64-unknown-chipstar -DHIP_PATH=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang '-###' -target x86_64-linux-gnu --offload=spirv64-unknown-chipstar --offload-new-driver --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -nohipwrapperinc /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck --check-prefixes=CHECK,NEW -DTRIPLE=spirv64-unknown-chipstar -DHIP_PATH=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip
# RUN: at line 58
/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang -target x86_64-linux-gnu --offload-new-driver -nogpuinc    -nogpulib --offload=spirv64-unknown-chipstar    --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -Xoffload-compiler    '-###' -c /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip -o /dev/null 2>&1  | /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip --check-prefix=CHIPSTAR
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/clang -target x86_64-linux-gnu --offload-new-driver -nogpuinc -nogpulib --offload=spirv64-unknown-chipstar --hip-path=/Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/Inputs/hipspv -Xoffload-compiler '-###' -c /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip -o /dev/null
# note: command had no output on stdout or stderr
# error: command failed with exit status: 1
# executed command: /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/build/bin/FileCheck /Users/cbieneman/actions-runner/_work/llvm-project/llvm-project/llvm-project/clang/test/Driver/hipspv-toolchain.hip --check-prefix=CHIPSTAR

--
```

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