Skip to content

Commit d86aada

Browse files
omarahmed1111omarahmed1111
committed
Add more merge fixes
1 parent 65bfeab commit d86aada

30 files changed

+146
-173
lines changed

‎examples/codegen/codegen.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ constexpr unsigned PAGE_SIZE = 4096;
2424

2525
void ur_check(const ur_result_t r) {
2626
if (r != UR_RESULT_SUCCESS) {
27-
urTearDown(nullptr);
27+
urLoaderTearDown();
2828
throw std::runtime_error("Unified runtime error: " + std::to_string(r));
2929
}
3030
}
@@ -95,7 +95,7 @@ template <typename T, size_t N> struct alignas(PAGE_SIZE) AlignedArray {
9595

9696
int main() {
9797
ur_loader_config_handle_t loader_config = nullptr;
98-
ur_check(urInit(UR_DEVICE_INIT_FLAG_GPU, loader_config));
98+
ur_check(urLoaderInit(UR_DEVICE_INIT_FLAG_GPU, loader_config));
9999

100100
auto adapters = get_adapters();
101101
auto supported_adapters = get_supported_adapters(adapters);
@@ -172,5 +172,5 @@ int main() {
172172
std::cout << "Results are incorrect." << std::endl;
173173
}
174174

175-
return urTearDown(nullptr) == UR_RESULT_SUCCESS && expectedResult ? 0 : 1;
175+
return urLoaderTearDown() == UR_RESULT_SUCCESS && expectedResult ? 0 : 1;
176176
}

‎source/adapters/cuda/adapter.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ struct ur_adapter_handle_t_ {
2222

2323
ur_adapter_handle_t_ adapter{};
2424

25-
UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
26-
ur_loader_config_handle_t) {
27-
return UR_RESULT_SUCCESS;
28-
}
29-
30-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
31-
return UR_RESULT_SUCCESS;
32-
}
33-
3425
UR_APIEXPORT ur_result_t UR_APICALL
3526
urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
3627
uint32_t *pNumAdapters) {

‎source/adapters/cuda/command_buffer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
236236
return Result;
237237
}
238238

239-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
239+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
240240
ur_exp_command_buffer_handle_t hCommandBuffer, void *pDst, const void *pSrc,
241241
size_t size, uint32_t numSyncPointsInWaitList,
242242
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -270,7 +270,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
270270
return Result;
271271
}
272272

273-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
273+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
274274
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
275275
ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size,
276276
uint32_t numSyncPointsInWaitList,
@@ -314,7 +314,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
314314
return Result;
315315
}
316316

317-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
317+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
318318
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
319319
ur_mem_handle_t hDstMem, ur_rect_offset_t srcOrigin,
320320
ur_rect_offset_t dstOrigin, ur_rect_region_t region, size_t srcRowPitch,
@@ -356,7 +356,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
356356
}
357357

358358
UR_APIEXPORT
359-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
359+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
360360
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
361361
size_t offset, size_t size, const void *pSrc,
362362
uint32_t numSyncPointsInWaitList,
@@ -394,7 +394,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
394394
}
395395

396396
UR_APIEXPORT
397-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
397+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
398398
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
399399
size_t offset, size_t size, void *pDst, uint32_t numSyncPointsInWaitList,
400400
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -431,7 +431,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
431431
}
432432

433433
UR_APIEXPORT
434-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
434+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
435435
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
436436
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
437437
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
@@ -473,7 +473,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
473473
}
474474

475475
UR_APIEXPORT
476-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
476+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
477477
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
478478
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
479479
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,

‎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::fprintf(stderr, "ur_print: %s\n", Message);
114+
std::cerr << "ur_print: " << Message << std::endl;
115115
}
116116

117117
// Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR

‎source/adapters/cuda/ur_interface_loader.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
202202
if (UR_RESULT_SUCCESS != result) {
203203
return result;
204204
}
205-
pDdiTable->pfnInit = urInit;
206-
pDdiTable->pfnTearDown = urTearDown;
207205
pDdiTable->pfnAdapterGet = urAdapterGet;
208206
pDdiTable->pfnAdapterRelease = urAdapterRelease;
209207
pDdiTable->pfnAdapterRetain = urAdapterRetain;
@@ -280,17 +278,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
280278
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
281279
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
282280
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
283-
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
284-
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
285-
pDdiTable->pfnAppendMembufferCopyRectExp =
286-
urCommandBufferAppendMembufferCopyRectExp;
287-
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
288-
pDdiTable->pfnAppendMembufferReadRectExp =
289-
urCommandBufferAppendMembufferReadRectExp;
290-
pDdiTable->pfnAppendMembufferWriteExp =
291-
urCommandBufferAppendMembufferWriteExp;
292-
pDdiTable->pfnAppendMembufferWriteRectExp =
293-
urCommandBufferAppendMembufferWriteRectExp;
281+
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
282+
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
283+
pDdiTable->pfnAppendMemBufferCopyRectExp =
284+
urCommandBufferAppendMemBufferCopyRectExp;
285+
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
286+
pDdiTable->pfnAppendMemBufferReadRectExp =
287+
urCommandBufferAppendMemBufferReadRectExp;
288+
pDdiTable->pfnAppendMemBufferWriteExp =
289+
urCommandBufferAppendMemBufferWriteExp;
290+
pDdiTable->pfnAppendMemBufferWriteRectExp =
291+
urCommandBufferAppendMemBufferWriteRectExp;
294292
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
295293

296294
return retVal;
@@ -397,6 +395,8 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
397395
return result;
398396
}
399397

398+
pDdiTable->pfnCooperativeKernelLaunchExp = nullptr;
399+
400400
return UR_RESULT_SUCCESS;
401401
}
402402

@@ -407,6 +407,8 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
407407
return result;
408408
}
409409

410+
pDdiTable->pfnSuggestMaxCooperativeGroupCountExp = nullptr;
411+
410412
return UR_RESULT_SUCCESS;
411413
}
412414

‎source/adapters/hip/adapter.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ struct ur_adapter_handle_t_ {
2020

2121
ur_adapter_handle_t_ adapter{};
2222

23-
UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
24-
ur_loader_config_handle_t) {
25-
return UR_RESULT_SUCCESS;
26-
}
27-
28-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
29-
return UR_RESULT_SUCCESS;
30-
}
31-
3223
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
3324
uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
3425
if (phAdapters) {

‎source/adapters/hip/command_buffer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
5252
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
5353
}
5454

55-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
55+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
5656
ur_exp_command_buffer_handle_t, void *, const void *, size_t, uint32_t,
5757
const ur_exp_command_buffer_sync_point_t *,
5858
ur_exp_command_buffer_sync_point_t *) {
@@ -61,7 +61,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
6161
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
6262
}
6363

64-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
64+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
6565
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t,
6666
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
6767
ur_exp_command_buffer_sync_point_t *) {
@@ -70,7 +70,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
7070
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
7171
}
7272

73-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
73+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
7474
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t,
7575
ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t,
7676
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -81,7 +81,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
8181
}
8282

8383
UR_APIEXPORT
84-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
84+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
8585
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t,
8686
const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *,
8787
ur_exp_command_buffer_sync_point_t *) {
@@ -91,7 +91,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
9191
}
9292

9393
UR_APIEXPORT
94-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
94+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
9595
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *,
9696
uint32_t, const ur_exp_command_buffer_sync_point_t *,
9797
ur_exp_command_buffer_sync_point_t *) {
@@ -101,7 +101,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
101101
}
102102

103103
UR_APIEXPORT
104-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
104+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
105105
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
106106
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
107107
uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -112,7 +112,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
112112
}
113113

114114
UR_APIEXPORT
115-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
115+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
116116
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
117117
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
118118
uint32_t, const ur_exp_command_buffer_sync_point_t *,

‎source/adapters/hip/ur_interface_loader.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
202202
if (UR_RESULT_SUCCESS != result) {
203203
return result;
204204
}
205-
206-
pDdiTable->pfnInit = urInit;
207-
pDdiTable->pfnTearDown = urTearDown;
208205
pDdiTable->pfnAdapterGet = urAdapterGet;
209206
pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo;
210207
pDdiTable->pfnAdapterGetLastError = urAdapterGetLastError;
@@ -278,17 +275,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
278275
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
279276
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
280277
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
281-
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
282-
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
283-
pDdiTable->pfnAppendMembufferCopyRectExp =
284-
urCommandBufferAppendMembufferCopyRectExp;
285-
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
286-
pDdiTable->pfnAppendMembufferReadRectExp =
287-
urCommandBufferAppendMembufferReadRectExp;
288-
pDdiTable->pfnAppendMembufferWriteExp =
289-
urCommandBufferAppendMembufferWriteExp;
290-
pDdiTable->pfnAppendMembufferWriteRectExp =
291-
urCommandBufferAppendMembufferWriteRectExp;
278+
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
279+
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
280+
pDdiTable->pfnAppendMemBufferCopyRectExp =
281+
urCommandBufferAppendMemBufferCopyRectExp;
282+
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
283+
pDdiTable->pfnAppendMemBufferReadRectExp =
284+
urCommandBufferAppendMemBufferReadRectExp;
285+
pDdiTable->pfnAppendMemBufferWriteExp =
286+
urCommandBufferAppendMemBufferWriteExp;
287+
pDdiTable->pfnAppendMemBufferWriteRectExp =
288+
urCommandBufferAppendMemBufferWriteRectExp;
292289
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
293290

294291
return retVal;
@@ -352,6 +349,8 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
352349
return result;
353350
}
354351

352+
pDdiTable->pfnCooperativeKernelLaunchExp = nullptr;
353+
355354
return UR_RESULT_SUCCESS;
356355
}
357356

@@ -362,6 +361,8 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
362361
return result;
363362
}
364363

364+
pDdiTable->pfnSuggestMaxCooperativeGroupCountExp = nullptr;
365+
365366
return UR_RESULT_SUCCESS;
366367
}
367368

‎source/adapters/level_zero/adapter.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@
1313

1414
ur_adapter_handle_t_ Adapter{};
1515

16-
UR_APIEXPORT ur_result_t UR_APICALL
17-
urInit(ur_device_init_flags_t
18-
DeviceFlags, ///< [in] device initialization flags.
19-
///< must be 0 (default) or a combination of
20-
///< ::ur_device_init_flag_t.
21-
ur_loader_config_handle_t) {
22-
std::ignore = DeviceFlags;
23-
24-
return UR_RESULT_SUCCESS;
25-
}
26-
2716
ur_result_t adapterStateTeardown() {
2817
// reclaim ur_platform_handle_t objects here since we don't have
2918
// urPlatformRelease.
@@ -122,13 +111,6 @@ ur_result_t adapterStateTeardown() {
122111
return UR_RESULT_SUCCESS;
123112
}
124113

125-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(
126-
void *Params ///< [in] pointer to tear down parameters
127-
) {
128-
std::ignore = Params;
129-
return UR_RESULT_SUCCESS;
130-
}
131-
132114
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
133115
uint32_t NumEntries, ///< [in] the number of platforms to be added to
134116
///< phAdapters. If phAdapters is not NULL, then

‎source/adapters/level_zero/command_buffer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
545545
return UR_RESULT_SUCCESS;
546546
}
547547

548-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
548+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
549549
ur_exp_command_buffer_handle_t CommandBuffer, void *Dst, const void *Src,
550550
size_t Size, uint32_t NumSyncPointsInWaitList,
551551
const ur_exp_command_buffer_sync_point_t *SyncPointWaitList,
@@ -555,7 +555,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
555555
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
556556
}
557557

558-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
558+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
559559
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem,
560560
ur_mem_handle_t DstMem, size_t SrcOffset, size_t DstOffset, size_t Size,
561561
uint32_t NumSyncPointsInWaitList,
@@ -581,7 +581,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
581581
SyncPoint);
582582
}
583583

584-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
584+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
585585
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem,
586586
ur_mem_handle_t DstMem, ur_rect_offset_t SrcOrigin,
587587
ur_rect_offset_t DstOrigin, ur_rect_region_t Region, size_t SrcRowPitch,
@@ -609,7 +609,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
609609
DstSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
610610
}
611611

612-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
612+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
613613
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
614614
size_t Offset, size_t Size, const void *Src,
615615
uint32_t NumSyncPointsInWaitList,
@@ -628,7 +628,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
628628
Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
629629
}
630630

631-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
631+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
632632
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
633633
ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset,
634634
ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch,
@@ -648,7 +648,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
648648
BufferSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
649649
}
650650

651-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
651+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
652652
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
653653
size_t Offset, size_t Size, void *Dst, uint32_t NumSyncPointsInWaitList,
654654
const ur_exp_command_buffer_sync_point_t *SyncPointWaitList,
@@ -663,7 +663,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
663663
Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
664664
}
665665

666-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
666+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
667667
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
668668
ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset,
669669
ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch,

0 commit comments

Comments
 (0)