consolidate SYCL wrapper with others.

Author: maksimsab

clang/tools/clang-linker-wrapper/CMakeLists.txt

@@ -16,7 +16,7 @@ set(LLVM_LINK_COMPONENTS
   CodeGen
   LTO
   FrontendOffloading
-  FrontendSYCL
+#  FrontendSYCL
   )
 
 set(LLVM_TARGET_DEFINITIONS LinkerWrapperOpts.td)

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -719,9 +719,9 @@ wrapDeviceImages(ArrayRef<std::unique_ptr<MemoryBuffer>> Buffers,
       return std::move(Err);
     break;
   case OFK_SYCL: {
-    offloading::sycl::SYCLWrappingOptions WrappingOptions;
-    if (Error Err = offloading::sycl::wrapSYCLBinaries(M, BuffersToWrap,
-                                                       WrappingOptions))
+    offloading::SYCLWrappingOptions WrappingOptions;
+    if (Error Err =
+            offloading::wrapSYCLBinaries(M, BuffersToWrap, WrappingOptions))
       return Err;
     break;
   }

llvm/include/llvm/Frontend/Offloading/OffloadWrapper.h

@@ -13,6 +13,8 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Compiler.h"
 
+#include <string>
+
 namespace llvm {
 namespace offloading {
 using EntryArrayTy = std::pair<GlobalVariable *, GlobalVariable *>;
@@ -52,6 +54,23 @@ LLVM_ABI llvm::Error wrapHIPBinary(llvm::Module &M, llvm::ArrayRef<char> Images,
                                    EntryArrayTy EntryArray,
                                    llvm::StringRef Suffix = "",
                                    bool EmitSurfacesAndTextures = true);
+
+struct SYCLWrappingOptions {
+  // target/compiler specific options what are suggested to use to "compile"
+  // program at runtime.
+  std::string CompileOptions;
+  // Target/Compiler specific options that are suggested to use to "link"
+  // program at runtime.
+  std::string LinkOptions;
+};
+
+/// Wraps OffloadBinaries in the given \p Buffers into the module \p M
+/// as global symbols and registers the images with the SYCL Runtime.
+/// \param Options Settings that allows to turn on optional data and settings.
+llvm::Error LLVM_ABI
+wrapSYCLBinaries(llvm::Module &M, llvm::ArrayRef<llvm::ArrayRef<char>> Buffers,
+                 SYCLWrappingOptions Options = SYCLWrappingOptions());
+
 } // namespace offloading
 } // namespace llvm
 

llvm/include/llvm/Frontend/SYCL/OffloadWrapper.h

@@ -5,4 +5,4 @@ add_subdirectory(HLSL)
 add_subdirectory(OpenACC)
 add_subdirectory(OpenMP)
 add_subdirectory(Offloading)
-add_subdirectory(SYCL)
+#add_subdirectory(SYCL)