This is an archive of the discontinued LLVM Phabricator instance.

Differential D157243

[HIP] Make test rocm-detect.hip more stable
ClosedPublic

Authored by yaxunl on Aug 6 2023, 2:57 PM.

Details

Reviewers
MaskRay
jhuber6
Commits
rGef888bc67c72: [HIP] Make test rocm-detect.hip more stable
Summary

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.

Diff Detail

Event Timeline

yaxunl created this revision.Aug 6 2023, 2:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2023, 2:57 PM
Herald added subscribers: kerbowa, jvesely. · View Herald Transcript
yaxunl requested review of this revision.Aug 6 2023, 2:57 PM
jhuber6 accepted this revision.Aug 6 2023, 3:00 PM
This revision is now accepted and ready to land.Aug 6 2023, 3:00 PM
This revision was landed with ongoing or failed builds.Aug 6 2023, 3:16 PM
Closed by commit rGef888bc67c72: [HIP] Make test rocm-detect.hip more stable (authored by yaxunl). · Explain Why
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rGef888bc67c72: [HIP] Make test rocm-detect.hip more stable.
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2023, 3:16 PM
Harbormaster completed remote builds in B250644: Diff 547608.Aug 6 2023, 3:35 PM

Revision Contents

PathSize
clang/
test/
Driver/
Inputs/
rocm-spack/
llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/
amdgcn/
bitcode/
4 lines

Diff 547610

clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_400.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/oclc_abi_version_500.bc

  • This file was added.
This is an empty file.

clang/test/Driver/rocm-detect.hip

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
// NODEFAULTLIBS-NOT: error: cannot find // NODEFAULTLIBS-NOT: error: cannot find
// COMMON: "-triple" "amdgcn-amd-amdhsa" // COMMON: "-triple" "amdgcn-amd-amdhsa"
// ROCM-ENV: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]] // ROCM-ENV: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]]
// HIP-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" // HIP-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc"
// HIP-PATH: "-idirafter" "[[HIP_PATH:.*/myhip]]/include" // 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: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]]
// ROCM-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" // ROCM-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc"
// ROCM-PATH: "-idirafter" "[[ROCM_PATH]]/include" // 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
// ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0
// SPACK: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin // SPACK: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
// SPACK: ROCm installation search path (Spack 4.0.0): [[DIR]] // SPACK: ROCm installation search path (Spack 4.0.0): [[DIR]]
// SPACK: ROCm installation search path: [[CLANG:.*]] // SPACK: ROCm installation search path: [[CLANG:.*]]
// SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z // SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z
Show All 15 Lines