This is an archive of the discontinued LLVM Phabricator instance.

Differential D100045

[HIP] Fix rocm-detect.hip test path
ClosedPublic

Authored by ashi1 on Apr 7 2021, 9:19 AM.

Details

Reviewers
yaxunl
Commits
rGdf59850038d8: [HIP] Fix rocm-detect.hip test path
Summary

The ROCm installation directory may be another
directory, llvm/ inside the build directory.

Diff Detail

Event Timeline

ashi1 requested review of this revision.Apr 7 2021, 9:19 AM
ashi1 created this revision.
Harbormaster completed remote builds in B97529: Diff 335838.Apr 7 2021, 9:51 AM
yaxunl accepted this revision.Apr 7 2021, 9:58 AM

LGTM. Thanks.

This revision is now accepted and ready to land.Apr 7 2021, 9:58 AM
Closed by commit rGdf59850038d8: [HIP] Fix rocm-detect.hip test path (authored by ashi1). · Explain WhyApr 7 2021, 10:21 AM
This revision was automatically updated to reflect the committed changes.
ashi1 added a commit: rGdf59850038d8: [HIP] Fix rocm-detect.hip test path.
Herald added a project: Restricted Project. · View Herald TranscriptApr 7 2021, 10:21 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
test/
Driver/
2 lines

Diff 335860

clang/test/Driver/rocm-detect.hip

Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Lines
// ROCM-ENV: ROCm installation search path: {{.*}}/Inputs/rocm // ROCM-ENV: ROCm installation search path: {{.*}}/Inputs/rocm
// 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: 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: [[CLANG]]/lib/clang/{{[0-9.]+}} // SPACK: ROCm installation search path: [[CLANG]]/{{(llvm/)?}}lib/clang/{{[0-9.]+}}
// SPACK: ROCm installation search path: /opt/rocm // SPACK: ROCm installation search path: /opt/rocm
// SPACK: InstalledDir: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin // SPACK: InstalledDir: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
// SPACK: Found HIP installation: [[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5, version 4.0.20214-a2917cd // SPACK: Found HIP installation: [[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5, version 4.0.20214-a2917cd
// SPACK: "-triple" "amdgcn-amd-amdhsa" // SPACK: "-triple" "amdgcn-amd-amdhsa"
// SPACK-SAME: "-mlink-builtin-bitcode" "[[DIR]]/rocm-device-libs-4.0.0-6wnyzz4hgl3hr7uswasnagt7j2adctbs/amdgcn/bitcode/hip.bc" // SPACK-SAME: "-mlink-builtin-bitcode" "[[DIR]]/rocm-device-libs-4.0.0-6wnyzz4hgl3hr7uswasnagt7j2adctbs/amdgcn/bitcode/hip.bc"
// SPACK-SAME: "-internal-isystem" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include" // SPACK-SAME: "-internal-isystem" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include"
// SPACK-MULT: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin // SPACK-MULT: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
Show All 18 Lines