From 2580635bd2f3c0527353e4d7823326cd9f92ff7c Mon Sep 17 00:00:00 2001 From: "Yaxun (Sam) Liu" Date: Mon, 22 Jun 2020 08:00:57 -0400 Subject: [PATCH] Let HIP default include respect -nogpuinc and -nogpulib --- clang/lib/Driver/ToolChains/AMDGPU.cpp | 4 ++-- clang/test/Driver/hip-include-path.hip | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index edc52b86e45a..3c1011740d50 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -223,8 +223,6 @@ void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs, llvm::sys::path::append(P, "cuda_wrappers"); CC1Args.push_back("-internal-isystem"); CC1Args.push_back(DriverArgs.MakeArgString(P)); - CC1Args.push_back("-include"); - CC1Args.push_back("__clang_hip_runtime_wrapper.h"); } if (DriverArgs.hasArg(options::OPT_nogpuinc)) @@ -237,6 +235,8 @@ void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs, CC1Args.push_back("-internal-isystem"); CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath())); + CC1Args.push_back("-include"); + CC1Args.push_back("__clang_hip_runtime_wrapper.h"); } void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA, diff --git a/clang/test/Driver/hip-include-path.hip b/clang/test/Driver/hip-include-path.hip index 996c53bc3f28..ea508a91dd43 100644 --- a/clang/test/Driver/hip-include-path.hip +++ b/clang/test/Driver/hip-include-path.hip @@ -19,9 +19,10 @@ // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1" // CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include/cuda_wrappers" // NOCLANG-NOT: "{{.*}}clang/{{.*}}/include/cuda_wrappers" -// CLANG-SAME: "-include" "__clang_hip_runtime_wrapper.h" // 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" @@ -29,9 +30,10 @@ // COMMON-LABEL: "{{[^"]*}}clang{{[^"]*}}" "-cc1" // CLANG-SAME: "-internal-isystem" "{{.*}}clang/{{.*}}/include/cuda_wrappers" // NOCLANG-NOT: "{{.*}}clang/{{.*}}/include/cuda_wrappers" -// CLANG-SAME: "-include" "__clang_hip_runtime_wrapper.h" // 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"