Support dynamic linking on new offloading model

Author: maarquitos14

clang/lib/Driver/ToolChains/Clang.cpp

@@ -11486,6 +11486,13 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
     if (Args.hasArg(options::OPT_fsycl_embed_ir))
       CmdArgs.push_back(Args.MakeArgString("-sycl-embed-ir"));
 
+    if (Args.hasArg(options::OPT_fsycl_allow_device_image_dependencies))
+      CmdArgs.push_back(
+          Args.MakeArgString("-sycl-allow-device-image-dependencies"));
+    if (Args.hasArg(options::OPT_fno_sycl_allow_device_image_dependencies))
+      CmdArgs.push_back(
+          Args.MakeArgString("-no-sycl-allow-device-image-dependencies"));
+
     // Formulate and add any offload-wrapper and AOT specific options. These
     // are additional options passed in via -Xsycl-target-linker and
     // -Xsycl-target-backend.

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

@@ -676,6 +676,8 @@ getTripleBasedSYCLPostLinkOpts(const ArgList &Args,
   if ((!Args.hasFlag(OPT_no_sycl_remove_unused_external_funcs,
                      OPT_sycl_remove_unused_external_funcs, false) &&
        !SYCLNativeCPU) &&
+      !Args.hasFlag(OPT_sycl_allow_device_image_dependencies,
+                    OPT_no_sycl_allow_device_image_dependencies, false) &&
       !Triple.isNVPTX() && !Triple.isAMDGPU())
     PostLinkArgs.push_back("-emit-only-kernels-as-entry-points");
 

clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td

@@ -243,3 +243,11 @@ Flags<[WrapperOnlyOption]>,  HelpText<"Embed LLVM IR for runtime kernel fusion">
 def sycl_dump_device_code_EQ : Joined<["--", "-"], "sycl-dump-device-code=">,
   Flags<[WrapperOnlyOption]>,
   HelpText<"Path to the folder where the tool dumps SPIR-V device code. Other formats aren't dumped.">;
+
+// Options to enable/disable device dynamic linking.
+def sycl_allow_device_image_dependencies : Flag<["--", "-"], "sycl-allow-device-image-dependencies">,
+  Flags<[WrapperOnlyOption, HelpHidden]>,
+  HelpText<"Allow dependencies between device code images">;
+def no_sycl_allow_device_image_dependencies : Flag<["--", "-"], "no-sycl-allow-device-image-dependencies">,
+  Flags<[WrapperOnlyOption, HelpHidden]>,
+  HelpText<"Dno not allow dependencies between device code images (default)">;

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/a.cpp

@@ -0,0 +1,13 @@
+#define A_EXPORT
+#include "a.hpp"
+#include "b.hpp"
+#include <iostream>
+
+A_DECLSPEC SYCL_EXTERNAL int levelA(int val) {
+#ifndef __SYCL_DEVICE_ONLY__
+  std::cerr << "Host symbol used" << std::endl;
+  val ^= 0x1234;
+#endif
+  val = levelB(val);
+  return val |= (0xA << 0);
+}

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/a.hpp

@@ -0,0 +1,13 @@
+#include <sycl/detail/core.hpp>
+
+#if defined(MAKE_DLL)
+#ifdef A_EXPORT
+#define A_DECLSPEC __declspec(dllexport)
+#else
+#define A_DECLSPEC __declspec(dllimport)
+#endif
+#else
+#define A_DECLSPEC
+#endif
+
+A_DECLSPEC SYCL_EXTERNAL int levelA(int val);

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/b.cpp

@@ -0,0 +1,13 @@
+#define B_EXPORT
+#include "b.hpp"
+#include "c.hpp"
+#include <iostream>
+
+B_DECLSPEC SYCL_EXTERNAL int levelB(int val) {
+#ifndef __SYCL_DEVICE_ONLY__
+  std::cerr << "Host symbol used" << std::endl;
+  val ^= 0x2345;
+#endif
+  val = levelC(val);
+  return val |= (0xB << 4);
+}

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/b.hpp

@@ -0,0 +1,13 @@
+#include <sycl/detail/core.hpp>
+
+#if defined(MAKE_DLL)
+#ifdef B_EXPORT
+#define B_DECLSPEC __declspec(dllexport)
+#else
+#define B_DECLSPEC __declspec(dllimport)
+#endif
+#else
+#define B_DECLSPEC
+#endif
+
+B_DECLSPEC SYCL_EXTERNAL int levelB(int val);

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/c.cpp

@@ -0,0 +1,13 @@
+#define C_EXPORT
+#include "c.hpp"
+#include "d.hpp"
+#include <iostream>
+
+C_DECLSPEC SYCL_EXTERNAL int levelC(int val) {
+#ifndef __SYCL_DEVICE_ONLY__
+  std::cerr << "Host symbol used" << std::endl;
+  val ^= 0x3456;
+#endif
+  val = levelD(val);
+  return val |= (0xC << 8);
+}

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/c.hpp

@@ -0,0 +1,13 @@
+#include <sycl/detail/core.hpp>
+
+#if defined(MAKE_DLL)
+#ifdef C_EXPORT
+#define C_DECLSPEC __declspec(dllexport)
+#else
+#define C_DECLSPEC __declspec(dllimport)
+#endif
+#else
+#define C_DECLSPEC
+#endif
+
+C_DECLSPEC SYCL_EXTERNAL int levelC(int val);

sycl/test-e2e/DeviceImageDependencies/NewOffloadingDriver/Inputs/d.cpp

@@ -0,0 +1,11 @@
+#define D_EXPORT
+#include "d.hpp"
+#include <iostream>
+
+D_DECLSPEC SYCL_EXTERNAL int levelD(int val) {
+#ifndef __SYCL_DEVICE_ONLY__
+  std::cerr << "Host symbol used" << std::endl;
+  val ^= 0x4567;
+#endif
+  return val |= (0xD << 12);
+}