[SYCL] Remove wrapper headers

Even when compiling for the device, code meant only for host execution
must be semantically analyzable. Existing wrapper headers were initially
created to resolve this problem. But now -aux-triple is used to pass
target triple of opposite side of compilation. Clang knows target triple
for both sides of compilation so that preprocessor macros and target
builtins from both sides are available. That is why there is no need in
existing wrapper headers with stub definitions since they break
compilation for cases when standard headers are included.

Approach with -aux-triple is not complete solution. Host headers might
provide definitions relying on host inline asm, intrinsics, using types
not lowerable in device code. So we will need to provide a solution to
overload some definitions for the device or to define only some macro
for host headers. This will be resolved in other commits.

Signed-off-by: Artur Gainullin <[email protected]>

Author: againull

clang/lib/Driver/ToolChains/Clang.cpp

@@ -1168,16 +1168,6 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
   if (JA.isOffloading(Action::OFK_Cuda))
     getToolChain().AddCudaIncludeArgs(Args, CmdArgs);
 
-  // Add include directories for SYCL
-  if (!Args.hasArg(options::OPT_nobuiltininc) &&
-      getToolChain().getTriple().isSYCLDeviceEnvironment()) {
-    SmallString<128> P(D.ResourceDir);
-    llvm::sys::path::append(P, "include");
-    llvm::sys::path::append(P, "sycl_wrappers");
-    CmdArgs.push_back("-internal-isystem");
-    CmdArgs.push_back(Args.MakeArgString(P));
-  }
-
   // If we are offloading to a target via OpenMP we need to include the
   // openmp_wrappers folder which contains alternative system headers.
   if (JA.isDeviceOffloading(Action::OFK_OpenMP) &&

clang/lib/Headers/CMakeLists.txt

@@ -128,12 +128,6 @@ set(ppc_wrapper_files
   ppc_wrappers/mmintrin.h
 )
 
-set(sycl_wrapper_files
-  sycl_wrappers/algorithm
-  sycl_wrappers/random
-  sycl_wrappers/__config
-)
-
 set(openmp_wrapper_files
   openmp_wrappers/math.h
   openmp_wrappers/cmath
@@ -201,12 +195,6 @@ install(
   DESTINATION ${header_install_dir}/ppc_wrappers
   COMPONENT clang-resource-headers)
 
-install(
-  FILES ${sycl_wrapper_files}
-  COMPONENT clang-resource-headers
-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/sycl_wrappers)
-
 install(
   FILES ${openmp_wrapper_files}
   DESTINATION ${header_install_dir}/openmp_wrappers