[clang] [HIP] Fix distro HIP headers shadowing ROCm includes (PR #238058)

David Salinas via cfe-commits cfe-commits at lists.llvm.org
Thu Nov 5 15:59:48 PST 2026


https://github.com/david-salinas updated https://github.com/llvm/llvm-project/pull/238058

>From bc5edc8ab8891333fa908e10354d8a089fb0e456 Mon Sep 17 00:00:00 2001
From: dsalinas <dsalinas at amd.com>
Date: Mon, 2 Nov 2026 12:20:02 -0600
Subject: [PATCH 1/3] [HIP] Fix distro HIP headers shadowing ROCm includes

When ROCm is installed in a non-system directory (e.g. /opt/rocm)
alongside a distro HIP package that places older headers in
/usr/include/hip/, the unconditional use of -idirafter for the ROCm
include path causes /usr/include to be searched first. This silently
picks up the older distro headers instead of the ROCm ones, leading to
build failures with newer APIs and version mismatches at runtime.

Make the include flag conditional: use -internal-isystem for non-system
ROCm installs so they take precedence over /usr/include, and keep
-idirafter when ROCm is installed under /usr to preserve the
#include_next fix from cd597588.

Co-Authored-By: Claude Opus 4.6 <noreply at anthropic.com>
---
 clang/lib/Driver/ToolChains/AMDGPU.cpp | 19 +++++++++++++++----
 clang/test/Driver/hip-include-path.hip | 14 +++++++-------
 clang/test/Driver/rocm-detect.hip      | 13 +++++++++++--
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index 47c36ee18d2272..12f61a247a198b 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -614,12 +614,23 @@ void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs,
     return;
   }
 
-  CC1Args.push_back("-idirafter");
-  CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
-  SmallString<128> LibHipCxxPath(getIncludePath());
+  // When ROCm is installed in a non-system directory (e.g. /opt/rocm),
+  // use -internal-isystem so the selected ROCm headers take precedence
+  // over any distro-installed HIP headers in /usr/include.
+  // When installed under /usr, keep -idirafter to avoid prepending
+  // /usr/include before C++ standard library headers, which would
+  // break #include_next chains (see cd597588).
+  StringRef IncPath = getIncludePath();
+  SmallString<128> SysUsr(D.SysRoot);
+  SysUsr.append("/usr/");
+  const char *IncFlag = IncPath.starts_with(SysUsr) ? "-idirafter"
+                                                    : "-internal-isystem";
+  CC1Args.push_back(IncFlag);
+  CC1Args.push_back(DriverArgs.MakeArgString(IncPath));
+  SmallString<128> LibHipCxxPath(IncPath);
   llvm::sys::path::append(LibHipCxxPath, "libhipcxx");
   if (D.getVFS().exists(LibHipCxxPath)) {
-    CC1Args.push_back("-idirafter");
+    CC1Args.push_back(IncFlag);
     CC1Args.push_back(DriverArgs.MakeArgString(LibHipCxxPath));
   }
   if (UsesRuntimeWrapper)
diff --git a/clang/test/Driver/hip-include-path.hip b/clang/test/Driver/hip-include-path.hip
index 63a83007c5a961..575c48da4c612b 100644
--- a/clang/test/Driver/hip-include-path.hip
+++ b/clang/test/Driver/hip-include-path.hip
@@ -24,14 +24,14 @@
 // RUN:   -std=c++11 --rocm-path=%S/Inputs/rocm-invalid -nogpulib %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=NOLIBHIPCXX %s
 
-// NOLIBHIPCXX: "-idirafter" "{{[^"]*}}Inputs/rocm-invalid/include"
+// NOLIBHIPCXX: "-internal-isystem" "{{[^"]*}}Inputs/rocm-invalid/include"
 // NOLIBHIPCXX-NOT: "{{.*}}Inputs/rocm-invalid/include/libhipcxx"
 
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
-// HIP-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include"
-// HIP-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
@@ -42,8 +42,8 @@
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
-// HIP-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include"
-// HIP-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
@@ -58,8 +58,8 @@
 // ROCM35-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // ROCM35-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // ROCM35-SAME: "-internal-isystem" "[[RESOURCE_DIR]]"
-// ROCM35-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include"
-// ROCM35-SAME: "-idirafter" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
+// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // ROCM35-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
 // ROCM35-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include"
diff --git a/clang/test/Driver/rocm-detect.hip b/clang/test/Driver/rocm-detect.hip
index 8005fb573bd774..538948408765b5 100644
--- a/clang/test/Driver/rocm-detect.hip
+++ b/clang/test/Driver/rocm-detect.hip
@@ -85,6 +85,13 @@
 // RUN:   --print-rocm-search-dirs --hip-link %s 2>&1 \
 // RUN:   | FileCheck -check-prefixes=USR %s
 
+// Test that --rocm-path to a non-system directory uses -internal-isystem
+// even when a sysroot is set, so ROCm headers take precedence over any
+// distro-installed HIP headers under /usr/include.
+// RUN: %clang -### --target=x86_64-linux-gnu --offload-arch=gfx1010 --sysroot=%t \
+// RUN:   --rocm-path=%S/Inputs/rocm -nogpulib %s 2>&1 \
+// RUN:   | FileCheck -check-prefixes=NON-USR %s
+
 // Test detecting latest /opt/rocm-{release} directory.
 // RUN: rm -rf %t/*
 // RUN: mkdir -p %t/opt
@@ -103,12 +110,12 @@
 // ROCM-ENV: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]]
 
 // HIP-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc"
-// HIP-PATH: "-idirafter" "[[HIP_PATH:.*/myhip]]/include"
+// HIP-PATH: "-internal-isystem" "[[HIP_PATH:[^"]*myhip]]/include"
 // HIP-PATH: "[[HIP_PATH]]/lib/libamdhip64.so"
 
 // ROCM-PATH: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]]
 // ROCM-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc"
-// ROCM-PATH: "-idirafter" "[[ROCM_PATH]]/include"
+// ROCM-PATH: "-internal-isystem" "[[ROCM_PATH]]/include"
 // ROCM-PATH: "[[ROCM_PATH]]/lib/libamdhip64.so"
 
 // USR: ROCm installation search path: [[ROCM_PATH:.*/usr$]]
@@ -116,5 +123,7 @@
 // USR: "-idirafter" "[[ROCM_PATH]]/include"
 // USR: "[[ROCM_PATH]]/lib/libamdhip64.so"
 
+// NON-USR: "-internal-isystem" "{{.*}}Inputs/rocm/include"
+
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0

>From 28fdd2727a4f0a223c3da958c11a9e2c14af918e Mon Sep 17 00:00:00 2001
From: dsalinas <dsalinas at amd.com>
Date: Mon, 2 Nov 2026 12:28:50 -0600
Subject: [PATCH 2/3] Fix clang-format style

Co-Authored-By: Claude Opus 4.6 <noreply at anthropic.com>
---
 clang/lib/Driver/ToolChains/AMDGPU.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index 12f61a247a198b..0ed2fed247bfe0 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -623,8 +623,8 @@ void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs,
   StringRef IncPath = getIncludePath();
   SmallString<128> SysUsr(D.SysRoot);
   SysUsr.append("/usr/");
-  const char *IncFlag = IncPath.starts_with(SysUsr) ? "-idirafter"
-                                                    : "-internal-isystem";
+  const char *IncFlag =
+      IncPath.starts_with(SysUsr) ? "-idirafter" : "-internal-isystem";
   CC1Args.push_back(IncFlag);
   CC1Args.push_back(DriverArgs.MakeArgString(IncPath));
   SmallString<128> LibHipCxxPath(IncPath);

>From 0be6d4e2c352bd297031ec9fc67ad7865da3174f Mon Sep 17 00:00:00 2001
From: dsalinas <dsalinas at amd.com>
Date: Thu, 5 Nov 2026 17:58:58 -0600
Subject: [PATCH 3/3] [HIP] Use positional ordering for ROCm include paths

Instead of using path-based heuristics to choose between -idirafter and
-internal-isystem for the ROCm include path, split AddHIPIncludeArgs
into two phases:

- Early phase (AddHIPIncludeArgs): emits wrapper headers (cuda_wrappers/)
  before C++ stdlib headers, preserving #include_next chains.
- Late phase (AddHIPIncludeArgsLate): emits the ROCm toolkit include
  path after C++ stdlib but before C system headers, so the selected
  ROCm installation's HIP headers always take precedence over any
  distro-installed copies in /usr/include.

This replaces the previous conditional that compared the include path
against {SysRoot}/usr/ to decide the flag. That approach had two bugs
identified in review: a double-slash with trailing-slash sysroots, and
/usr/local/rocm still using -idirafter. The positional approach handles
all install locations uniformly without path comparisons.

Co-Authored-By: Claude Opus 4.6 <noreply at anthropic.com>
---
 .../clang/Driver/RocmInstallationDetector.h   |  3 ++
 clang/include/clang/Driver/ToolChain.h        |  6 +++
 clang/lib/Driver/ToolChain.cpp                |  3 ++
 clang/lib/Driver/ToolChains/AMDGPU.cpp        | 44 ++++++++++++-------
 clang/lib/Driver/ToolChains/AMDGPU.h          |  3 ++
 clang/lib/Driver/ToolChains/Clang.cpp         |  6 +++
 clang/lib/Driver/ToolChains/Linux.cpp         |  5 +++
 clang/lib/Driver/ToolChains/Linux.h           |  2 +
 clang/test/Driver/hip-include-path.hip        | 19 ++++----
 clang/test/Driver/rocm-detect.hip             | 11 +----
 10 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/clang/include/clang/Driver/RocmInstallationDetector.h b/clang/include/clang/Driver/RocmInstallationDetector.h
index 165c4c2f38fdb9..fa8b3951e07644 100644
--- a/clang/include/clang/Driver/RocmInstallationDetector.h
+++ b/clang/include/clang/Driver/RocmInstallationDetector.h
@@ -259,6 +259,9 @@ class RocmInstallationDetector {
   void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                          llvm::opt::ArgStringList &CC1Args) const;
 
+  void AddHIPIncludeArgsLate(const llvm::opt::ArgList &DriverArgs,
+                             llvm::opt::ArgStringList &CC1Args) const;
+
   void detectDeviceLibrary();
   void detectHIPRuntime(const llvm::Triple &HostTriple);
 
diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
index b01dbb18c483cf..272e6c36377c69 100644
--- a/clang/include/clang/Driver/ToolChain.h
+++ b/clang/include/clang/Driver/ToolChain.h
@@ -857,6 +857,12 @@ class ToolChain {
   virtual void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                                  llvm::opt::ArgStringList &CC1Args) const;
 
+  /// Add HIP toolkit include paths that must appear after C++ stdlib headers
+  /// but before C system headers, so the selected ROCm installation's HIP
+  /// headers take precedence over any distro-installed copies in /usr/include.
+  virtual void AddHIPIncludeArgsLate(const llvm::opt::ArgList &DriverArgs,
+                                     llvm::opt::ArgStringList &CC1Args) const;
+
   /// Add arguments to use system-specific SYCL includes.
   virtual void addSYCLIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                                   llvm::opt::ArgStringList &CC1Args) const;
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index b3e7043a64fe56..92070f0237678b 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -1951,6 +1951,9 @@ void ToolChain::AddCudaIncludeArgs(const ArgList &DriverArgs,
 void ToolChain::AddHIPIncludeArgs(const ArgList &DriverArgs,
                                   ArgStringList &CC1Args) const {}
 
+void ToolChain::AddHIPIncludeArgsLate(const ArgList &DriverArgs,
+                                      ArgStringList &CC1Args) const {}
+
 void ToolChain::addSYCLIncludeArgs(const ArgList &DriverArgs,
                                    ArgStringList &CC1Args) const {}
 
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index 0ed2fed247bfe0..8de7486eeb7f31 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -614,29 +614,34 @@ void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs,
     return;
   }
 
-  // When ROCm is installed in a non-system directory (e.g. /opt/rocm),
-  // use -internal-isystem so the selected ROCm headers take precedence
-  // over any distro-installed HIP headers in /usr/include.
-  // When installed under /usr, keep -idirafter to avoid prepending
-  // /usr/include before C++ standard library headers, which would
-  // break #include_next chains (see cd597588).
+  // The ROCm toolkit include path (e.g. /opt/rocm/include) is added later
+  // by AddHIPIncludeArgsLate, which is called after C++ stdlib headers but
+  // before C system headers. This positional ordering ensures ROCm headers
+  // beat distro-installed HIP headers in /usr/include without breaking
+  // C++ #include_next chains.
+  if (UsesRuntimeWrapper)
+    CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
+  if (HasHipStdPar)
+    HandleHipStdPar();
+}
+
+void RocmInstallationDetector::AddHIPIncludeArgsLate(
+    const ArgList &DriverArgs, ArgStringList &CC1Args) const {
+  if (!DriverArgs.hasFlag(options::OPT_offload_inc, options::OPT_no_offload_inc,
+                          true))
+    return;
+  if (!hasHIPRuntime())
+    return;
+
   StringRef IncPath = getIncludePath();
-  SmallString<128> SysUsr(D.SysRoot);
-  SysUsr.append("/usr/");
-  const char *IncFlag =
-      IncPath.starts_with(SysUsr) ? "-idirafter" : "-internal-isystem";
-  CC1Args.push_back(IncFlag);
+  CC1Args.push_back("-internal-isystem");
   CC1Args.push_back(DriverArgs.MakeArgString(IncPath));
   SmallString<128> LibHipCxxPath(IncPath);
   llvm::sys::path::append(LibHipCxxPath, "libhipcxx");
   if (D.getVFS().exists(LibHipCxxPath)) {
-    CC1Args.push_back(IncFlag);
+    CC1Args.push_back("-internal-isystem");
     CC1Args.push_back(DriverArgs.MakeArgString(LibHipCxxPath));
   }
-  if (UsesRuntimeWrapper)
-    CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
-  if (HasHipStdPar)
-    HandleHipStdPar();
 }
 
 void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
@@ -1350,6 +1355,13 @@ void AMDGPUToolChain::AddHIPIncludeArgs(const ArgList &DriverArgs,
   RocmInstallation->AddHIPIncludeArgs(DriverArgs, CC1Args);
 }
 
+void AMDGPUToolChain::AddHIPIncludeArgsLate(const ArgList &DriverArgs,
+                                            ArgStringList &CC1Args) const {
+  if (getTriple().getEnvironment() == llvm::Triple::LLVM)
+    return;
+  RocmInstallation->AddHIPIncludeArgsLate(DriverArgs, CC1Args);
+}
+
 VersionTuple AMDGPUToolChain::computeMSVCVersion(const Driver *D,
                                                  const ArgList &Args) const {
   if (HostTC)
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.h b/clang/lib/Driver/ToolChains/AMDGPU.h
index 56581675e478bb..8ef8ca7342750a 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.h
+++ b/clang/lib/Driver/ToolChains/AMDGPU.h
@@ -140,6 +140,9 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUToolChain : public Generic_ELF {
   void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                          llvm::opt::ArgStringList &CC1Args) const override;
 
+  void AddHIPIncludeArgsLate(const llvm::opt::ArgList &DriverArgs,
+                             llvm::opt::ArgStringList &CC1Args) const override;
+
   VersionTuple
   computeMSVCVersion(const Driver *D,
                      const llvm::opt::ArgList &Args) const override;
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 450e3a35d6f1be..168a6d25168deb 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1183,6 +1183,12 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(Args.MakeArgString(P));
   }
 
+  // Add HIP toolkit include paths after C++ stdlib but before system headers.
+  // This ensures the selected ROCm headers beat distro-installed HIP headers
+  // in /usr/include without breaking C++ #include_next chains.
+  if (JA.isOffloading(Action::OFK_HIP))
+    getToolChain().AddHIPIncludeArgsLate(Args, CmdArgs);
+
   // Add system include arguments for all targets but IAMCU.
   if (!IsIAMCU)
     forAllAssociatedToolChains(C, JA, getToolChain(),
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 3e1a81aec74ab2..e027e50e4162a9 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -881,6 +881,11 @@ void Linux::AddHIPIncludeArgs(const ArgList &DriverArgs,
   RocmInstallation->AddHIPIncludeArgs(DriverArgs, CC1Args);
 }
 
+void Linux::AddHIPIncludeArgsLate(const ArgList &DriverArgs,
+                                  ArgStringList &CC1Args) const {
+  RocmInstallation->AddHIPIncludeArgsLate(DriverArgs, CC1Args);
+}
+
 void Linux::addOffloadRTLibs(unsigned ActiveKinds, const ArgList &Args,
                              ArgStringList &CmdArgs) const {
   if (!Args.hasFlag(options::OPT_offloadlib, options::OPT_no_offloadlib,
diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
index 6c81bbc71f7c21..f219cd3b6845f0 100644
--- a/clang/lib/Driver/ToolChains/Linux.h
+++ b/clang/lib/Driver/ToolChains/Linux.h
@@ -37,6 +37,8 @@ class LLVM_LIBRARY_VISIBILITY Linux : public Generic_ELF {
                           llvm::opt::ArgStringList &CC1Args) const override;
   void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                          llvm::opt::ArgStringList &CC1Args) const override;
+  void AddHIPIncludeArgsLate(const llvm::opt::ArgList &DriverArgs,
+                             llvm::opt::ArgStringList &CC1Args) const override;
   void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                            llvm::opt::ArgStringList &CC1Args) const override;
   void addSYCLIncludeArgs(const llvm::opt::ArgList &DriverArgs,
diff --git a/clang/test/Driver/hip-include-path.hip b/clang/test/Driver/hip-include-path.hip
index 575c48da4c612b..f1a4e5805ef25e 100644
--- a/clang/test/Driver/hip-include-path.hip
+++ b/clang/test/Driver/hip-include-path.hip
@@ -30,26 +30,28 @@
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
-// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
-// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
+// ROCm toolkit includes come after C++ stdlib but before system includes
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
+// NOHIP-NOT: "{{.*}}Inputs/rocm/include"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include"
-// NOHIP-NOT: "{{.*}}Inputs/rocm/include"
 
 // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
-// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
-// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // HIP-SAME: "-include" "__clang_hip_runtime_wrapper.h"
 // NOHIP-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
+// ROCm toolkit includes come after C++ stdlib but before system includes
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// HIP-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
+// NOHIP-NOT: "{{.*}}Inputs/rocm/include"
 // CLANG-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include"
 // NOCLANG-NOT: "[[RESOURCE_DIR]]/include"
-// NOHIP-NOT: "{{.*}}Inputs/rocm/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 \
@@ -58,10 +60,11 @@
 // ROCM35-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // ROCM35-NOT: "[[RESOURCE_DIR]]/include/cuda_wrappers"
 // ROCM35-SAME: "-internal-isystem" "[[RESOURCE_DIR]]"
-// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
-// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // ROCM35-NOT: "-include" "__clang_hip_runtime_wrapper.h"
 // skip check of standard C++ include path
+// ROCm toolkit includes come after C++ stdlib but before system includes
+// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include"
+// ROCM35-SAME: "-internal-isystem" "{{[^"]*}}Inputs/rocm/include/libhipcxx"
 // ROCM35-SAME: "-internal-isystem" "[[RESOURCE_DIR]]/include"
 
 // The device compilation must pick up the host toolchain's system include paths
diff --git a/clang/test/Driver/rocm-detect.hip b/clang/test/Driver/rocm-detect.hip
index 538948408765b5..c92929857e2b4e 100644
--- a/clang/test/Driver/rocm-detect.hip
+++ b/clang/test/Driver/rocm-detect.hip
@@ -85,13 +85,6 @@
 // RUN:   --print-rocm-search-dirs --hip-link %s 2>&1 \
 // RUN:   | FileCheck -check-prefixes=USR %s
 
-// Test that --rocm-path to a non-system directory uses -internal-isystem
-// even when a sysroot is set, so ROCm headers take precedence over any
-// distro-installed HIP headers under /usr/include.
-// RUN: %clang -### --target=x86_64-linux-gnu --offload-arch=gfx1010 --sysroot=%t \
-// RUN:   --rocm-path=%S/Inputs/rocm -nogpulib %s 2>&1 \
-// RUN:   | FileCheck -check-prefixes=NON-USR %s
-
 // Test detecting latest /opt/rocm-{release} directory.
 // RUN: rm -rf %t/*
 // RUN: mkdir -p %t/opt
@@ -120,10 +113,8 @@
 
 // USR: ROCm installation search path: [[ROCM_PATH:.*/usr$]]
 // USR: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc"
-// USR: "-idirafter" "[[ROCM_PATH]]/include"
+// USR: "-internal-isystem" "[[ROCM_PATH]]/include"
 // USR: "[[ROCM_PATH]]/lib/libamdhip64.so"
 
-// NON-USR: "-internal-isystem" "{{.*}}Inputs/rocm/include"
-
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm
 // ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0



More information about the cfe-commits mailing list