[UR][SYCL] Remove UR context atomic queries. (#16160)

aarongreig · web-flow · commit a000e56a9542 · 2025-03-10T10:11:58.000Z
These were always just used as placeholder values so they can be
replaced by __SYCL_TRAIT_HANDLED_IN_RT.
diff --git a/sycl/include/sycl/info/context_traits.def b/sycl/include/sycl/info/context_traits.def
@@ -1,7 +1,7 @@
 __SYCL_PARAM_TRAITS_SPEC(context, reference_count, uint32_t, UR_CONTEXT_INFO_REFERENCE_COUNT)
 __SYCL_PARAM_TRAITS_SPEC(context, platform, sycl::platform, __SYCL_TRAIT_HANDLED_IN_RT)
 __SYCL_PARAM_TRAITS_SPEC(context, devices, std::vector<sycl::device>, UR_CONTEXT_INFO_DEVICES)
-__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_order_capabilities, std::vector<sycl::memory_order>, UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES)
-__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_scope_capabilities, std::vector<sycl::memory_scope>, UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES)
-__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_order_capabilities, std::vector<sycl::memory_order>, UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES)
-__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_scope_capabilities, std::vector<sycl::memory_scope>, UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES)
+__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_order_capabilities, std::vector<sycl::memory_order>, __SYCL_TRAIT_HANDLED_IN_RT)
+__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_scope_capabilities, std::vector<sycl::memory_scope>, __SYCL_TRAIT_HANDLED_IN_RT)
+__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_order_capabilities, std::vector<sycl::memory_order>, __SYCL_TRAIT_HANDLED_IN_RT)
+__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_scope_capabilities, std::vector<sycl::memory_scope>, __SYCL_TRAIT_HANDLED_IN_RT)
diff --git a/unified-runtime/include/ur_api.h b/unified-runtime/include/ur_api.h
@@ -2984,20 +2984,6 @@ typedef enum ur_context_info_t {
   /// [::ur_bool_t] to indicate if the ::urEnqueueUSMFill2D entrypoint is
   /// supported.
   UR_CONTEXT_INFO_USM_FILL2D_SUPPORT = 4,
-  /// [::ur_memory_order_capability_flags_t][optional-query] return a
-  /// bit-field of atomic memory order capabilities.
-  UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES = 5,
-  /// [::ur_memory_scope_capability_flags_t][optional-query] return a
-  /// bit-field of atomic memory scope capabilities.
-  UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES = 6,
-  /// [::ur_memory_order_capability_flags_t][optional-query] return a
-  /// bit-field of atomic memory fence order capabilities.
-  /// Zero is returned if the backend does not support context-level fences.
-  UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES = 7,
-  /// [::ur_memory_scope_capability_flags_t][optional-query] return a
-  /// bit-field of atomic memory fence scope capabilities.
-  /// Zero is returned if the backend does not support context-level fences.
-  UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES = 8,
   /// @cond
   UR_CONTEXT_INFO_FORCE_UINT32 = 0x7fffffff
   /// @endcond
@@ -3046,7 +3032,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextRelease(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hContext`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES < propName`
+///         + `::UR_CONTEXT_INFO_USM_FILL2D_SUPPORT < propName`
 ///     - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 ///         + If `propName` is not supported by the adapter.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
diff --git a/unified-runtime/include/ur_print.hpp b/unified-runtime/include/ur_print.hpp
@@ -6015,18 +6015,6 @@ inline std::ostream &operator<<(std::ostream &os,
   case UR_CONTEXT_INFO_USM_FILL2D_SUPPORT:
     os << "UR_CONTEXT_INFO_USM_FILL2D_SUPPORT";
     break;
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES:
-    os << "UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES";
-    break;
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-    os << "UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES";
-    break;
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-    os << "UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES";
-    break;
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES:
-    os << "UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES";
-    break;
   default:
     os << "unknown enumerator";
     break;
@@ -6110,66 +6098,6 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr,
 
     os << ")";
   } break;
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES: {
-    const ur_memory_order_capability_flags_t *tptr =
-        (const ur_memory_order_capability_flags_t *)ptr;
-    if (sizeof(ur_memory_order_capability_flags_t) > size) {
-      os << "invalid size (is: " << size
-         << ", expected: >=" << sizeof(ur_memory_order_capability_flags_t)
-         << ")";
-      return UR_RESULT_ERROR_INVALID_SIZE;
-    }
-    os << (const void *)(tptr) << " (";
-
-    ur::details::printFlag<ur_memory_order_capability_flag_t>(os, *tptr);
-
-    os << ")";
-  } break;
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES: {
-    const ur_memory_scope_capability_flags_t *tptr =
-        (const ur_memory_scope_capability_flags_t *)ptr;
-    if (sizeof(ur_memory_scope_capability_flags_t) > size) {
-      os << "invalid size (is: " << size
-         << ", expected: >=" << sizeof(ur_memory_scope_capability_flags_t)
-         << ")";
-      return UR_RESULT_ERROR_INVALID_SIZE;
-    }
-    os << (const void *)(tptr) << " (";
-
-    ur::details::printFlag<ur_memory_scope_capability_flag_t>(os, *tptr);
-
-    os << ")";
-  } break;
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES: {
-    const ur_memory_order_capability_flags_t *tptr =
-        (const ur_memory_order_capability_flags_t *)ptr;
-    if (sizeof(ur_memory_order_capability_flags_t) > size) {
-      os << "invalid size (is: " << size
-         << ", expected: >=" << sizeof(ur_memory_order_capability_flags_t)
-         << ")";
-      return UR_RESULT_ERROR_INVALID_SIZE;
-    }
-    os << (const void *)(tptr) << " (";
-
-    ur::details::printFlag<ur_memory_order_capability_flag_t>(os, *tptr);
-
-    os << ")";
-  } break;
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    const ur_memory_scope_capability_flags_t *tptr =
-        (const ur_memory_scope_capability_flags_t *)ptr;
-    if (sizeof(ur_memory_scope_capability_flags_t) > size) {
-      os << "invalid size (is: " << size
-         << ", expected: >=" << sizeof(ur_memory_scope_capability_flags_t)
-         << ")";
-      return UR_RESULT_ERROR_INVALID_SIZE;
-    }
-    os << (const void *)(tptr) << " (";
-
-    ur::details::printFlag<ur_memory_scope_capability_flag_t>(os, *tptr);
-
-    os << ")";
-  } break;
   default:
     os << "unknown enumerator";
     return UR_RESULT_ERROR_INVALID_ENUMERATION;
diff --git a/unified-runtime/scripts/core/context.yml b/unified-runtime/scripts/core/context.yml
@@ -101,18 +101,6 @@ etors:
       desc: "[$x_bool_t] to indicate if the $xEnqueueUSMMemcpy2D entrypoint is supported."
     - name: USM_FILL2D_SUPPORT
       desc: "[$x_bool_t] to indicate if the $xEnqueueUSMFill2D entrypoint is supported."
-    - name: ATOMIC_MEMORY_ORDER_CAPABILITIES
-      desc: "[$x_memory_order_capability_flags_t][optional-query] return a bit-field of atomic memory order capabilities."
-    - name: ATOMIC_MEMORY_SCOPE_CAPABILITIES
-      desc: "[$x_memory_scope_capability_flags_t][optional-query] return a bit-field of atomic memory scope capabilities."
-    - name: ATOMIC_FENCE_ORDER_CAPABILITIES
-      desc: |
-            [$x_memory_order_capability_flags_t][optional-query] return a bit-field of atomic memory fence order capabilities.
-            Zero is returned if the backend does not support context-level fences.
-    - name: ATOMIC_FENCE_SCOPE_CAPABILITIES
-      desc: |
-            [$x_memory_scope_capability_flags_t][optional-query] return a bit-field of atomic memory fence scope capabilities.
-            Zero is returned if the backend does not support context-level fences.
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Releases the context handle reference indicating end of its usage"
diff --git a/unified-runtime/source/adapters/cuda/context.cpp b/unified-runtime/source/adapters/cuda/context.cpp
@@ -74,34 +74,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetInfo(
                        hContext->getDevices().size());
   case UR_CONTEXT_INFO_REFERENCE_COUNT:
     return ReturnValue(hContext->getReferenceCount());
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES: {
-    uint32_t Capabilities = UR_MEMORY_ORDER_CAPABILITY_FLAG_RELAXED |
-                            UR_MEMORY_ORDER_CAPABILITY_FLAG_ACQUIRE |
-                            UR_MEMORY_ORDER_CAPABILITY_FLAG_RELEASE |
-                            UR_MEMORY_ORDER_CAPABILITY_FLAG_ACQ_REL;
-    return ReturnValue(Capabilities);
-  }
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES: {
-    int Major = 0;
-    UR_CHECK_ERROR(cuDeviceGetAttribute(
-        &Major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR,
-        hContext->getDevices()[0]->get()));
-    uint32_t Capabilities =
-        (Major >= 7) ? UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_ITEM |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_SUB_GROUP |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_GROUP |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_DEVICE |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_SYSTEM
-                     : UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_ITEM |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_SUB_GROUP |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_GROUP |
-                           UR_MEMORY_SCOPE_CAPABILITY_FLAG_DEVICE;
-    return ReturnValue(Capabilities);
-  }
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
   case UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT:
     // 2D USM memcpy is supported.
     return ReturnValue(true);
diff --git a/unified-runtime/source/adapters/hip/context.cpp b/unified-runtime/source/adapters/hip/context.cpp
@@ -69,14 +69,6 @@ urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
                        hContext->getDevices().size());
   case UR_CONTEXT_INFO_REFERENCE_COUNT:
     return ReturnValue(hContext->getReferenceCount());
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    // These queries should be dealt with in context_impl.cpp by calling the
-    // queries of each device separately and building the intersection set.
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
   case UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT:
     // 2D USM memcpy is supported.
     return ReturnValue(true);
diff --git a/unified-runtime/source/adapters/level_zero/context.cpp b/unified-runtime/source/adapters/level_zero/context.cpp
@@ -120,21 +120,6 @@ ur_result_t urContextGetInfo(
   case UR_CONTEXT_INFO_USM_FILL2D_SUPPORT:
     // 2D USM fill is not supported.
     return ReturnValue(uint8_t{false});
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES: {
-
-    ur_memory_order_capability_flags_t Capabilities =
-        UR_MEMORY_ORDER_CAPABILITY_FLAG_RELAXED |
-        UR_MEMORY_ORDER_CAPABILITY_FLAG_ACQUIRE |
-        UR_MEMORY_ORDER_CAPABILITY_FLAG_RELEASE |
-        UR_MEMORY_ORDER_CAPABILITY_FLAG_ACQ_REL |
-        UR_MEMORY_ORDER_CAPABILITY_FLAG_SEQ_CST;
-    return ReturnValue(Capabilities);
-  }
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
 
   default:
     // TODO: implement other parameters
diff --git a/unified-runtime/source/adapters/level_zero/v2/context.cpp b/unified-runtime/source/adapters/level_zero/v2/context.cpp
@@ -190,12 +190,6 @@ ur_result_t urContextGetInfo(ur_context_handle_t hContext,
   case UR_CONTEXT_INFO_USM_FILL2D_SUPPORT:
     // 2D USM fill is not supported.
     return ReturnValue(uint8_t{false});
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
   default:
     return UR_RESULT_ERROR_INVALID_ENUMERATION;
   }
diff --git a/unified-runtime/source/adapters/native_cpu/context.cpp b/unified-runtime/source/adapters/native_cpu/context.cpp
@@ -60,12 +60,6 @@ urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
     // case UR_CONTEXT_INFO_USM_MEMSET2D_SUPPORT:
     // 2D USM operations currently not supported.
     return returnValue(false);
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
   default:
     return UR_RESULT_ERROR_INVALID_ENUMERATION;
   }
diff --git a/unified-runtime/source/adapters/opencl/context.cpp b/unified-runtime/source/adapters/opencl/context.cpp
@@ -83,14 +83,6 @@ urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
   case UR_CONTEXT_INFO_USM_FILL2D_SUPPORT: {
     return ReturnValue(false);
   }
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES:
-  case UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES: {
-    /* These queries should be dealt with in context_impl.cpp by calling the
-     * queries of each device separately and building the intersection set. */
-    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
-  }
   case UR_CONTEXT_INFO_NUM_DEVICES:
   case UR_CONTEXT_INFO_DEVICES:
   case UR_CONTEXT_INFO_REFERENCE_COUNT: {
diff --git a/unified-runtime/source/loader/layers/validation/ur_valddi.cpp b/unified-runtime/source/loader/layers/validation/ur_valddi.cpp
@@ -883,7 +883,7 @@ __urdlllocal ur_result_t UR_APICALL urContextGetInfo(
     if (pPropValue == NULL && pPropSizeRet == NULL)
       return UR_RESULT_ERROR_INVALID_NULL_POINTER;
 
-    if (UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES < propName)
+    if (UR_CONTEXT_INFO_USM_FILL2D_SUPPORT < propName)
       return UR_RESULT_ERROR_INVALID_ENUMERATION;
 
     if (propSize == 0 && pPropValue != NULL)
diff --git a/unified-runtime/source/loader/ur_libapi.cpp b/unified-runtime/source/loader/ur_libapi.cpp
@@ -1331,7 +1331,7 @@ ur_result_t UR_APICALL urContextRelease(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hContext`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES < propName`
+///         + `::UR_CONTEXT_INFO_USM_FILL2D_SUPPORT < propName`
 ///     - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 ///         + If `propName` is not supported by the adapter.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
diff --git a/unified-runtime/source/ur_api.cpp b/unified-runtime/source/ur_api.cpp
@@ -1184,7 +1184,7 @@ ur_result_t UR_APICALL urContextRelease(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hContext`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES < propName`
+///         + `::UR_CONTEXT_INFO_USM_FILL2D_SUPPORT < propName`
 ///     - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 ///         + If `propName` is not supported by the adapter.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
diff --git a/unified-runtime/test/conformance/context/urContextGetInfo.cpp b/unified-runtime/test/conformance/context/urContextGetInfo.cpp
@@ -79,74 +79,6 @@ TEST_P(urContextGetInfoTest, SuccessReferenceCount) {
   ASSERT_GT(property_value, 0U);
 }
 
-TEST_P(urContextGetInfoTest, SuccessAtomicMemoryOrderCapabilities) {
-  const ur_context_info_t property_name =
-      UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES;
-  size_t property_size = 0;
-
-  ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
-      urContextGetInfo(context, property_name, 0, nullptr, &property_size),
-      property_name);
-  ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
-
-  ur_memory_order_capability_flags_t property_value = 0;
-  ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
-                                  &property_value, nullptr));
-
-  ASSERT_EQ(property_value & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
-}
-
-TEST_P(urContextGetInfoTest, SuccessAtomicMemoryScopeCapabilities) {
-  const ur_context_info_t property_name =
-      UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES;
-  size_t property_size = 0;
-
-  ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
-      urContextGetInfo(context, property_name, 0, nullptr, &property_size),
-      property_name);
-  ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
-
-  ur_memory_scope_capability_flags_t property_value = 0;
-  ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
-                                  &property_value, nullptr));
-
-  ASSERT_EQ(property_value & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
-}
-
-TEST_P(urContextGetInfoTest, SuccessAtomicFenceOrderCapabilities) {
-  const ur_context_info_t property_name =
-      UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES;
-  size_t property_size = 0;
-
-  ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
-      urContextGetInfo(context, property_name, 0, nullptr, &property_size),
-      property_name);
-  ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
-
-  ur_memory_order_capability_flags_t property_value = 0;
-  ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
-                                  &property_value, nullptr));
-
-  ASSERT_EQ(property_value & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
-}
-
-TEST_P(urContextGetInfoTest, SuccessAtomicFenceScopeCapabilities) {
-  const ur_context_info_t property_name =
-      UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES;
-  size_t property_size = 0;
-
-  ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
-      urContextGetInfo(context, property_name, 0, nullptr, &property_size),
-      property_name);
-  ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
-
-  ur_memory_scope_capability_flags_t property_value = 0;
-  ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
-                                  &property_value, nullptr));
-
-  ASSERT_EQ(property_value & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
-}
-
 TEST_P(urContextGetInfoTest, InvalidNullHandleContext) {
   uint32_t nDevices = 0;
   ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
diff --git a/unified-runtime/test/conformance/testing/include/uur/optional_queries.h b/unified-runtime/test/conformance/testing/include/uur/optional_queries.h
@@ -50,19 +50,6 @@ template <> inline bool isQueryOptional(ur_device_info_t query) {
                    query) != optional_ur_device_info_t.end();
 }
 
-constexpr std::array optional_ur_context_info_t = {
-    UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES,
-    UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES,
-    UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES,
-    UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES,
-};
-
-template <> inline bool isQueryOptional(ur_context_info_t query) {
-  return std::find(optional_ur_context_info_t.begin(),
-                   optional_ur_context_info_t.end(),
-                   query) != optional_ur_context_info_t.end();
-}
-
 constexpr std::array optional_ur_usm_alloc_info_t = {
     UR_USM_ALLOC_INFO_POOL,
 };
