From 9aec3e3c8d850fc6ef6164beee62807d0b132b9f Mon Sep 17 00:00:00 2001
From: Callum Fare <callum@codeplay.com>
Date: Tue, 30 Jul 2024 15:42:00 +0100
Subject: [PATCH] Fix UR program metadata initialization

---
 sycl/source/detail/device_binary_image.cpp             | 5 +++++
 sycl/source/detail/program_manager/program_manager.cpp | 5 ++---
 sycl/test-e2e/Basic/reqd_work_group_size.cpp           | 3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sycl/source/detail/device_binary_image.cpp b/sycl/source/detail/device_binary_image.cpp
index a1d89ed845da2..3f2dafc74a7f6 100644
--- a/sycl/source/detail/device_binary_image.cpp
+++ b/sycl/source/detail/device_binary_image.cpp
@@ -185,6 +185,11 @@ void RTDeviceBinaryImage::init(sycl_device_binary Bin) {
   HostPipes.init(Bin, __SYCL_PROPERTY_SET_SYCL_HOST_PIPES);
   VirtualFunctions.init(Bin, __SYCL_PROPERTY_SET_SYCL_VIRTUAL_FUNCTIONS);
 
+  for (const auto &Prop : ProgramMetadata) {
+    ProgramMetadataUR.push_back(
+        ur::mapDeviceBinaryPropertyToProgramMetadata(Prop));
+  }
+
   ImageId = ImageCounter++;
 }
 
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index ab0eb8a00f13a..40e1b35a9cd0c 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -500,10 +500,9 @@ std::pair<ur_program_handle_t, bool> ProgramManager::getOrCreateURProgram(
     // Get program metadata from properties
     std::vector<ur_program_metadata_t> ProgMetadataVector;
     for (const RTDeviceBinaryImage *Img : AllImages) {
-      auto ProgMetadata = Img->getProgramMetadata();
+      auto ProgMetadata = Img->getProgramMetadataUR();
       for (const auto &Prop : ProgMetadata) {
-        ProgMetadataVector.push_back(
-            ur::mapDeviceBinaryPropertyToProgramMetadata(Prop));
+        ProgMetadataVector.push_back(Prop);
       }
     }
     // TODO: Build for multiple devices once supported by program manager
diff --git a/sycl/test-e2e/Basic/reqd_work_group_size.cpp b/sycl/test-e2e/Basic/reqd_work_group_size.cpp
index f52ab51a4f8d4..d3fbe1621c757 100644
--- a/sycl/test-e2e/Basic/reqd_work_group_size.cpp
+++ b/sycl/test-e2e/Basic/reqd_work_group_size.cpp
@@ -1,9 +1,6 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// TODO: Reenable, see https://github.com/intel/llvm/issues/14598
-// UNSUPPORTED: linux, windows
-
 #include <sycl/detail/core.hpp>
 
 #include <iostream>