Author: Yaxun (Sam) Liu Date: 2023-08-06T18:08:09-04:00 New Revision: ef888bc67c726deb8c74ea32e7c8c9ace756b667
URL: https://github.com/llvm/llvm-project/commit/ef888bc67c726deb8c74ea32e7c8c9ace756b667 DIFF: https://github.com/llvm/llvm-project/commit/ef888bc67c726deb8c74ea32e7c8c9ace756b667.diff LOG: [HIP] Make test rocm-detect.hip more stable Some downstream clang is configured to add -rpath to HIP runtime for ld. Also clang may use code object version by default. Make this test result not affected by those. Reviewed by: Joseph Huber Differential Revision: https://reviews.llvm.org/D157243 Added: clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_400.bc clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_500.bc Modified: clang/test/Driver/rocm-detect.hip Removed: ################################################################################ diff --git a/clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_400.bc b/clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_400.bc new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_500.bc b/clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_500.bc new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/clang/test/Driver/rocm-detect.hip b/clang/test/Driver/rocm-detect.hip index 68a4c201be9a8d..947c4f995be171 100644 --- a/clang/test/Driver/rocm-detect.hip +++ b/clang/test/Driver/rocm-detect.hip @@ -123,12 +123,12 @@ // HIP-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" // HIP-PATH: "-idirafter" "[[HIP_PATH:.*/myhip]]/include" -// HIP-PATH: "-L[[HIP_PATH]]/lib" "-lamdhip64" +// HIP-PATH: "-L[[HIP_PATH]]/lib" {{.*}}"-lamdhip64" // ROCM-PATH: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]] // ROCM-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" // ROCM-PATH: "-idirafter" "[[ROCM_PATH]]/include" -// ROCM-PATH: "-L[[ROCM_PATH]]/lib" "-lamdhip64" +// ROCM-PATH: "-L[[ROCM_PATH]]/lib" {{.*}}"-lamdhip64" // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits