[HIP] Tighten checks in hip-include-path.hip test case

[bjope]

Summary

The checks (both positive and negative checks) in the test case
hip-include-path.hip could mistakenly end up matching the string
"clang" from the InstalledDir in case the build dir for example
was named "/home/username/build-clang/". Intention with this
patch is to tighten up the checks a bit to filter our the
part of the paths that match with InstalledDir when doing the
checks, as well as matching "/lib/clang/" rather than
just "clang/".

Problem was found when building with

-DCLANG_DEFAULT_RTLIB=compiler-rt
-DCLANG_DEFAULT_CXX_STDLIB=libc++

and having "clang/" in the path to the build dir.

[yaxunl]

LGTM. Thanks.

[hubert.reinterpretcast]

This change is causing failures when the build is done from a working directory that has symlinks:
https://lab.llvm.org/staging/#/builders/126/builds/529/steps/5/logs/FAIL__Clang__hip-include-path_hip

[yaxunl]

It seems we cannot introduce ROOT by line 19 since it is not used in other lines in situations where working directories have sym links.

Instead, we just change {{.*}}clang/ to {{.*}}/lib/clang/ in other lines. Hopefully this will still work.

[bjope]

In D102723#2789537, @yaxunl wrote:

It seems we cannot introduce ROOT by line 19 since it is not used in other lines in situations where working directories have sym links.

Instead, we just change {{.*}}clang/ to {{.*}}/lib/clang/ in other lines. Hopefully this will still work.

Ok. That probably works.

A bit surprised though. I found checks using InstalledDir in other test cases such as clang/test/Friver/stdlibxx-isystem.cpp, so I figured it would be safe to use that also in this test case. So I wonder how other tests that captures InstalledDir could work for the symlink-bots.

[yaxunl]

In D102723#2789610, @bjope wrote:

In D102723#2789537, @yaxunl wrote:

It seems we cannot introduce ROOT by line 19 since it is not used in other lines in situations where working directories have sym links.

Instead, we just change {{.*}}clang/ to {{.*}}/lib/clang/ in other lines. Hopefully this will still work.

Ok. That probably works.

A bit surprised though. I found checks using InstalledDir in other test cases such as clang/test/Friver/stdlibxx-isystem.cpp, so I figured it would be safe to use that also in this test case. So I wonder how other tests that captures InstalledDir could work for the symlink-bots.

That test uses --ccc-install-dir %t/bin to specify installed directory. %t/bin is expanded to real path. However, it seems not working on windows.

[bjope]

I relaxed the checks a bit again here: https://reviews.llvm.org/rGf0e10cc91bc4
But it looks like the workers here (https://lab.llvm.org/staging/#/workers/109) are paused so hard to tell if it helped.

[hubert.reinterpretcast]

In D102723#2790047, @bjope wrote:

But it looks like the workers here (https://lab.llvm.org/staging/#/workers/109) are paused so hard to tell if it helped.

@gkistanova, none of the staging builders appear to be active: https://lab.llvm.org/staging/#/builders

[hubert.reinterpretcast]

In D102723#2790047, @bjope wrote:

I relaxed the checks a bit again here: https://reviews.llvm.org/rGf0e10cc91bc4
But it looks like the workers here (https://lab.llvm.org/staging/#/workers/109) are paused so hard to tell if it helped.

It helped; thanks. The bot has come back green: https://lab.llvm.org/staging/#/builders/126/builds/557

clang/test/Driver/hip-include-path.hip

 // RUN: %clang -c -### -target x86_64-unknown-linux-gnu --cuda-gpu-arch=gfx900 \
 // RUN:   -std=c++11 --rocm-path=%S/Inputs/rocm -nobuiltininc -nogpulib %s 2>&1 \
 // RUN:   | FileCheck -check-prefixes=COMMON,NOCLANG,HIP %s
 
 // RUN: %clang -c -### -target x86_64-unknown-linux-gnu --cuda-gpu-arch=gfx900 \
 // RUN:   -std=c++11 --rocm-path=%S/Inputs/rocm -nogpuinc -nogpulib %s 2>&1 \
 // RUN:   | FileCheck -check-prefixes=COMMON,CLANG,NOHIP %s
 
+// COMMON: InstalledDir: [[ROOT:[^"]*]]/bin
+
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
-// CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include/cuda_wrappers"
-// NOCLANG-NOT: "{{.*}}clang/{{.*}}/include/cuda_wrappers"
+// CLANG-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{.*}}/include/cuda_wrappers"
+// NOCLANG-NOT: "[[ROOT]]/lib/clang/{{.*}}/include/cuda_wrappers"
 // HIP-SAME: "-internal-isystem" "{{.*}}Inputs/rocm/include"
 // NOHIP-NOT: "{{.*}}Inputs/rocm/include"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
-// CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include"
-// NOCLANG-NOT: "{{.*}}clang/{{.*}}/include"
+// CLANG-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{.*}}/include"
+// NOCLANG-NOT: "[[ROOT]]/lib/clang/{{.*}}/include"
 
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
-// CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include/cuda_wrappers"
-// NOCLANG-NOT: "{{.*}}clang/{{.*}}/include/cuda_wrappers"
+// CLANG-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{.*}}/include/cuda_wrappers"
+// NOCLANG-NOT: "[[ROOT]]/lib/clang/{{.*}}/include/cuda_wrappers"
 // HIP-SAME: "-internal-isystem" "{{.*}}Inputs/rocm/include"
 // NOHIP-NOT: "{{.*}}Inputs/rocm/include"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
-// CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include"
-// NOCLANG-NOT: "{{.*}}clang/{{.*}}/include"
+// CLANG-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{.*}}/include"
+// NOCLANG-NOT: "[[ROOT]]/lib/clang/{{.*}}/include"
 
 // RUN: %clang -c -### -target x86_64-unknown-linux-gnu --cuda-gpu-arch=gfx900 \
 // RUN:   -std=c++11 --rocm-path=%S/Inputs/rocm -nogpulib %s 2>&1 \
 // RUN:   --hip-version=3.5 | FileCheck -check-prefixes=ROCM35 %s
 
+// ROCM35: InstalledDir: [[ROOT:[^"]*]]/bin
+
 // ROCM35-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
-// ROCM35-NOT: "{{.*}}clang/{{.*}}/include/cuda_wrappers"
-// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}clang/{{[^"]*}}"
+// ROCM35-NOT: "[[ROOT]]/lib/clang/{{.*}}/include/cuda_wrappers"
+// ROCM35-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{[^"]*}}"
 // ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
 // ROCM35-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
-// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}clang/{{[^"]*}}/include"
+// ROCM35-SAME: "-internal-isystem" "[[ROOT]]/lib/clang/{{.*}}/include"