Skip to content

[UR] Fixed bug with zero depth ur_rect_region which must be checked before calling func #17681

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 17, 2025
Merged

[UR] Fixed bug with zero depth ur_rect_region which must be checked before calling func #17681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc651d
[UR] Fixed bug with zero depth rect_region which must be checked before
GermanAizek Mar 29, 2025
a5c01c8
Merge branch 'sycl' into fix
npmiller Apr 16, 2025
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
4 changes: 2 additions & 2 deletions unified-runtime/include/ur_api.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions unified-runtime/scripts/core/enqueue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ returns:
- "An event in `phEventWaitList` has $X_EVENT_STATUS_ERROR."
- $X_RESULT_ERROR_INVALID_MEM_OBJECT
- $X_RESULT_ERROR_INVALID_SIZE:
- "`region.width == 0 || region.height == 0 || region.width == 0`"
- "`region.width == 0 || region.height == 0 || region.depth == 0`"
- "`bufferRowPitch != 0 && bufferRowPitch < region.width`"
- "`hostRowPitch != 0 && hostRowPitch < region.width`"
- "`bufferSlicePitch != 0 && bufferSlicePitch < region.height * (bufferRowPitch != 0 ? bufferRowPitch : region.width)`"
Expand Down Expand Up @@ -406,7 +406,7 @@ returns:
- "An event in `phEventWaitList` has $X_EVENT_STATUS_ERROR."
- $X_RESULT_ERROR_INVALID_MEM_OBJECT
- $X_RESULT_ERROR_INVALID_SIZE:
- "`region.width == 0 || region.height == 0 || region.width == 0`"
- "`region.width == 0 || region.height == 0 || region.depth == 0`"
- "`bufferRowPitch != 0 && bufferRowPitch < region.width`"
- "`hostRowPitch != 0 && hostRowPitch < region.width`"
- "`bufferSlicePitch != 0 && bufferSlicePitch < region.height * (bufferRowPitch != 0 ? bufferRowPitch : region.width)`"
Expand Down
2 changes: 1 addition & 1 deletion unified-runtime/source/adapters/hip/enqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferReadRect(
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);
UR_ASSERT(!(phEventWaitList != NULL && numEventsInWaitList == 0),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);
UR_ASSERT(!(region.width == 0 || region.height == 0 || region.width == 0),
UR_ASSERT(!(region.width == 0 || region.height == 0 || region.depth == 0),
UR_RESULT_ERROR_INVALID_SIZE);
UR_ASSERT(!(bufferRowPitch != 0 && bufferRowPitch < region.width),
UR_RESULT_ERROR_INVALID_SIZE);
Expand Down
4 changes: 2 additions & 2 deletions unified-runtime/source/loader/layers/validation/ur_valddi.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions unified-runtime/source/loader/ur_libapi.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions unified-runtime/source/ur_api.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ TEST_P(urEnqueueMemBufferCopyRectTest, InvalidNullPtrEventWaitList) {
TEST_P(urEnqueueMemBufferCopyRectTest, InvalidSize) {
UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});

// region.width == 0 || region.height == 0 || region.width == 0
// region.width == 0 || region.height == 0 || region.depth == 0
src_region.width = 0;
ASSERT_EQ_RESULT(urEnqueueMemBufferCopyRect(
queue, src_buffer, dst_buffer, src_origin, dst_origin,
Expand Down
2 changes: 1 addition & 1 deletion unified-runtime/test/conformance/enqueue/urEnqueueMemBufferReadRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ TEST_P(urEnqueueMemBufferReadRectTest, InvalidSize) {

std::vector<uint32_t> dst(count);

// region.width == 0 || region.height == 0 || region.width == 0
// region.width == 0 || region.height == 0 || region.depth == 0
region.width = 0;
ASSERT_EQ_RESULT(urEnqueueMemBufferReadRect(
queue, buffer, true, buffer_offset, host_offset, region,
Expand Down
2 changes: 1 addition & 1 deletion unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ TEST_P(urEnqueueMemBufferWriteRectTest, InvalidSize) {
std::vector<uint32_t> src(count);
std::fill(src.begin(), src.end(), 1);

// region.width == 0 || region.height == 0 || region.width == 0
// region.width == 0 || region.height == 0 || region.depth == 0
region.width = 0;
ASSERT_EQ_RESULT(urEnqueueMemBufferWriteRect(
queue, buffer, true, buffer_offset, host_offset, region,
Expand Down
Loading