This is an archive of the discontinued LLVM Phabricator instance.

Differential D100502

Allow lib64 in driver test
ClosedPublic

Authored by troyj on Apr 14 2021, 12:35 PM.

Details

Reviewers
yaxunl
arsenm
Commits
rG8628ed0310e2: [Driver] Allow both lib64 and lib in rocm-detect test.
Summary

The test clang/test/Driver/rocm-detect.hip does not consider that "lib" may be "lib64" instead.

Diff Detail

Event Timeline

troyj requested review of this revision.Apr 14 2021, 12:35 PM
troyj created this revision.
Herald added a subscriber: cfe-commits. · View Herald TranscriptApr 14 2021, 12:35 PM
troyj edited reviewers, added: yaxunl; removed: Restricted Project.Apr 14 2021, 12:37 PM
Harbormaster completed remote builds in B98737: Diff 337520.Apr 14 2021, 1:59 PM
troyj updated this revision to Diff 337827.Apr 15 2021, 10:43 AM

Correct + to *.

Harbormaster completed remote builds in B98965: Diff 337827.Apr 15 2021, 11:25 AM
troyj added a reviewer: arsenm.Apr 15 2021, 1:53 PM
Herald added a subscriber: wdng. · View Herald TranscriptApr 15 2021, 1:53 PM
arsenm accepted this revision.Apr 15 2021, 1:56 PM
This revision is now accepted and ready to land.Apr 15 2021, 1:56 PM
Closed by commit rG8628ed0310e2: [Driver] Allow both lib64 and lib in rocm-detect test. (authored by troyj). · Explain WhyApr 16 2021, 7:56 AM
This revision was automatically updated to reflect the committed changes.
troyj added a commit: rG8628ed0310e2: [Driver] Allow both lib64 and lib in rocm-detect test..

Revision Contents

PathSize
clang/
test/
Driver/
2 lines

Diff 338118

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]]/{{(llvm/)?}}lib/clang/{{[0-9.]+}} // SPACK: ROCm installation search path: [[CLANG]]/{{(llvm/)?}}lib{{[0-9]*}}/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