Skip to content

[L0] Fix merge conflict error for urPrint in L0 #1606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kbenzie merged 1 commit into from
May 14, 2024
Merged

[L0] Fix merge conflict error for urPrint in L0 #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions source/adapters/level_zero/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <string.h>

#include "context.hpp"
#include "logger/ur_logger.hpp"
#include "queue.hpp"
#include "ur_level_zero.hpp"

Expand Down Expand Up @@ -176,8 +175,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextSetExtendedDeleter(
std::ignore = Context;
std::ignore = Deleter;
std::ignore = UserData;
logger::error(logger::LegacyMessage("[UR][L0] {} function not implemented!"),
"{} function not implemented!", __FUNCTION__);
urPrint("[UR][L0] %s function not implemented!\n", __FUNCTION__);
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

Expand Down Expand Up @@ -513,8 +511,7 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
ZeEventPoolDesc.flags |= ZE_EVENT_POOL_FLAG_HOST_VISIBLE;
if (ProfilingEnabled)
ZeEventPoolDesc.flags |= ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP;
logger::debug("ze_event_pool_desc_t flags set to: {}",
ZeEventPoolDesc.flags);
urPrint("ze_event_pool_desc_t flags set to: %d\n", ZeEventPoolDesc.flags);

std::vector<ze_device_handle_t> ZeDevices;
if (ZeDevice) {
Expand Down
3 changes: 1 addition & 2 deletions source/adapters/level_zero/event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "command_buffer.hpp"
#include "common.hpp"
#include "event.hpp"
#include "logger/ur_logger.hpp"
#include "ur_level_zero.hpp"

void printZeEventList(const _ur_ze_event_list_t &UrZeEventList) {
Expand Down Expand Up @@ -697,7 +696,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventWait(
die("The host-visible proxy event missing");

ze_event_handle_t ZeEvent = HostVisibleEvent->ZeEvent;
logger::debug("ZeEvent = {}", ur_cast<std::uintptr_t>(ZeEvent));
urPrint("ZeEvent = %#llx\n", ur_cast<std::uintptr_t>(ZeEvent));
// If this event was an inner batched event, then sync with
// the Queue instead of waiting on the event.
if (HostVisibleEvent->IsInnerBatchedEvent && Event->ZeBatchedQueue) {
Expand Down