Merge pull request #1606 from nrspruit/fix_prints_0_9_2

[L0] Fix merge conflict error for urPrint in L0
oneapi-src · May 14, 2024 · d9748d2 · d9748d2
2 parents b88d0a8 + c33de56
commit d9748d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/source/adapters/level_zero/context.cpp b/source/adapters/level_zero/context.cpp
@@ -14,7 +14,6 @@
 #include <string.h>
 
 #include "context.hpp"
-#include "logger/ur_logger.hpp"
 #include "queue.hpp"
 #include "ur_level_zero.hpp"
 
@@ -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;
 }
 
@@ -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) {

diff --git a/source/adapters/level_zero/event.cpp b/source/adapters/level_zero/event.cpp
@@ -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) {
@@ -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) {