[SQUASH] Exculde invalid exec paths leading to flushSpecConstants, fix it.

Signed-off-by: Konstantin S Bobrovsky <[email protected]>

Author: kbobrovs

sycl/source/detail/program_impl.cpp

@@ -332,7 +332,6 @@ void program_impl::compile(const string_class &Options) {
   check_device_feature_support<info::device::is_compiler_available>(MDevices);
   vector_class<RT::PiDevice> Devices(get_pi_devices());
   const detail::plugin &Plugin = getPlugin();
-  ProgramManager::getInstance().flushSpecConstants(*this);
   RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramCompile>(
       MProgram, Devices.size(), Devices.data(), Options.c_str(), 0, nullptr,
       nullptr, nullptr, nullptr);

sycl/source/detail/program_manager/program_manager.cpp

@@ -960,37 +960,35 @@ void ProgramManager::flushSpecConstants(const program_impl &Prg,
     std::cerr << ">>> ProgramManager::flushSpecConstants(" << Prg.get()
               << ",...)\n";
   }
-  if (Img) {
+  pi::PiProgram PrgHandle = Prg.getHandleRef();
+  // program_impl can't correspond to two different native programs
+  assert(!NativePrg || !PrgHandle || (NativePrg == PrgHandle));
+  NativePrg = NativePrg ? NativePrg : PrgHandle;
+
+  if (!Img) {
+    // caller hasn't provided the image object - find it
+    { // make sure NativePrograms map access is synchronized
+      ContextImplPtr Ctx = getSyclObjImpl(Prg.get_context());
+      auto LockGuard = Ctx->getKernelProgramCache().acquireCachedPrograms();
+      auto It = NativePrograms.find(NativePrg);
+      if (It == NativePrograms.end()) {
+        if (DbgProgMgr > 0)
+          std::cerr << ">>> WARNING: flushSpecConstants requested on a "
+                       "program w/o known binary image\n";
+        return; // program origin is unknown
+      }
+      Img = It->second;
+    }
     if (!Img->supportsSpecConstants()) {
       if (DbgProgMgr > 0)
         std::cerr << ">>> ProgramManager::flushSpecConstants: binary image "
                   << &Img->getRawData() << " doesn't support spec constants\n";
+      // this device binary image does not support runtime setting of
+      // specialization constants; compiler must have generated default values
       return;
     }
-    Prg.flush_spec_constants(*Img, NativePrg);
-    return;
-  }
-  { // make sure NativePrograms map access is synchronized
-    ContextImplPtr Ctx = getSyclObjImpl(Prg.get_context());
-    auto LockGuard = Ctx->getKernelProgramCache().acquireCachedPrograms();
-    auto It = NativePrograms.find(pi::cast<pi::PiProgram>(Prg.get()));
-    if (It == NativePrograms.end()) {
-      if (DbgProgMgr > 0)
-        std::cerr << ">>> WARNING: flushSpecConstants requested on a "
-                     "program w/o known binary image\n";
-      return; // program origin is unknown
-    }
-    Img = It->second;
-  }
-  if (!Img->supportsSpecConstants()) {
-    if (DbgProgMgr > 0)
-      std::cerr << ">>> ProgramManager::flushSpecConstants: binary image "
-                << &Img->getRawData() << " doesn't support spec constants\n";
-    // this device binary image does not support runtime setting of
-    // specialization constants; compiler must have generated default values
-    return;
   }
-  Prg.flush_spec_constants(*Img);
+  Prg.flush_spec_constants(*Img, NativePrg);
 }
 
 } // namespace detail

sycl/test/spec_const/spec_const_hw.cpp

@@ -73,7 +73,9 @@ int main(int argc, char **argv) {
       program2.set_spec_constant<MyFloatConst>(goldf);
 
   program1.build_with_kernel_type<KernelAAAi>();
-  program2.build_with_kernel_type<KernelBBBf>();
+  // Use an option (does not matter which exactly) to test different internal
+  // SYCL RT execution path
+  program2.build_with_kernel_type<KernelBBBf>("-cl-fast-relaxed-math");
 
   std::vector<int> veci(1);
   std::vector<float> vecf(1);