Skip to content

Commit 41b0fa1

Browse files
committed
Update api after rebase
1 parent 89622c8 commit 41b0fa1

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

source/adapters/level_zero/v2/command_list_manager.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ur_command_list_manager::~ur_command_list_manager() {
3232
}
3333

3434
ur_result_t ur_command_list_manager::appendGenericFillUnlocked(
35-
ur_mem_handle_t dst, size_t offset, size_t patternSize,
35+
ur_mem_buffer_t *dst, size_t offset, size_t patternSize,
3636
const void *pPattern, size_t size, uint32_t numEventsInWaitList,
3737
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent,
3838
ur_command_t commandType) {
@@ -42,7 +42,7 @@ ur_result_t ur_command_list_manager::appendGenericFillUnlocked(
4242
auto waitListView = getWaitListView(phEventWaitList, numEventsInWaitList);
4343

4444
auto pDst = ur_cast<char *>(dst->getDevicePtr(
45-
device, ur_mem_handle_t_::device_access_mode_t::read_only, offset, size,
45+
device, ur_mem_buffer_t::device_access_mode_t::read_only, offset, size,
4646
[&](void *src, void *dst, size_t size) {
4747
ZE2UR_CALL_THROWS(zeCommandListAppendMemoryCopy,
4848
(zeCommandList.get(), dst, src, size, nullptr,
@@ -254,11 +254,12 @@ ur_result_t ur_command_list_manager::appendUSMMemcpy(
254254
}
255255

256256
ur_result_t ur_command_list_manager::appendMemBufferFill(
257-
ur_mem_handle_t hBuffer, const void *pPattern, size_t patternSize,
257+
ur_mem_handle_t hMem, const void *pPattern, size_t patternSize,
258258
size_t offset, size_t size, uint32_t numEventsInWaitList,
259259
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
260260
TRACK_SCOPE_LATENCY("ur_command_list_manager::appendMemBufferFill");
261261

262+
auto hBuffer = hMem->getBuffer();
262263
UR_ASSERT(offset + size <= hBuffer->getSize(), UR_RESULT_ERROR_INVALID_SIZE);
263264

264265
std::scoped_lock<ur_shared_mutex, ur_shared_mutex> lock(this->Mutex,
@@ -277,7 +278,7 @@ ur_result_t ur_command_list_manager::appendUSMFill(
277278

278279
std::scoped_lock<ur_shared_mutex> lock(this->Mutex);
279280

280-
ur_usm_handle_t_ dstHandle(context, size, pMem);
281+
ur_usm_handle_t dstHandle(context, size, pMem);
281282
return appendGenericFillUnlocked(&dstHandle, 0, patternSize, pPattern, size,
282283
numEventsInWaitList, phEventWaitList,
283284
phEvent, UR_COMMAND_USM_FILL);

source/adapters/level_zero/v2/command_list_manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ struct ur_command_list_manager : public _ur_object {
129129

130130
private:
131131
ur_result_t appendGenericFillUnlocked(
132-
ur_mem_handle_t hBuffer, size_t offset, size_t patternSize,
132+
ur_mem_buffer_t *hBuffer, size_t offset, size_t patternSize,
133133
const void *pPattern, size_t size, uint32_t numEventsInWaitList,
134134
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent,
135135
ur_command_t commandType);

source/adapters/level_zero/v2/queue_immediate_in_order.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,8 @@ ur_result_t ur_queue_immediate_in_order_t::enqueueMemBufferFill(
372372
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
373373
TRACK_SCOPE_LATENCY("ur_queue_immediate_in_order_t::enqueueMemBufferFill");
374374

375-
auto hBuffer = hMem->getBuffer();
376-
377-
UR_ASSERT(offset + size <= hBuffer->getSize(), UR_RESULT_ERROR_INVALID_SIZE);
378375
UR_CALL(commandListManager.appendMemBufferFill(
379-
hBuffer, pPattern, patternSize, offset, size, numEventsInWaitList,
376+
hMem, pPattern, patternSize, offset, size, numEventsInWaitList,
380377
phEventWaitList, phEvent));
381378

382379
return UR_RESULT_SUCCESS;

0 commit comments

Comments
 (0)