carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 21:31:24 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Let HIP default include respect -nogpuinc and -nogpulib

Browse Source
This commit is contained in:
Yaxun (Sam) Liu
2020-06-22 08:39:12 -04:00
parent cce625f73d
commit 2580635bd2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clang/lib/Driver/ToolChains/AMDGPU.cpp
+2 -2
View File
@@ -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,
clang/test/Driver/hip-include-path.hip
+4 -2
View File
@@ -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"