Skip to content

Commit 1cf3c31

Browse files
martygrantmartygrant
committed
Rerun generate target after applying suggestions from Github web ui. Move entry points from global ddi table to adapter.
Rename the callback function pointer to ur_logger_callback_t.
1 parent 025f7f4 commit 1cf3c31

31 files changed

+497
-248
lines changed

‎include/ur_api.h‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ typedef enum ur_function_t {
226226
UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP = 227, ///< Enumerator for ::urBindlessImagesImportExternalSemaphoreExp
227227
UR_FUNCTION_ENQUEUE_NATIVE_COMMAND_EXP = 228, ///< Enumerator for ::urEnqueueNativeCommandExp
228228
UR_FUNCTION_LOADER_CONFIG_SET_MOCKING_ENABLED = 229, ///< Enumerator for ::urLoaderConfigSetMockingEnabled
229-
UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP = 230, ///< Enumerator for ::urBindlessImagesReleaseExternalMemoryExp
230-
UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_LINEAR_MEMORY_EXP = 231, ///< Enumerator for ::urBindlessImagesMapExternalLinearMemoryExp
231-
UR_FUNCTION_SET_LOGGER_CALLBACK = 232, ///< Enumerator for ::urSetLoggerCallback
232-
UR_FUNCTION_SET_LOGGER_CALLBACK_LEVEL = 233, ///< Enumerator for ::urSetLoggerCallbackLevel
229+
UR_FUNCTION_ADAPTER_SET_LOGGER_CALLBACK = 230, ///< Enumerator for ::urAdapterSetLoggerCallback
230+
UR_FUNCTION_ADAPTER_SET_LOGGER_CALLBACK_LEVEL = 231, ///< Enumerator for ::urAdapterSetLoggerCallbackLevel
231+
UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_LINEAR_MEMORY_EXP = 232, ///< Enumerator for ::urBindlessImagesMapExternalLinearMemoryExp
232+
UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP = 233, ///< Enumerator for ::urBindlessImagesReleaseExternalMemoryExp
233233
/// @cond
234234
UR_FUNCTION_FORCE_UINT32 = 0x7fffffff
235235
/// @endcond
@@ -1031,7 +1031,7 @@ typedef enum ur_logger_level_t {
10311031

10321032
///////////////////////////////////////////////////////////////////////////////
10331033
/// @brief Callback function to retrieve output from the logger.
1034-
typedef void (*ur_logger_output_callback_t)(
1034+
typedef void (*ur_logger_callback_t)(
10351035
ur_logger_level_t level, ///< [out] Minimum level of messages to be processed by the logger.
10361036
const char *pLoggerMsg, ///< [in][out] pointer to data to be passed to callback
10371037
void *pUserData ///< [in][out] pointer to data to be passed to callback
@@ -1054,11 +1054,11 @@ typedef void (*ur_logger_output_callback_t)(
10541054
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
10551055
/// + `::UR_LOGGER_LEVEL_QUIET < level`
10561056
UR_APIEXPORT ur_result_t UR_APICALL
1057-
urSetLoggerCallback(
1058-
ur_adapter_handle_t hAdapter, ///< [in] handle of the adapter
1059-
ur_logger_output_callback_t pfnLoggerCallback, ///< [in] Function pointer to callback from the logger.
1060-
void *pUserData, ///< [in][out][optional] pointer to data to be passed to callback
1061-
ur_logger_level_t level ///< [in] logging level
1057+
urAdapterSetLoggerCallback(
1058+
ur_adapter_handle_t hAdapter, ///< [in] handle of the adapter
1059+
ur_logger_callback_t pfnLoggerCallback, ///< [in] Function pointer to callback from the logger.
1060+
void *pUserData, ///< [in][out][optional] pointer to data to be passed to callback
1061+
ur_logger_level_t level ///< [in] logging level
10621062
);
10631063

10641064
///////////////////////////////////////////////////////////////////////////////
@@ -1074,7 +1074,7 @@ urSetLoggerCallback(
10741074
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
10751075
/// + `::UR_LOGGER_LEVEL_QUIET < level`
10761076
UR_APIEXPORT ur_result_t UR_APICALL
1077-
urSetLoggerCallbackLevel(
1077+
urAdapterSetLoggerCallbackLevel(
10781078
ur_adapter_handle_t hAdapter, ///< [in] handle of the adapter
10791079
ur_logger_level_t level ///< [in] logging level
10801080
);
@@ -9807,6 +9807,26 @@ typedef struct ur_loader_config_set_mocking_enabled_params_t {
98079807
ur_bool_t *penable;
98089808
} ur_loader_config_set_mocking_enabled_params_t;
98099809

9810+
///////////////////////////////////////////////////////////////////////////////
9811+
/// @brief Function parameters for urAdapterSetLoggerCallback
9812+
/// @details Each entry is a pointer to the parameter passed to the function;
9813+
/// allowing the callback the ability to modify the parameter's value
9814+
typedef struct ur_adapter_set_logger_callback_params_t {
9815+
ur_adapter_handle_t *phAdapter;
9816+
ur_logger_callback_t *ppfnLoggerCallback;
9817+
void **ppUserData;
9818+
ur_logger_level_t *plevel;
9819+
} ur_adapter_set_logger_callback_params_t;
9820+
9821+
///////////////////////////////////////////////////////////////////////////////
9822+
/// @brief Function parameters for urAdapterSetLoggerCallbackLevel
9823+
/// @details Each entry is a pointer to the parameter passed to the function;
9824+
/// allowing the callback the ability to modify the parameter's value
9825+
typedef struct ur_adapter_set_logger_callback_level_params_t {
9826+
ur_adapter_handle_t *phAdapter;
9827+
ur_logger_level_t *plevel;
9828+
} ur_adapter_set_logger_callback_level_params_t;
9829+
98109830
///////////////////////////////////////////////////////////////////////////////
98119831
/// @brief Function parameters for urPlatformGet
98129832
/// @details Each entry is a pointer to the parameter passed to the function;
@@ -10717,26 +10737,6 @@ typedef struct ur_adapter_get_info_params_t {
1071710737
size_t **ppPropSizeRet;
1071810738
} ur_adapter_get_info_params_t;
1071910739

10720-
///////////////////////////////////////////////////////////////////////////////
10721-
/// @brief Function parameters for urSetLoggerCallback
10722-
/// @details Each entry is a pointer to the parameter passed to the function;
10723-
/// allowing the callback the ability to modify the parameter's value
10724-
typedef struct ur_set_logger_callback_params_t {
10725-
ur_adapter_handle_t *phAdapter;
10726-
ur_logger_output_callback_t *ppfnLoggerCallback;
10727-
void **ppUserData;
10728-
ur_logger_level_t *plevel;
10729-
} ur_set_logger_callback_params_t;
10730-
10731-
///////////////////////////////////////////////////////////////////////////////
10732-
/// @brief Function parameters for urSetLoggerCallbackLevel
10733-
/// @details Each entry is a pointer to the parameter passed to the function;
10734-
/// allowing the callback the ability to modify the parameter's value
10735-
typedef struct ur_set_logger_callback_level_params_t {
10736-
ur_adapter_handle_t *phAdapter;
10737-
ur_logger_level_t *plevel;
10738-
} ur_set_logger_callback_level_params_t;
10739-
1074010740
///////////////////////////////////////////////////////////////////////////////
1074110741
/// @brief Function parameters for urEnqueueKernelLaunch
1074210742
/// @details Each entry is a pointer to the parameter passed to the function;

‎include/ur_ddi.h‎

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,48 @@
2121
extern "C" {
2222
#endif
2323

24+
///////////////////////////////////////////////////////////////////////////////
25+
/// @brief Function-pointer for urAdapterSetLoggerCallback
26+
typedef ur_result_t(UR_APICALL *ur_pfnAdapterSetLoggerCallback_t)(
27+
ur_adapter_handle_t,
28+
ur_logger_callback_t,
29+
void *,
30+
ur_logger_level_t);
31+
32+
///////////////////////////////////////////////////////////////////////////////
33+
/// @brief Function-pointer for urAdapterSetLoggerCallbackLevel
34+
typedef ur_result_t(UR_APICALL *ur_pfnAdapterSetLoggerCallbackLevel_t)(
35+
ur_adapter_handle_t,
36+
ur_logger_level_t);
37+
38+
///////////////////////////////////////////////////////////////////////////////
39+
/// @brief Table of Adapter functions pointers
40+
typedef struct ur_adapter_dditable_t {
41+
ur_pfnAdapterSetLoggerCallback_t pfnSetLoggerCallback;
42+
ur_pfnAdapterSetLoggerCallbackLevel_t pfnSetLoggerCallbackLevel;
43+
} ur_adapter_dditable_t;
44+
45+
///////////////////////////////////////////////////////////////////////////////
46+
/// @brief Exported function for filling application's Adapter table
47+
/// with current process' addresses
48+
///
49+
/// @returns
50+
/// - ::UR_RESULT_SUCCESS
51+
/// - ::UR_RESULT_ERROR_UNINITIALIZED
52+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
53+
/// - ::UR_RESULT_ERROR_UNSUPPORTED_VERSION
54+
UR_DLLEXPORT ur_result_t UR_APICALL
55+
urGetAdapterProcAddrTable(
56+
ur_api_version_t version, ///< [in] API version requested
57+
ur_adapter_dditable_t *pDdiTable ///< [in,out] pointer to table of DDI function pointers
58+
);
59+
60+
///////////////////////////////////////////////////////////////////////////////
61+
/// @brief Function-pointer for urGetAdapterProcAddrTable
62+
typedef ur_result_t(UR_APICALL *ur_pfnGetAdapterProcAddrTable_t)(
63+
ur_api_version_t,
64+
ur_adapter_dditable_t *);
65+
2466
///////////////////////////////////////////////////////////////////////////////
2567
/// @brief Function-pointer for urPlatformGet
2668
typedef ur_result_t(UR_APICALL *ur_pfnPlatformGet_t)(
@@ -1038,20 +1080,6 @@ typedef ur_result_t(UR_APICALL *ur_pfnAdapterGetInfo_t)(
10381080
void *,
10391081
size_t *);
10401082

1041-
///////////////////////////////////////////////////////////////////////////////
1042-
/// @brief Function-pointer for urSetLoggerCallback
1043-
typedef ur_result_t(UR_APICALL *ur_pfnSetLoggerCallback_t)(
1044-
ur_adapter_handle_t,
1045-
ur_logger_output_callback_t,
1046-
void *,
1047-
ur_logger_level_t);
1048-
1049-
///////////////////////////////////////////////////////////////////////////////
1050-
/// @brief Function-pointer for urSetLoggerCallbackLevel
1051-
typedef ur_result_t(UR_APICALL *ur_pfnSetLoggerCallbackLevel_t)(
1052-
ur_adapter_handle_t,
1053-
ur_logger_level_t);
1054-
10551083
///////////////////////////////////////////////////////////////////////////////
10561084
/// @brief Table of Global functions pointers
10571085
typedef struct ur_global_dditable_t {
@@ -1060,8 +1088,6 @@ typedef struct ur_global_dditable_t {
10601088
ur_pfnAdapterRetain_t pfnAdapterRetain;
10611089
ur_pfnAdapterGetLastError_t pfnAdapterGetLastError;
10621090
ur_pfnAdapterGetInfo_t pfnAdapterGetInfo;
1063-
ur_pfnSetLoggerCallback_t pfnSetLoggerCallback;
1064-
ur_pfnSetLoggerCallbackLevel_t pfnSetLoggerCallbackLevel;
10651091
} ur_global_dditable_t;
10661092

10671093
///////////////////////////////////////////////////////////////////////////////
@@ -2438,6 +2464,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnGetDeviceProcAddrTable_t)(
24382464
///////////////////////////////////////////////////////////////////////////////
24392465
/// @brief Container for all DDI tables
24402466
typedef struct ur_dditable_t {
2467+
ur_adapter_dditable_t Adapter;
24412468
ur_platform_dditable_t Platform;
24422469
ur_context_dditable_t Context;
24432470
ur_event_dditable_t Event;

‎include/ur_print.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,22 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintLoaderConfigSetCodeLocationCallbackPa
11301130
/// - `buff_size < out_size`
11311131
UR_APIEXPORT ur_result_t UR_APICALL urPrintLoaderConfigSetMockingEnabledParams(const struct ur_loader_config_set_mocking_enabled_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
11321132

1133+
///////////////////////////////////////////////////////////////////////////////
1134+
/// @brief Print ur_adapter_set_logger_callback_params_t struct
1135+
/// @returns
1136+
/// - ::UR_RESULT_SUCCESS
1137+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1138+
/// - `buff_size < out_size`
1139+
UR_APIEXPORT ur_result_t UR_APICALL urPrintAdapterSetLoggerCallbackParams(const struct ur_adapter_set_logger_callback_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
1140+
1141+
///////////////////////////////////////////////////////////////////////////////
1142+
/// @brief Print ur_adapter_set_logger_callback_level_params_t struct
1143+
/// @returns
1144+
/// - ::UR_RESULT_SUCCESS
1145+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1146+
/// - `buff_size < out_size`
1147+
UR_APIEXPORT ur_result_t UR_APICALL urPrintAdapterSetLoggerCallbackLevelParams(const struct ur_adapter_set_logger_callback_level_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
1148+
11331149
///////////////////////////////////////////////////////////////////////////////
11341150
/// @brief Print ur_platform_get_params_t struct
11351151
/// @returns
@@ -1826,22 +1842,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintAdapterGetLastErrorParams(const struc
18261842
/// - `buff_size < out_size`
18271843
UR_APIEXPORT ur_result_t UR_APICALL urPrintAdapterGetInfoParams(const struct ur_adapter_get_info_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
18281844

1829-
///////////////////////////////////////////////////////////////////////////////
1830-
/// @brief Print ur_set_logger_callback_params_t struct
1831-
/// @returns
1832-
/// - ::UR_RESULT_SUCCESS
1833-
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1834-
/// - `buff_size < out_size`
1835-
UR_APIEXPORT ur_result_t UR_APICALL urPrintSetLoggerCallbackParams(const struct ur_set_logger_callback_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
1836-
1837-
///////////////////////////////////////////////////////////////////////////////
1838-
/// @brief Print ur_set_logger_callback_level_params_t struct
1839-
/// @returns
1840-
/// - ::UR_RESULT_SUCCESS
1841-
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1842-
/// - `buff_size < out_size`
1843-
UR_APIEXPORT ur_result_t UR_APICALL urPrintSetLoggerCallbackLevelParams(const struct ur_set_logger_callback_level_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
1844-
18451845
///////////////////////////////////////////////////////////////////////////////
18461846
/// @brief Print ur_enqueue_kernel_launch_params_t struct
18471847
/// @returns

0 commit comments

Comments
 (0)