Skip to content

Commit 8c4366f

Browse files
npmillernpmiller
committed
Fix formatting
1 parent 2f5ff27 commit 8c4366f

File tree

8 files changed

+81
-25
lines changed

8 files changed

+81
-25
lines changed

‎include/ur_api.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ typedef enum ur_function_t {
215215
UR_FUNCTION_ENQUEUE_NATIVE_COMMAND_EXP = 228, ///< Enumerator for ::urEnqueueNativeCommandExp
216216
UR_FUNCTION_LOADER_CONFIG_SET_MOCKING_ENABLED = 229, ///< Enumerator for ::urLoaderConfigSetMockingEnabled
217217
UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP = 230, ///< Enumerator for ::urBindlessImagesReleaseExternalMemoryExp
218+
UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP = 230, ///< Enumerator for ::urTensorMapEncodeIm2ColExp
218219
UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_MEMCPY_EXP = 231, ///< Enumerator for ::urCommandBufferAppendUSMMemcpyExp
220+
UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP = 231, ///< Enumerator for ::urTensorMapEncodeTiledExp
219221
UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_FILL_EXP = 232, ///< Enumerator for ::urCommandBufferAppendUSMFillExp
220222
UR_FUNCTION_COMMAND_BUFFER_APPEND_MEM_BUFFER_COPY_EXP = 233, ///< Enumerator for ::urCommandBufferAppendMemBufferCopyExp
221223
UR_FUNCTION_COMMAND_BUFFER_APPEND_MEM_BUFFER_WRITE_EXP = 234, ///< Enumerator for ::urCommandBufferAppendMemBufferWriteExp
@@ -231,8 +233,6 @@ typedef enum ur_function_t {
231233
UR_FUNCTION_COMMAND_BUFFER_UPDATE_WAIT_EVENTS_EXP = 244, ///< Enumerator for ::urCommandBufferUpdateWaitEventsExp
232234
UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_LINEAR_MEMORY_EXP = 245, ///< Enumerator for ::urBindlessImagesMapExternalLinearMemoryExp
233235
UR_FUNCTION_ENQUEUE_EVENTS_WAIT_WITH_BARRIER_EXT = 246, ///< Enumerator for ::urEnqueueEventsWaitWithBarrierExt
234-
UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP = 247, ///< Enumerator for ::urTensorMapEncodeIm2ColExp
235-
UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP = 248, ///< Enumerator for ::urTensorMapEncodeTiledExp
236236
/// @cond
237237
UR_FUNCTION_FORCE_UINT32 = 0x7fffffff
238238
/// @endcond
@@ -10168,7 +10168,7 @@ urEnqueueNativeCommandExp(
1016810168
#endif
1016910169
// Intel 'oneAPI' Unified Runtime Experimental API for mapping tensor objects
1017010170
#if !defined(__GNUC__)
10171-
#pragma region tensor map(experimental)
10171+
#pragma region tensor_map_(experimental)
1017210172
#endif
1017310173
///////////////////////////////////////////////////////////////////////////////
1017410174
/// @brief Handle of tensor map object

‎include/ur_api_funcs.def‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ _UR_API(urCommandBufferUpdateSignalEventExp)
185185
_UR_API(urCommandBufferUpdateWaitEventsExp)
186186
_UR_API(urCommandBufferGetInfoExp)
187187
_UR_API(urCommandBufferCommandGetInfoExp)
188+
_UR_API(urTensorMapEncodeIm2ColExp)
189+
_UR_API(urTensorMapEncodeTiledExp)
188190
_UR_API(urUsmP2PEnablePeerAccessExp)
189191
_UR_API(urUsmP2PDisablePeerAccessExp)
190192
_UR_API(urUsmP2PPeerAccessGetInfoExp)

‎include/ur_print.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,15 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
940940
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP:
941941
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP";
942942
break;
943+
case UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP:
944+
os << "UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP";
945+
break;
943946
case UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_MEMCPY_EXP:
944947
os << "UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_MEMCPY_EXP";
945948
break;
949+
case UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP:
950+
os << "UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP";
951+
break;
946952
case UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_FILL_EXP:
947953
os << "UR_FUNCTION_COMMAND_BUFFER_APPEND_USM_FILL_EXP";
948954
break;
@@ -988,12 +994,6 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
988994
case UR_FUNCTION_ENQUEUE_EVENTS_WAIT_WITH_BARRIER_EXT:
989995
os << "UR_FUNCTION_ENQUEUE_EVENTS_WAIT_WITH_BARRIER_EXT";
990996
break;
991-
case UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP:
992-
os << "UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP";
993-
break;
994-
case UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP:
995-
os << "UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP";
996-
break;
997997
default:
998998
os << "unknown enumerator";
999999
break;

‎scripts/core/registry.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,15 @@ etors:
559559
- name: BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP
560560
desc: Enumerator for $xBindlessImagesReleaseExternalMemoryExp
561561
value: '230'
562+
- name: TENSOR_MAP_ENCODE_IM_2_COL_EXP
563+
desc: Enumerator for $xTensorMapEncodeIm2ColExp
564+
value: '230'
562565
- name: COMMAND_BUFFER_APPEND_USM_MEMCPY_EXP
563566
desc: Enumerator for $xCommandBufferAppendUSMMemcpyExp
564567
value: '231'
568+
- name: TENSOR_MAP_ENCODE_TILED_EXP
569+
desc: Enumerator for $xTensorMapEncodeTiledExp
570+
value: '231'
565571
- name: COMMAND_BUFFER_APPEND_USM_FILL_EXP
566572
desc: Enumerator for $xCommandBufferAppendUSMFillExp
567573
value: '232'
@@ -607,12 +613,6 @@ etors:
607613
- name: ENQUEUE_EVENTS_WAIT_WITH_BARRIER_EXT
608614
desc: Enumerator for $xEnqueueEventsWaitWithBarrierExt
609615
value: '246'
610-
- name: TENSOR_MAP_ENCODE_IM_2_COL_EXP
611-
desc: Enumerator for $xTensorMapEncodeIm2ColExp
612-
value: '230'
613-
- name: TENSOR_MAP_ENCODE_TILED_EXP
614-
desc: Enumerator for $xTensorMapEncodeTiledExp
615-
value: '231'
616616
---
617617
type: enum
618618
desc: Defines structure types

‎source/adapters/level_zero/ur_interface_loader.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urGetSamplerProcAddrTable(
423423
return result;
424424
}
425425

426+
UR_APIEXPORT ur_result_t UR_APICALL urGetTensorMapExpProcAddrTable(
427+
ur_api_version_t version, ur_tensor_map_exp_dditable_t *pDdiTable) {
428+
auto result = validateProcInputs(version, pDdiTable);
429+
if (UR_RESULT_SUCCESS != result) {
430+
return result;
431+
}
432+
433+
pDdiTable->pfnEncodeIm2ColExp = ur::level_zero::urTensorMapEncodeIm2ColExp;
434+
pDdiTable->pfnEncodeTiledExp = ur::level_zero::urTensorMapEncodeTiledExp;
435+
436+
return result;
437+
}
438+
426439
UR_APIEXPORT ur_result_t UR_APICALL
427440
urGetUSMProcAddrTable(ur_api_version_t version, ur_usm_dditable_t *pDdiTable) {
428441
auto result = validateProcInputs(version, pDdiTable);
@@ -594,6 +607,10 @@ ur_result_t urAdapterGetDdiTables(ur_dditable_t *ddi) {
594607
&ddi->Sampler);
595608
if (result != UR_RESULT_SUCCESS)
596609
return result;
610+
result = ur::level_zero::urGetTensorMapExpProcAddrTable(
611+
UR_API_VERSION_CURRENT, &ddi->TensorMapExp);
612+
if (result != UR_RESULT_SUCCESS)
613+
return result;
597614
result =
598615
ur::level_zero::urGetUSMProcAddrTable(UR_API_VERSION_CURRENT, &ddi->USM);
599616
if (result != UR_RESULT_SUCCESS)

‎source/adapters/level_zero/ur_interface_loader.hpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,30 @@ ur_result_t urEnqueueNativeCommandExp(
735735
const ur_exp_enqueue_native_command_properties_t *pProperties,
736736
uint32_t numEventsInWaitList, const ur_event_handle_t *phEventWaitList,
737737
ur_event_handle_t *phEvent);
738+
ur_result_t urTensorMapEncodeIm2ColExp(
739+
ur_device_handle_t hDevice,
740+
ur_exp_tensor_map_data_type_flags_t TensorMapType, uint32_t TensorRank,
741+
void *GlobalAddress, const uint64_t *GlobalDim,
742+
const uint64_t *GlobalStrides, const int *PixelBoxLowerCorner,
743+
const int *PixelBoxUpperCorner, uint32_t ChannelsPerPixel,
744+
uint32_t PixelsPerColumn, const uint32_t *ElementStrides,
745+
ur_exp_tensor_map_interleave_flags_t Interleave,
746+
ur_exp_tensor_map_swizzle_flags_t Swizzle,
747+
ur_exp_tensor_map_l2_promotion_flags_t L2Promotion,
748+
ur_exp_tensor_map_oob_fill_flags_t OobFill,
749+
ur_exp_tensor_map_handle_t *hTensorMap);
750+
ur_result_t
751+
urTensorMapEncodeTiledExp(ur_device_handle_t hDevice,
752+
ur_exp_tensor_map_data_type_flags_t TensorMapType,
753+
uint32_t TensorRank, void *GlobalAddress,
754+
const uint64_t *GlobalDim,
755+
const uint64_t *GlobalStrides, const uint32_t *BoxDim,
756+
const uint32_t *ElementStrides,
757+
ur_exp_tensor_map_interleave_flags_t Interleave,
758+
ur_exp_tensor_map_swizzle_flags_t Swizzle,
759+
ur_exp_tensor_map_l2_promotion_flags_t L2Promotion,
760+
ur_exp_tensor_map_oob_fill_flags_t OobFill,
761+
ur_exp_tensor_map_handle_t *hTensorMap);
738762
#ifdef UR_STATIC_ADAPTER_LEVEL_ZERO
739763
ur_result_t urAdapterGetDdiTables(ur_dditable_t *ddi);
740764
#endif

‎source/loader/layers/tracing/ur_trcddi.cpp‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9284,7 +9284,8 @@ __urdlllocal ur_result_t UR_APICALL urTensorMapEncodeIm2ColExp(
92849284
getContext()->notify_begin(UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP,
92859285
"urTensorMapEncodeIm2ColExp", &params);
92869286

9287-
getContext()->logger.info("---> urTensorMapEncodeIm2ColExp");
9287+
auto &logger = getContext()->logger;
9288+
logger.info(" ---> urTensorMapEncodeIm2ColExp\n");
92889289

92899290
ur_result_t result = pfnEncodeIm2ColExp(
92909291
hDevice, TensorMapType, TensorRank, GlobalAddress, GlobalDim,
@@ -9296,10 +9297,13 @@ __urdlllocal ur_result_t UR_APICALL urTensorMapEncodeIm2ColExp(
92969297
"urTensorMapEncodeIm2ColExp", &params, &result,
92979298
instance);
92989299

9299-
std::ostringstream args_str;
9300-
ur::extras::printFunctionParams(
9301-
args_str, UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP, &params);
9302-
getContext()->logger.info("({}) -> {};\n", args_str.str(), result);
9300+
if (logger.getLevel() <= logger::Level::INFO) {
9301+
std::ostringstream args_str;
9302+
ur::extras::printFunctionParams(
9303+
args_str, UR_FUNCTION_TENSOR_MAP_ENCODE_IM_2_COL_EXP, &params);
9304+
logger.info(" <--- urTensorMapEncodeIm2ColExp({}) -> {};\n",
9305+
args_str.str(), result);
9306+
}
93039307

93049308
return result;
93059309
}
@@ -9354,7 +9358,8 @@ __urdlllocal ur_result_t UR_APICALL urTensorMapEncodeTiledExp(
93549358
getContext()->notify_begin(UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP,
93559359
"urTensorMapEncodeTiledExp", &params);
93569360

9357-
getContext()->logger.info("---> urTensorMapEncodeTiledExp");
9361+
auto &logger = getContext()->logger;
9362+
logger.info(" ---> urTensorMapEncodeTiledExp\n");
93589363

93599364
ur_result_t result = pfnEncodeTiledExp(
93609365
hDevice, TensorMapType, TensorRank, GlobalAddress, GlobalDim,
@@ -9365,10 +9370,13 @@ __urdlllocal ur_result_t UR_APICALL urTensorMapEncodeTiledExp(
93659370
"urTensorMapEncodeTiledExp", &params, &result,
93669371
instance);
93679372

9368-
std::ostringstream args_str;
9369-
ur::extras::printFunctionParams(
9370-
args_str, UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP, &params);
9371-
getContext()->logger.info("({}) -> {};\n", args_str.str(), result);
9373+
if (logger.getLevel() <= logger::Level::INFO) {
9374+
std::ostringstream args_str;
9375+
ur::extras::printFunctionParams(
9376+
args_str, UR_FUNCTION_TENSOR_MAP_ENCODE_TILED_EXP, &params);
9377+
logger.info(" <--- urTensorMapEncodeTiledExp({}) -> {};\n",
9378+
args_str.str(), result);
9379+
}
93729380

93739381
return result;
93749382
}

‎source/loader/ur_ldrddi.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10693,6 +10693,11 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetTensorMapExpProcAddrTable(
1069310693

1069410694
// Load the device-platform DDI tables
1069510695
for (auto &platform : ur_loader::getContext()->platforms) {
10696+
// statically linked adapter inside of the loader
10697+
if (platform.handle == nullptr) {
10698+
continue;
10699+
}
10700+
1069610701
if (platform.initStatus != UR_RESULT_SUCCESS) {
1069710702
continue;
1069810703
}

0 commit comments

Comments
 (0)