This is an archive of the discontinued LLVM Phabricator instance.

Differential D156935

[HIP] Fix test rocm-detect.hip
ClosedPublic

Authored by yaxunl on Aug 2 2023, 1:04 PM.

Details

Reviewers
tra
MaskRay
jhuber6
Commits
rG590d7e266426: [HIP] Fix test rocm-detect.hip
Summary

Two run lines fail due to missing device libs for gfx902, which are fixed by
using gfx1010 which has device lib.

The other two spack tests have to be removed since there is no reliable
way to make them pass/fail not depending on whether there is ROCm
installed on the system.

Diff Detail

Event Timeline

yaxunl created this revision.Aug 2 2023, 1:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 2 2023, 1:04 PM
yaxunl requested review of this revision.Aug 2 2023, 1:04 PM
MaskRay accepted this revision.Aug 2 2023, 1:06 PM
This revision is now accepted and ready to land.Aug 2 2023, 1:06 PM
jhuber6 accepted this revision.Aug 2 2023, 1:06 PM
This revision was landed with ongoing or failed builds.Aug 2 2023, 1:13 PM
Closed by commit rG590d7e266426: [HIP] Fix test rocm-detect.hip (authored by yaxunl). · Explain Why
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rG590d7e266426: [HIP] Fix test rocm-detect.hip.
Herald added a project: Restricted Project. · View Herald TranscriptAug 2 2023, 1:13 PM
Harbormaster completed remote builds in B249865: Diff 546582.Aug 2 2023, 4:53 PM

Revision Contents

PathSize
clang/
test/
Driver/
26 lines

Diff 546584

clang/test/Driver/rocm-detect.hip

Show All 15 Lines
// RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \ // RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \
// RUN: | FileCheck -check-prefixes=COMMON,GFX902-DEFAULTLIBS %s // RUN: | FileCheck -check-prefixes=COMMON,GFX902-DEFAULTLIBS %s
// RUN: %clang -### -v -target x86_64-linux-gnu --cuda-gpu-arch=gfx902 -nogpulib \ // RUN: %clang -### -v -target x86_64-linux-gnu --cuda-gpu-arch=gfx902 -nogpulib \
// RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \ // RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \
// RUN: | FileCheck -check-prefixes=COMMON,NODEFAULTLIBS %s // RUN: | FileCheck -check-prefixes=COMMON,NODEFAULTLIBS %s
// Test environment variable ROCM_PATH. // Test environment variable ROCM_PATH.
// RUN: env ROCM_PATH=%S/Inputs/rocm not %clang -### --target=x86_64-linux-gnu \ // RUN: env ROCM_PATH=%S/Inputs/rocm %clang -### --target=x86_64-linux-gnu \
// RUN: --print-rocm-search-dirs %s 2>&1 \ // RUN: --print-rocm-search-dirs --offload-arch=gfx1010 %s 2>&1 \
// RUN: | FileCheck -check-prefixes=ROCM-ENV %s // RUN: | FileCheck -check-prefixes=ROCM-ENV %s
// Test interaction between environment variables HIP_PATH and ROCM_PATH. // Test interaction between environment variables HIP_PATH and ROCM_PATH.
// Device libs are found under ROCM_PATH. HIP include files and HIP runtime library // Device libs are found under ROCM_PATH. HIP include files and HIP runtime library
// are found under HIP_PATH. // are found under HIP_PATH.
// RUN: rm -rf %t/myhip // RUN: rm -rf %t/myhip
// RUN: mkdir -p %t/myhip // RUN: mkdir -p %t/myhip
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
// RUN: --hip-path=%t/myhip --print-rocm-search-dirs %s 2>&1 \ // RUN: --hip-path=%t/myhip --print-rocm-search-dirs %s 2>&1 \
// RUN: | FileCheck -check-prefixes=ROCM-ENV,HIP-PATH %s // RUN: | FileCheck -check-prefixes=ROCM-ENV,HIP-PATH %s
// Test detecting latest /opt/rocm-{release} directory. // Test detecting latest /opt/rocm-{release} directory.
// RUN: rm -rf %T/opt // RUN: rm -rf %T/opt
// RUN: mkdir -p %T/opt // RUN: mkdir -p %T/opt
// RUN: cp -r %S/Inputs/rocm %T/opt/rocm-3.9.0-1234 // RUN: cp -r %S/Inputs/rocm %T/opt/rocm-3.9.0-1234
// RUN: cp -r %S/Inputs/rocm %T/opt/rocm-3.10.0 // RUN: cp -r %S/Inputs/rocm %T/opt/rocm-3.10.0
// RUN: not %clang -### --target=x86_64-linux-gnu --sysroot=%T \ // RUN: %clang -### --target=x86_64-linux-gnu --offload-arch=gfx1010 --sysroot=%T \
// RUN: --print-rocm-search-dirs %s 2>&1 \ // RUN: --print-rocm-search-dirs %s 2>&1 \
// RUN: | FileCheck -check-prefixes=ROCM-REL %s // RUN: | FileCheck -check-prefixes=ROCM-REL %s
// Test ROCm installation built by SPACK by invoke clang at %T/rocm-spack/llvm-amdgpu-* // Test ROCm installation built by SPACK by invoke clang at %T/rocm-spack/llvm-amdgpu-*
// directory through a soft link. // directory through a soft link.
// RUN: rm -rf %T/rocm-spack // RUN: rm -rf %T/rocm-spack
// RUN: cp -r %S/Inputs/rocm-spack %T // RUN: cp -r %S/Inputs/rocm-spack %T
// RUN: ln -fs %clang %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang // RUN: ln -fs %clang %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang
// RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \ // RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \
// RUN: -resource-dir=%T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/lib/clang \ // RUN: -resource-dir=%T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/lib/clang \
// RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 --print-rocm-search-dirs %s 2>&1 \ // RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 --print-rocm-search-dirs %s 2>&1 \
// RUN: | FileCheck -check-prefixes=SPACK %s // RUN: | FileCheck -check-prefixes=SPACK %s
// Test SPACK installation with multiple hip and rocm-device-libs packages of the same // Test SPACK installation with multiple hip and rocm-device-libs packages of the same
// ROCm release. Clang cannot determine which one to use and emit diagnostics. --hip-path // ROCm release. --hip-path and --rocm-device-lib-path can be used to specify them.
// and --rocm-device-lib-path can be used to specify them.
// RUN: cp -r %T/rocm-spack/hip-* %T/rocm-spack/hip-4.0.0-abcd // RUN: cp -r %T/rocm-spack/hip-* %T/rocm-spack/hip-4.0.0-abcd
// RUN: not %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \
// RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 %s 2>&1 \
// RUN: | FileCheck -check-prefixes=SPACK-MULT %s
// RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \ // RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \
// RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 \ // RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 \
// RUN: --hip-path=%T/rocm-spack/hip-4.0.0-abcd \ // RUN: --hip-path=%T/rocm-spack/hip-4.0.0-abcd \
// RUN: %s 2>&1 | FileCheck -check-prefixes=SPACK-SET %s // RUN: %s 2>&1 | FileCheck -check-prefixes=SPACK-SET %s
// Test invalid SPACK ROCm installation missing hip and rocm-device-libs packages. // Test invalid SPACK ROCm installation missing hip and rocm-device-libs packages.
// The message about SPACK is emitted only if -v is specified.
// RUN: rm -rf %T/rocm-spack/hip-* // RUN: rm -rf %T/rocm-spack/hip-*
// RUN: rm -rf %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn // RUN: rm -rf %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn
// RUN: not %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang -### -v \
// RUN: -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 %s 2>&1 \
// RUN: | FileCheck -check-prefixes=SPACK-MISS %s
// RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang --version 2>&1 \ // RUN: %T/rocm-spack/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin/clang --version 2>&1 \
// RUN: | FileCheck -check-prefixes=SPACK-MISS-SILENT %s // RUN: | FileCheck -check-prefixes=SPACK-MISS-SILENT %s
// GFX902-DEFAULTLIBS: error: cannot find ROCm device library for gfx902; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library // GFX902-DEFAULTLIBS: error: cannot find ROCm device library for gfx902; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library
// NODEFAULTLIBS-NOT: error: cannot find // NODEFAULTLIBS-NOT: error: cannot find
// COMMON: "-triple" "amdgcn-amd-amdhsa" // COMMON: "-triple" "amdgcn-amd-amdhsa"
Show All 18 Lines
// SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z // SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z
// SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/lib/clang // SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/lib/clang
// SPACK: ROCm installation search path: /opt/rocm // SPACK: ROCm installation search path: /opt/rocm
// 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]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc" // SPACK-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc"
// SPACK-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include" // SPACK-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include"
// SPACK-MULT: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
// SPACK-MULT-DAG: Cannot use SPACK package hip-4.0.0 at [[DIR]] due to multiple installations for the same version
// SPACK-MULT-NOT: Found HIP installation: [[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5, version 4.0.20214-a2917cd
// SPACK-MULT-NOT: "-internal-isystem" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include"
// SPACK-SET: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin // SPACK-SET: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
// SPACK-SET: Found HIP installation: [[DIR]]/hip-4.0.0-abcd, version 4.0.20214-a2917cd // SPACK-SET: Found HIP installation: [[DIR]]/hip-4.0.0-abcd, version 4.0.20214-a2917cd
// SPACK-SET: "-triple" "amdgcn-amd-amdhsa" // SPACK-SET: "-triple" "amdgcn-amd-amdhsa"
// SPACK-SET-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc" // SPACK-SET-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc"
// SPACK-SET-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-abcd/include" // SPACK-SET-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-abcd/include"
// SPACK-MISS: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin
// SPACK-MISS-DAG: SPACK package hip-4.0.0 not found at [[DIR]]
// SPACK-MISS-NOT: Found HIP installation: [[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5, version 4.0.20214-a2917cd
// SPACK-MISS-NOT: "-idirafter" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include"
// SPACK-MISS-SILENT-NOT: SPACK package hip-{{.*}} not found at // SPACK-MISS-SILENT-NOT: SPACK package hip-{{.*}} not found at
// SPACK-MISS-SILENT-NOT: Found HIP installation // SPACK-MISS-SILENT-NOT: Found HIP installation