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.

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

Jump to bottom

Corrected negative results of clCreateSemaphoreWithPropertiesKHR #114

Merged
merged 6 commits into from
Jun 21, 2024
Merged

Corrected negative results of clCreateSemaphoreWithPropertiesKHR #114

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f21274
Added missing interface for CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR property
shajder Apr 9, 2024
7f8e614
approach to correct CI checks errors around semaphore emulation layer…
shajder May 6, 2024
b57878e
Corrections related to negative CTS tests of clCreateSemaphoreWithPro…
shajder May 6, 2024
e107dc6
corrections related to review #113
shajder May 21, 2024
214ccf1
Take into account additional property field
shajder Jun 3, 2024
ec19162
Merge branch 'main' into fix_semaphore_negative_create
bashbaug Jun 21, 2024
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
34 changes: 22 additions & 12 deletions layers/11_semaemu/emulate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,13 @@ typedef struct _cl_semaphore_khr

std::vector<cl_device_id> devices;

if( properties )
if ( properties == nullptr )
errorCode = CL_INVALID_VALUE;

if ( context == nullptr )
errorCode = CL_INVALID_CONTEXT;

if( errorCode == CL_SUCCESS && properties )
{
const cl_semaphore_properties_khr* check = properties;
bool found_CL_SEMAPHORE_TYPE_KHR = false;
Expand All @@ -85,7 +91,7 @@ typedef struct _cl_semaphore_khr
case CL_SEMAPHORE_TYPE_KHR:
if( found_CL_SEMAPHORE_TYPE_KHR )
{
errorCode = CL_INVALID_VALUE;
errorCode = CL_INVALID_PROPERTY;
}
else
{
Expand All @@ -97,7 +103,7 @@ typedef struct _cl_semaphore_khr
case CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR:
if( found_CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR )
{
errorCode = CL_INVALID_VALUE;
errorCode = CL_INVALID_PROPERTY;
}
else
{
Expand All @@ -112,12 +118,15 @@ typedef struct _cl_semaphore_khr
}
break;
default:
errorCode = CL_INVALID_VALUE;
errorCode = CL_INVALID_PROPERTY;
break;
}
}
numProperties = check - properties + 1;

if ( errorCode == CL_SUCCESS && type == ~0)
errorCode = CL_INVALID_VALUE;

// validate device handles.
if (!devices.empty()) {
// for now - if CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR is specified
Expand All @@ -139,16 +148,17 @@ typedef struct _cl_semaphore_khr
}
}
}
switch( type )
{
case CL_SEMAPHORE_TYPE_BINARY_KHR:

if (errorCode == CL_SUCCESS) {
switch (type) {
case CL_SEMAPHORE_TYPE_BINARY_KHR:
break;
default:
errorCode = CL_INVALID_VALUE;
default:
errorCode = CL_INVALID_PROPERTY;
}
}
if( errcode_ret )
{
errcode_ret[0] = errorCode;
if (errcode_ret) {
errcode_ret[0] = errorCode;
}
if( errorCode == CL_SUCCESS )
{
Expand Down