Skip to content
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

[UR] Fix size confusion for several device property queries #12488

Merged
merged 4 commits into from
Jun 12, 2024
Merged
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
12 changes: 6 additions & 6 deletions sycl/plugins/unified_runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit 4f105262c30ac231b8db1e250f36e88ef9f0a36d
# Merge: 0f118d75 92fce2ee
# commit 4f13cd14bdd86f0cce4a19e00bf63eb7230e6369
# Merge: 4f105262 2c3096a3
# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
# Date: Mon Jun 10 13:23:16 2024 +0100
# Merge pull request #1409 from omarahmed1111/Add-CTS-tests-for-image-format
# [CTS] Add CTS tests for urMemImageCreate entry-point
set(UNIFIED_RUNTIME_TAG 4f105262c30ac231b8db1e250f36e88ef9f0a36d)
# Date: Mon Jun 10 16:02:26 2024 +0100
# Merge pull request #1282 from al42and/fix-sub-group-size-info
# Fix size confusion for several device property queries
set(UNIFIED_RUNTIME_TAG 4f13cd14bdd86f0cce4a19e00bf63eb7230e6369)

fetch_adapter_source(level_zero
${UNIFIED_RUNTIME_REPO}
Expand Down
10 changes: 8 additions & 2 deletions sycl/source/detail/device_info.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,16 @@ struct get_device_info_impl<std::vector<size_t>,
Dev->getHandleRef(), PiInfoCode<info::device::sub_group_sizes>::value,
0, nullptr, &resultSize);

std::vector<size_t> result(resultSize / sizeof(size_t));
std::vector<uint32_t> result32(resultSize / sizeof(uint32_t));
Dev->getPlugin()->call<PiApiKind::piDeviceGetInfo>(
Dev->getHandleRef(), PiInfoCode<info::device::sub_group_sizes>::value,
resultSize, result.data(), nullptr);
resultSize, result32.data(), nullptr);

std::vector<size_t> result;
result.reserve(result32.size());
for (uint32_t value : result32) {
result.push_back(value);
}
return result;
}
};
Expand Down
Loading