[SYCL] Fix link and compile options (#5741)

Author: maximdimakov

sycl/source/detail/program_manager/program_manager.cpp

@@ -417,22 +417,32 @@ static void applyOptionsFromImage(std::string &CompileOpts,
   appendLinkOptionsFromImage(LinkOpts, Img);
 }
 
-static void applyOptionsFromEnvironment(std::string &CompileOpts,
-                                        std::string &LinkOpts) {
-  // Build options are overridden if environment variables are present.
+static void applyCompileOptionsFromEnvironment(std::string &CompileOpts) {
   // Environment variables are not changed during program lifecycle so it
   // is reasonable to use static here to read them only once.
   static const char *CompileOptsEnv =
       SYCLConfig<SYCL_PROGRAM_COMPILE_OPTIONS>::get();
   if (CompileOptsEnv) {
     CompileOpts = CompileOptsEnv;
   }
+}
+
+static void applyLinkOptionsFromEnvironment(std::string &LinkOpts) {
+  // Environment variables are not changed during program lifecycle so it
+  // is reasonable to use static here to read them only once.
   static const char *LinkOptsEnv = SYCLConfig<SYCL_PROGRAM_LINK_OPTIONS>::get();
   if (LinkOptsEnv) {
     LinkOpts = LinkOptsEnv;
   }
 }
 
+static void applyOptionsFromEnvironment(std::string &CompileOpts,
+                                        std::string &LinkOpts) {
+  // Build options are overridden if environment variables are present.
+  applyCompileOptionsFromEnvironment(CompileOpts);
+  applyLinkOptionsFromEnvironment(LinkOpts);
+}
+
 std::pair<RT::PiProgram, bool> ProgramManager::getOrCreatePIProgram(
     const RTDeviceBinaryImage &Img, const context &Context,
     const device &Device, const std::string &CompileAndLinkOptions,
@@ -1695,6 +1705,7 @@ ProgramManager::compile(const device_image_plain &DeviceImage,
 
   // TODO: Handle zero sized Device list.
   std::string CompileOptions;
+  applyCompileOptionsFromEnvironment(CompileOptions);
   appendCompileOptionsFromImage(CompileOptions,
                                 *(InputImpl->get_bin_image_ref()));
   RT::PiResult Error = Plugin.call_nocheck<PiApiKind::piProgramCompile>(
@@ -1729,11 +1740,14 @@ ProgramManager::link(const std::vector<device_image_plain> &DeviceImages,
     PIDevices.push_back(getSyclObjImpl(Dev)->getHandleRef());
 
   std::string LinkOptionsStr;
-  for (const device_image_plain &DeviceImage : DeviceImages) {
-    const std::shared_ptr<device_image_impl> &InputImpl =
-        getSyclObjImpl(DeviceImage);
-    appendLinkOptionsFromImage(LinkOptionsStr,
-                               *(InputImpl->get_bin_image_ref()));
+  applyLinkOptionsFromEnvironment(LinkOptionsStr);
+  if (LinkOptionsStr.empty()) {
+    for (const device_image_plain &DeviceImage : DeviceImages) {
+      const std::shared_ptr<device_image_impl> &InputImpl =
+          getSyclObjImpl(DeviceImage);
+      appendLinkOptionsFromImage(LinkOptionsStr,
+                                 *(InputImpl->get_bin_image_ref()));
+    }
   }
   const context &Context = getSyclObjImpl(DeviceImages[0])->get_context();
   const ContextImplPtr ContextImpl = getSyclObjImpl(Context);