Skip to content

Fix UR program metadata initialization #14846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sycl/source/detail/device_binary_image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}

Expand Down
5 changes: 2 additions & 3 deletions sycl/source/detail/program_manager/program_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Basic/reqd_work_group_size.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading