Skip to content

Commit 66b1548

Browse files
committed
Revert "Add generated code"
This reverts commit 6995ac9.
1 parent 6995ac9 commit 66b1548

4 files changed

Lines changed: 59 additions & 37 deletions

File tree

unified-runtime/include/unified-runtime/ur_api.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2228,9 +2228,9 @@ typedef enum ur_device_info_t {
22282228
UR_DEVICE_INFO_COMPILER_AVAILABLE = 57,
22292229
/// [::ur_bool_t] device linker is available
22302230
UR_DEVICE_INFO_LINKER_AVAILABLE = 58,
2231-
/// [::ur_device_exec_capability_flags_t][deprecated-value] device kernel
2232-
/// execution capability bit-field
2233-
UR_DEVICE_INFO_EXECUTION_CAPABILITIES [[deprecated]] = 59,
2231+
/// [::ur_device_exec_capability_flags_t] device kernel execution
2232+
/// capability bit-field
2233+
UR_DEVICE_INFO_EXECUTION_CAPABILITIES = 59,
22342234
/// [::ur_queue_flags_t] device command queue property bit-field
22352235
UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES = 60,
22362236
/// [::ur_queue_flags_t] host queue property bit-field

unified-runtime/include/unified-runtime/ur_print.hpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3043,6 +3043,9 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
30433043
case UR_DEVICE_INFO_LINKER_AVAILABLE:
30443044
os << "UR_DEVICE_INFO_LINKER_AVAILABLE";
30453045
break;
3046+
case UR_DEVICE_INFO_EXECUTION_CAPABILITIES:
3047+
os << "UR_DEVICE_INFO_EXECUTION_CAPABILITIES";
3048+
break;
30463049
case UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES:
30473050
os << "UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES";
30483051
break;
@@ -4229,6 +4232,21 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr,
42294232

42304233
os << ")";
42314234
} break;
4235+
case UR_DEVICE_INFO_EXECUTION_CAPABILITIES: {
4236+
const ur_device_exec_capability_flags_t *tptr =
4237+
(const ur_device_exec_capability_flags_t *)ptr;
4238+
if (sizeof(ur_device_exec_capability_flags_t) > size) {
4239+
os << "invalid size (is: " << size
4240+
<< ", expected: >=" << sizeof(ur_device_exec_capability_flags_t)
4241+
<< ")";
4242+
return UR_RESULT_ERROR_INVALID_SIZE;
4243+
}
4244+
os << (const void *)(tptr) << " (";
4245+
4246+
ur::details::printFlag<ur_device_exec_capability_flag_t>(os, *tptr);
4247+
4248+
os << ")";
4249+
} break;
42324250
case UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES: {
42334251
const ur_queue_flags_t *tptr = (const ur_queue_flags_t *)ptr;
42344252
if (sizeof(ur_queue_flags_t) > size) {

unified-runtime/source/adapters/opencl/common.hpp

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -362,51 +362,51 @@ CONSTFIX char GetKernelSubGroupInfoName[] = "clGetKernelSubGroupInfoKHR";
362362
#undef CONSTFIX
363363

364364
using clGetDeviceFunctionPointerINTEL_fn = CL_API_ENTRY
365-
cl_int(CL_API_CALL *)(cl_device_id device, cl_program program,
366-
const char *FuncName, cl_ulong *ret_ptr);
365+
cl_int(CL_API_CALL *)(cl_device_id device, cl_program program,
366+
const char *FuncName, cl_ulong *ret_ptr);
367367

368368
using clGetDeviceGlobalVariablePointerINTEL_fn = CL_API_ENTRY
369-
cl_int(CL_API_CALL *)(cl_device_id device, cl_program program,
370-
const char *globalVariableName,
371-
size_t *globalVariableSizeRet,
372-
void **globalVariablePointerRet);
369+
cl_int(CL_API_CALL *)(cl_device_id device, cl_program program,
370+
const char *globalVariableName,
371+
size_t *globalVariableSizeRet,
372+
void **globalVariablePointerRet);
373373

374374
using clEnqueueWriteGlobalVariableINTEL_fn = CL_API_ENTRY
375-
cl_int(CL_API_CALL *)(cl_command_queue, cl_program, const char *, cl_bool,
376-
size_t, size_t, const void *, cl_uint, const cl_event *,
377-
cl_event *);
375+
cl_int(CL_API_CALL *)(cl_command_queue, cl_program, const char *, cl_bool,
376+
size_t, size_t, const void *, cl_uint,
377+
const cl_event *, cl_event *);
378378

379379
using clEnqueueReadGlobalVariableINTEL_fn = CL_API_ENTRY
380-
cl_int(CL_API_CALL *)(cl_command_queue, cl_program, const char *, cl_bool,
381-
size_t, size_t, void *, cl_uint, const cl_event *,
382-
cl_event *);
380+
cl_int(CL_API_CALL *)(cl_command_queue, cl_program, const char *, cl_bool,
381+
size_t, size_t, void *, cl_uint, const cl_event *,
382+
cl_event *);
383383

384384
using clEnqueueReadHostPipeINTEL_fn = CL_API_ENTRY
385-
cl_int(CL_API_CALL *)(cl_command_queue queue, cl_program program,
386-
const char *pipe_symbol, cl_bool blocking, void *ptr,
387-
size_t size, cl_uint num_events_in_waitlist,
388-
const cl_event *events_waitlist, cl_event *event);
385+
cl_int(CL_API_CALL *)(cl_command_queue queue, cl_program program,
386+
const char *pipe_symbol, cl_bool blocking, void *ptr,
387+
size_t size, cl_uint num_events_in_waitlist,
388+
const cl_event *events_waitlist, cl_event *event);
389389

390390
using clEnqueueWriteHostPipeINTEL_fn = CL_API_ENTRY
391-
cl_int(CL_API_CALL *)(cl_command_queue queue, cl_program program,
392-
const char *pipe_symbol, cl_bool blocking,
393-
const void *ptr, size_t size,
394-
cl_uint num_events_in_waitlist,
395-
const cl_event *events_waitlist, cl_event *event);
391+
cl_int(CL_API_CALL *)(cl_command_queue queue, cl_program program,
392+
const char *pipe_symbol, cl_bool blocking,
393+
const void *ptr, size_t size,
394+
cl_uint num_events_in_waitlist,
395+
const cl_event *events_waitlist, cl_event *event);
396396

397397
using clCreateCommandBufferKHR_fn = CL_API_ENTRY cl_command_buffer_khr(
398398
CL_API_CALL *)(cl_uint num_queues, const cl_command_queue *queues,
399399
const cl_command_buffer_properties_khr *properties,
400400
cl_int *errcode_ret);
401401

402402
using clRetainCommandBufferKHR_fn = CL_API_ENTRY
403-
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
403+
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
404404

405405
using clReleaseCommandBufferKHR_fn = CL_API_ENTRY
406-
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
406+
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
407407

408408
using clFinalizeCommandBufferKHR_fn = CL_API_ENTRY
409-
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
409+
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer);
410410

411411
using clCommandNDRangeKernelKHR_fn = CL_API_ENTRY cl_int(CL_API_CALL *)(
412412
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
@@ -466,26 +466,27 @@ using clCommandSVMMemFillKHR_fn = CL_API_ENTRY cl_int(CL_API_CALL *)(
466466
cl_sync_point_khr *sync_point, cl_mutable_command_khr *mutable_handle);
467467

468468
using clEnqueueCommandBufferKHR_fn = CL_API_ENTRY
469-
cl_int(CL_API_CALL *)(cl_uint num_queues, cl_command_queue *queues,
470-
cl_command_buffer_khr command_buffer,
471-
cl_uint num_events_in_wait_list,
472-
const cl_event *event_wait_list, cl_event *event);
469+
cl_int(CL_API_CALL *)(cl_uint num_queues, cl_command_queue *queues,
470+
cl_command_buffer_khr command_buffer,
471+
cl_uint num_events_in_wait_list,
472+
const cl_event *event_wait_list, cl_event *event);
473473

474474
using clGetCommandBufferInfoKHR_fn = CL_API_ENTRY cl_int(CL_API_CALL *)(
475475
cl_command_buffer_khr command_buffer, cl_command_buffer_info_khr param_name,
476476
size_t param_value_size, void *param_value, size_t *param_value_size_ret);
477477

478478
using clUpdateMutableCommandsKHR_fn = CL_API_ENTRY
479-
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer, cl_uint num_configs,
480-
const cl_command_buffer_update_type_khr *config_types,
481-
const void **configs);
479+
cl_int(CL_API_CALL *)(cl_command_buffer_khr command_buffer,
480+
cl_uint num_configs,
481+
const cl_command_buffer_update_type_khr *config_types,
482+
const void **configs);
482483

483484
using clCreateProgramWithILKHR_fn = CL_API_ENTRY
484-
cl_program(CL_API_CALL *)(cl_context, const void *, size_t, cl_int *);
485+
cl_program(CL_API_CALL *)(cl_context, const void *, size_t, cl_int *);
485486

486487
using clGetKernelSubGroupInfoKHR_fn = CL_API_ENTRY
487-
cl_int(CL_API_CALL *)(cl_kernel, cl_device_id, cl_kernel_sub_group_info, size_t,
488-
const void *, size_t, void *, size_t *);
488+
cl_int(CL_API_CALL *)(cl_kernel, cl_device_id, cl_kernel_sub_group_info,
489+
size_t, const void *, size_t, void *, size_t *);
489490

490491
template <typename T> struct FuncPtrCache {
491492
std::map<cl_context, T> Map;

unified-runtime/tools/urinfo/urinfo.hpp

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)