From 797090bbfa1587bf79f99e85e5c7fbf39a1f368a Mon Sep 17 00:00:00 2001
From: "Zhang, Winston" <winston.zhang@intel.com>
Date: Mon, 10 Aug 2026 14:30:50 -0700
Subject: [PATCH] Revert "[UR][L0] Prefer core usable-memory query with Sysman
 fallback (#21339)"

This reverts commit ad3cf835658ac4f9c9d1348f0c09985c7df295a7.

Querying the free memory now crashes with UR_RESULT_ERROR_UNINITIALIZED
when the device is reached through the OpenMP offload interop path on PVC.
The usable-memory extension check makes the ext_intel_free_memory aspect
report as supported in that configuration, where it previously did not,
so the subsequent query is issued and fails.

Revert to restore the zesMemoryGetState-only behavior while the core
usable-memory path is reworked.

Fixes: URLZA-755

Signed-off-by: Zhang, Winston <winston.zhang@intel.com>
---
 .../adapters/level_zero/common/device.cpp     | 59 -------------------
 .../common/helpers/shared_helpers.cpp         |  7 ---
 2 files changed, 66 deletions(-)

diff --git a/unified-runtime/source/adapters/level_zero/common/device.cpp b/unified-runtime/source/adapters/level_zero/common/device.cpp
index 6058b5c8e60af..ef88a40ac587b 100644
--- a/unified-runtime/source/adapters/level_zero/common/device.cpp
+++ b/unified-runtime/source/adapters/level_zero/common/device.cpp
@@ -225,46 +225,6 @@ uint64_t calculateGlobalMemSize(ur_device_handle_t Device) {
   return Device->ZeGlobalMemSize.get().value;
 }
 
-static bool
-supportsDeviceUsableMemSizeExtension(ur_platform_handle_t Platform) {
-#ifdef ZE_DEVICE_USABLEMEM_SIZE_PROPERTIES_EXT_NAME
-  constexpr const char *ExtensionName =
-      ZE_DEVICE_USABLEMEM_SIZE_PROPERTIES_EXT_NAME;
-  constexpr uint32_t MinVersion = ZE_MAKE_VERSION(1, 0);
-
-  auto Extension = Platform->zeDriverExtensionMap.find(ExtensionName);
-  return Extension != Platform->zeDriverExtensionMap.end() &&
-         Extension->second >= MinVersion;
-#else
-  std::ignore = Platform;
-  return false;
-#endif
-}
-
-static std::optional<uint64_t>
-getDeviceUsableMemSizeFromCore(ur_device_handle_t Device) {
-#ifdef ZE_DEVICE_USABLEMEM_SIZE_PROPERTIES_EXT_NAME
-  if (!supportsDeviceUsableMemSizeExtension(Device->Platform)) {
-    return std::nullopt;
-  }
-
-  ZeStruct<ze_device_properties_t> DeviceProperties;
-  ZeStruct<ze_device_usablemem_size_ext_properties_t> UsableMemProperties;
-  DeviceProperties.pNext = &UsableMemProperties;
-
-  auto ZeResult = ZE_CALL_NOCHECK(zeDeviceGetProperties,
-                                  (Device->ZeDevice, &DeviceProperties));
-  if (ZeResult != ZE_RESULT_SUCCESS) {
-    return std::nullopt;
-  }
-
-  return UsableMemProperties.currUsableMemSize;
-#else
-  std::ignore = Device;
-  return std::nullopt;
-#endif
-}
-
 // Return the Sysman device handle and correpsonding data for the given UR
 // device.
 static std::tuple<zes_device_handle_t, ur_zes_device_handle_data_t, ur_result_t>
@@ -914,21 +874,6 @@ ur_result_t urDeviceGetInfo(
   }
 
   case UR_DEVICE_INFO_GLOBAL_MEM_FREE: {
-    if (!ParamValue && pSize) {
-      if (supportsDeviceUsableMemSizeExtension(Device->Platform)) {
-        return ReturnValue(uint64_t{0});
-      }
-
-      auto [ZesDevice, ZesDeviceData, Result] = getZesDeviceData(Device);
-      (void)ZesDevice;
-      (void)ZesDeviceData;
-      if (Result != UR_RESULT_SUCCESS) {
-        return Result;
-      }
-
-      return ReturnValue(uint64_t{0});
-    }
-
     // Calculate the global memory size as the max limit that can be reported as
     // "free" memory for the user to allocate.
     uint64_t GlobalMemSize = calculateGlobalMemSize(Device);
@@ -937,10 +882,6 @@ ur_result_t urDeviceGetInfo(
     uint64_t FreeMemory = 0;
     uint32_t MemCount = 0;
 
-    if (auto CoreUsableMemSize = getDeviceUsableMemSizeFromCore(Device)) {
-      return ReturnValue(std::min(GlobalMemSize, *CoreUsableMemSize));
-    }
-
     auto [ZesDevice, ZesDeviceData, Result] = getZesDeviceData(Device);
     if (Result != UR_RESULT_SUCCESS)
       return Result;
diff --git a/unified-runtime/source/adapters/level_zero/common/helpers/shared_helpers.cpp b/unified-runtime/source/adapters/level_zero/common/helpers/shared_helpers.cpp
index 8e452447c2cad..3023c1b744d45 100644
--- a/unified-runtime/source/adapters/level_zero/common/helpers/shared_helpers.cpp
+++ b/unified-runtime/source/adapters/level_zero/common/helpers/shared_helpers.cpp
@@ -292,13 +292,6 @@ template <>
 ze_structure_type_t getZeStructureType<ze_device_memory_ext_properties_t>() {
   return ZE_STRUCTURE_TYPE_DEVICE_MEMORY_EXT_PROPERTIES;
 }
-#ifdef ZE_DEVICE_USABLEMEM_SIZE_PROPERTIES_EXT_NAME
-template <>
-ze_structure_type_t
-getZeStructureType<ze_device_usablemem_size_ext_properties_t>() {
-  return ZE_STRUCTURE_TYPE_DEVICE_USABLEMEM_SIZE_EXT_PROPERTIES;
-}
-#endif
 template <>
 ze_structure_type_t getZeStructureType<ze_device_ip_version_ext_t>() {
   return ZE_STRUCTURE_TYPE_DEVICE_IP_VERSION_EXT;