Skip to content

Commit 07ad4f8

Browse files
omarahmed1111omarahmed1111
committed
Fix some merge problems
1 parent 7c7bf22 commit 07ad4f8

File tree

10 files changed

+85
-11
lines changed

10 files changed

+85
-11
lines changed

‎source/adapters/adapter.def.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ EXPORTS
55
urGetCommandBufferExpProcAddrTable
66
urGetContextProcAddrTable
77
urGetEnqueueProcAddrTable
8+
urGetEnqueueExpProcAddrTable
89
urGetEventProcAddrTable
910
urGetKernelProcAddrTable
11+
urGetKernelExpProcAddrTable
1012
urGetMemProcAddrTable
1113
urGetPhysicalMemProcAddrTable
1214
urGetPlatformProcAddrTable

‎source/adapters/adapter.map.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
urGetCommandBufferExpProcAddrTable;
66
urGetContextProcAddrTable;
77
urGetEnqueueProcAddrTable;
8+
urGetEnqueueExpProcAddrTable;
89
urGetEventProcAddrTable;
910
urGetKernelProcAddrTable;
11+
urGetKernelExpProcAddrTable;
1012
urGetMemProcAddrTable;
1113
urGetPhysicalMemProcAddrTable;
1214
urGetPlatformProcAddrTable;

‎source/adapters/cuda/common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void detail::ur::assertion(bool Condition, const char *Message) {
111111
}
112112

113113
void detail::ur::cuPrint(const char *Message) {
114-
std::cerr << "ur_print: " << Message << std::endl;
114+
std::fprintf(stderr, "ur_print: %s\n", Message);
115115
}
116116

117117
// Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR

‎source/adapters/cuda/ur_interface_loader.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
390390
return retVal;
391391
}
392392

393+
UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
394+
ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
395+
auto result = validateProcInputs(version, pDdiTable);
396+
if (UR_RESULT_SUCCESS != result) {
397+
return result;
398+
}
399+
400+
return UR_RESULT_SUCCESS;
401+
}
402+
403+
UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
404+
ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
405+
auto result = validateProcInputs(version, pDdiTable);
406+
if (UR_RESULT_SUCCESS != result) {
407+
return result;
408+
}
409+
410+
return UR_RESULT_SUCCESS;
411+
}
412+
393413
#if defined(__cplusplus)
394414
} // extern "C"
395415
#endif

‎source/adapters/hip/ur_interface_loader.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
345345
return retVal;
346346
}
347347

348+
UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
349+
ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
350+
auto result = validateProcInputs(version, pDdiTable);
351+
if (UR_RESULT_SUCCESS != result) {
352+
return result;
353+
}
354+
355+
return UR_RESULT_SUCCESS;
356+
}
357+
358+
UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
359+
ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
360+
auto result = validateProcInputs(version, pDdiTable);
361+
if (UR_RESULT_SUCCESS != result) {
362+
return result;
363+
}
364+
365+
return UR_RESULT_SUCCESS;
366+
}
367+
348368
#if defined(__cplusplus)
349369
} // extern "C"
350370
#endif

‎source/adapters/level_zero/ur_interface_loader.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,3 +430,23 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
430430

431431
return retVal;
432432
}
433+
434+
UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
435+
ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
436+
auto result = validateProcInputs(version, pDdiTable);
437+
if (UR_RESULT_SUCCESS != result) {
438+
return result;
439+
}
440+
441+
return UR_RESULT_SUCCESS;
442+
}
443+
444+
UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
445+
ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
446+
auto result = validateProcInputs(version, pDdiTable);
447+
if (UR_RESULT_SUCCESS != result) {
448+
return result;
449+
}
450+
451+
return UR_RESULT_SUCCESS;
452+
}

‎source/adapters/opencl/ur_interface_loader.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
379379
return retVal;
380380
}
381381

382+
UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
383+
ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
384+
auto result = validateProcInputs(version, pDdiTable);
385+
if (UR_RESULT_SUCCESS != result) {
386+
return result;
387+
}
388+
389+
return UR_RESULT_SUCCESS;
390+
}
391+
392+
UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
393+
ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
394+
auto result = validateProcInputs(version, pDdiTable);
395+
if (UR_RESULT_SUCCESS != result) {
396+
return result;
397+
}
398+
399+
return UR_RESULT_SUCCESS;
400+
}
401+
382402
#if defined(__cplusplus)
383403
} // extern "C"
384404
#endif

‎test/conformance/device/device_adapter_level_zero.match

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
urDeviceGetTest.InvalidValueNumEntries
2-
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
31
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_IMAGE_SUPPORTED
42
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE
53
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ERROR_CORRECTION_SUPPORT
@@ -9,8 +7,6 @@ urDeviceGetInfoTest.Success/UR_DEVICE_INFO_AVAILABLE
97
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_COMPILER_AVAILABLE
108
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_LINKER_AVAILABLE
119
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC
12-
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_SUPPORTED_PARTITIONS
13-
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_PARTITION_TYPE
1410
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS
1511
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_MEMORY_BANDWIDTH
1612
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_IMAGE_SRGB

‎test/conformance/memory/memory_adapter_level_zero.match

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@ urMemBufferCreateTest.InvalidBufferSizeZero/Intel_R__oneAPI_Unified_Runtime_over
22
urMemBufferPartitionTest.InvalidBufferSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
33
urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
44
urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
5-
urMemGetInfoTest.InvalidNullPointerParamValue/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
6-
urMemGetInfoTest.InvalidNullPointerParamValue/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_CONTEXT
7-
urMemGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
8-
urMemGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_CONTEXT
95
{{Segmentation fault|Aborted}}

‎test/conformance/queue/queue_adapter_level_zero.match

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
urQueueCreateTest.InvalidValueProperties/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
2-
urQueueCreateTest.InvalidQueueProperties/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
31
{{Segmentation fault|Aborted}}

0 commit comments

Comments
 (0)