[SYCL] Select a more consistent image ID for caching (#7154)

The program cache was recently changed to use the device image pointer
as part of its cache key. However, the `RTDeviceBinaryImage` class has
move constructor and assignment operator defined to allow them to
transition between collections, so the pointers can change, making them
an unreliable cache key. This commit changes the selected identifier to
be the pointer to the underlying binary image instead.

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/source/detail/device_binary_image.hpp

@@ -10,6 +10,7 @@
 #include <sycl/detail/os_util.hpp>
 #include <sycl/detail/pi.hpp>
 
+#include <atomic>
 #include <cstring>
 #include <memory>
 
@@ -220,6 +221,11 @@ class RTDeviceBinaryImage {
     return DeviceRequirements;
   }
 
+  std::uintptr_t getImageID() const {
+    assert(Bin && "Image ID is not available without a binary image.");
+    return reinterpret_cast<std::uintptr_t>(Bin);
+  }
+
 protected:
   void init(pi_device_binary Bin);
   pi_device_binary get() const { return Bin; }

sycl/source/detail/program_manager/program_manager.cpp

@@ -642,7 +642,7 @@ RT::PiProgram ProgramManager::getBuiltPIProgram(
 
   const RT::PiDevice PiDevice = Dev->getHandleRef();
 
-  std::uintptr_t ImgId = reinterpret_cast<uintptr_t>(&Img);
+  uint32_t ImgId = Img.getImageID();
   auto BuildResult = getOrBuild<PiProgramT, compile_program_error>(
       Cache,
       std::make_pair(std::make_pair(std::move(SpecConsts), ImgId),
@@ -1996,7 +1996,7 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
     return BuiltProgram.release();
   };
 
-  std::uintptr_t ImgId = reinterpret_cast<uintptr_t>(ImgPtr);
+  uint32_t ImgId = Img.getImageID();
   const RT::PiDevice PiDevice = getRawSyclObjImpl(Devs[0])->getHandleRef();
   // TODO: Throw SYCL2020 style exception
   auto BuildResult = getOrBuild<PiProgramT, compile_program_error>(