Skip to content

initial support for cl_ext_buffer_device_address #405

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
bashbaug merged 2 commits into from
Mar 3, 2025
Merged

initial support for cl_ext_buffer_device_address #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9340906
initial support for cl_ext_buffer_device_address
bashbaug Jan 27, 2025
bbd2408
fix clSetKernelArgDevicePointerEXT signature
bashbaug Jan 29, 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
15 changes: 15 additions & 0 deletions intercept/src/cli_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,21 @@ cl_int CL_API_CALL clGetKernelSuggestedLocalWorkSizeKHR(

#define CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT 0x4032

///////////////////////////////////////////////////////////////////////////////
// cl_ext_buffer_device_address

typedef cl_ulong cl_mem_device_address_ext;

extern CL_API_ENTRY
cl_int CL_API_CALL clSetKernelArgDevicePointerEXT(
cl_kernel kernel,
cl_uint arg_index,
cl_mem_device_address_ext arg_value);

#define CL_MEM_DEVICE_PRIVATE_ADDRESS_EXT 0x5000
#define CL_MEM_DEVICE_ADDRESS_EXT 0x5001
#define CL_KERNEL_EXEC_INFO_DEVICE_PTRS_EXT 0x5002

///////////////////////////////////////////////////////////////////////////////
// cl_ext_cxx_for_opencl

Expand Down
40 changes: 40 additions & 0 deletions intercept/src/dispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8913,6 +8913,46 @@ CL_API_ENTRY cl_int CL_API_CALL clGetKernelSuggestedLocalWorkSizeKHR(
NULL_FUNCTION_POINTER_RETURN_ERROR(CL_INVALID_COMMAND_QUEUE);
}

///////////////////////////////////////////////////////////////////////////////
//
// cl_ext_buffer_device_address
CL_API_ENTRY cl_int CL_API_CALL clSetKernelArgDevicePointerEXT(
cl_kernel kernel,
cl_uint arg_index,
cl_mem_device_address_ext arg_value)
{
CLIntercept* pIntercept = GetIntercept();

if( pIntercept )
{
const auto& dispatchX = pIntercept->dispatchX(kernel);
if( dispatchX.clSetKernelArgDevicePointerEXT )
{
GET_ENQUEUE_COUNTER();
CALL_LOGGING_ENTER_KERNEL(
kernel,
"kernel = %p, index = %u, value = %" PRIx64,
kernel,
arg_index,
arg_value );
HOST_PERFORMANCE_TIMING_START();

cl_int retVal = dispatchX.clSetKernelArgDevicePointerEXT(
kernel,
arg_index,
arg_value );

HOST_PERFORMANCE_TIMING_END();
CHECK_ERROR( retVal );
CALL_LOGGING_EXIT( retVal );

return retVal;
}
}

NULL_FUNCTION_POINTER_RETURN_ERROR(CL_INVALID_KERNEL);
}

///////////////////////////////////////////////////////////////////////////////
//
// cl_ext_image_requirements_info
Expand Down
6 changes: 6 additions & 0 deletions intercept/src/dispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,12 @@ struct CLdispatchX
const size_t* global_work_size,
size_t* suggested_local_work_size);

// cl_ext_buffer_device_address
cl_int (CL_API_CALL *clSetKernelArgDevicePointerEXT) (
cl_kernel kernel,
cl_uint arg_index,
cl_mem_device_address_ext arg_value);

// cl_ext_image_requirements_info
cl_int (CL_API_CALL *clGetImageRequirementsInfoEXT) (
cl_context context,
Expand Down
5 changes: 5 additions & 0 deletions intercept/src/enummap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,11 @@ CEnumNameMap::CEnumNameMap()
// cl_ext_atomic_counters
ADD_ENUM_NAME( m_cl_int, CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT );

// cl_ext_buffer_device_address
ADD_ENUM_NAME( m_cl_int, CL_MEM_DEVICE_PRIVATE_ADDRESS_EXT );
ADD_ENUM_NAME( m_cl_int, CL_MEM_DEVICE_ADDRESS_EXT );
ADD_ENUM_NAME( m_cl_int, CL_KERNEL_EXEC_INFO_DEVICE_PTRS_EXT );

// cl_ext_cxx_for_opencl
ADD_ENUM_NAME( m_cl_int, CL_DEVICE_CXX_FOR_OPENCL_NUMERIC_VERSION_EXT );

Expand Down
11 changes: 11 additions & 0 deletions intercept/src/intercept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2444,6 +2444,14 @@ void CLIntercept::getMemPropertiesString(
properties += 2;
}
break;
case CL_MEM_DEVICE_PRIVATE_ADDRESS_EXT:
{
auto pb = (const cl_bool*)( properties + 1 );
cl_bool value = pb[0];
str += enumName().name_bool( value );
properties += 2;
}
break;
default:
{
CLI_SPRINTF( s, 256, "<Unknown %08X!>", (cl_uint)property );
Expand Down Expand Up @@ -13177,6 +13185,9 @@ void* CLIntercept::getExtensionFunctionAddress(
// cl_khr_suggested_local_work_size
CHECK_RETURN_EXTENSION_FUNCTION( clGetKernelSuggestedLocalWorkSizeKHR );

// cl_ext_buffer_device_address
CHECK_RETURN_EXTENSION_FUNCTION( clSetKernelArgDevicePointerEXT );

// cl_ext_image_requirements_info
CHECK_RETURN_EXTENSION_FUNCTION( clGetImageRequirementsInfoEXT );

Expand Down