[clang] 77910ac - [clang] Reorder output of rocm-detect.hip test

via cfe-commits cfe-commits at lists.llvm.org
Mon Feb 6 07:04:18 PST 2023


Author: serge-sans-paille
Date: 2023-02-06T16:03:58+01:00
New Revision: 77910ac374656319ff114ef251fda358d4aa166a

URL: https://github.com/llvm/llvm-project/commit/77910ac374656319ff114ef251fda358d4aa166a
DIFF: https://github.com/llvm/llvm-project/commit/77910ac374656319ff114ef251fda358d4aa166a.diff

LOG: [clang] Reorder output of rocm-detect.hip test

Since 6fa2abf90886f18472c87bc9bffbcdf4f73c465e the rocm driver is lazily
loaded, which impacts the output of the rocm-detect.hip test.

Added: 
    

Modified: 
    clang/test/Driver/rocm-detect.hip

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/rocm-detect.hip b/clang/test/Driver/rocm-detect.hip
index c3ffd21a75b9b..01837bb45065c 100644
--- a/clang/test/Driver/rocm-detect.hip
+++ b/clang/test/Driver/rocm-detect.hip
@@ -80,12 +80,12 @@
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0
 
-// SPACK: ROCm installation search path (Spack 4.0.0): [[DIR:.*]]
+// 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: [[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/lib/clang
 // SPACK: ROCm installation search path: /opt/rocm
-// 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: "-triple" "amdgcn-amd-amdhsa"
 // SPACK-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc"


        


More information about the cfe-commits mailing list