Make ALLOC_INFO_POOL an optional query.

Author: aarongreig

include/ur_api.h

@@ -3389,7 +3389,7 @@ typedef enum ur_usm_alloc_info_t {
     UR_USM_ALLOC_INFO_BASE_PTR = 1, ///< [void *] Memory allocation base pointer info
     UR_USM_ALLOC_INFO_SIZE = 2,     ///< [size_t] Memory allocation size info
     UR_USM_ALLOC_INFO_DEVICE = 3,   ///< [::ur_device_handle_t] Memory allocation device info
-    UR_USM_ALLOC_INFO_POOL = 4,     ///< [::ur_usm_pool_handle_t] Memory allocation pool info
+    UR_USM_ALLOC_INFO_POOL = 4,     ///< [::ur_usm_pool_handle_t][optional-query] Memory allocation pool info
     /// @cond
     UR_USM_ALLOC_INFO_FORCE_UINT32 = 0x7fffffff
     /// @endcond

scripts/core/usm.yml

@@ -74,7 +74,7 @@ etors:
     - name: DEVICE
       desc: "[$x_device_handle_t] Memory allocation device info"
     - name: POOL
-      desc: "[$x_usm_pool_handle_t] Memory allocation pool info"
+      desc: "[$x_usm_pool_handle_t][optional-query] Memory allocation pool info"
 --- #--------------------------------------------------------------------------
 type: enum
 desc: "USM memory advice"

source/adapters/opencl/usm.cpp

@@ -669,7 +669,7 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
     PropNameCL = CL_MEM_ALLOC_DEVICE_INTEL;
     break;
   default:
-    return UR_RESULT_ERROR_INVALID_VALUE;
+    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   }
 
   size_t CheckPropSize = 0;

test/conformance/program/program_adapter_cuda.match

@@ -3,7 +3,6 @@ urProgramBuildTest.BuildFailure/*
 {{OPT}}urProgramCreateWithILTest.SuccessWithProperties/*
 {{OPT}}urProgramCreateWithILTest.BuildInvalidProgram/*
 # This test flakily fails
-<<<<<<< HEAD
 {{OPT}}urProgramGetBuildInfoSingleTest.LogIsNullTerminated/*
 {{OPT}}urProgramSetSpecializationConstantsTest.Success/*
 {{OPT}}urProgramSetSpecializationConstantsTest.UseDefaultValue/*
@@ -12,11 +11,3 @@ urProgramSetSpecializationConstantsTest.InvalidValueId/*
 urProgramSetSpecializationConstantsTest.InvalidValuePtr/*
 urProgramSetMultipleSpecializationConstantsTest.MultipleCalls/*
 urProgramSetMultipleSpecializationConstantsTest.SingleCall/*
-=======
-{{OPT}}urProgramGetBuildInfoSingleTest.LogIsNullTerminated/NVIDIA_CUDA_BACKEND___{{.*}}
-# CUDA doesn't expose kernel numbers or names
-{{OPT}}urProgramSetSpecializationConstantsTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
-{{OPT}}urProgramSetSpecializationConstantsTest.UseDefaultValue/NVIDIA_CUDA_BACKEND___{{.*}}
-urProgramSetMultipleSpecializationConstantsTest.MultipleCalls/NVIDIA_CUDA_BACKEND___{{.*}}
-urProgramSetMultipleSpecializationConstantsTest.SingleCall/NVIDIA_CUDA_BACKEND___{{.*}}
->>>>>>> aafd80ef (Fix most or possibly all match file issues.)

test/conformance/testing/include/uur/optional_queries.h

@@ -46,6 +46,16 @@ template <> inline bool isQueryOptional(ur_device_info_t query) {
                      query) != optional_ur_device_info_t.end();
 }
 
+constexpr std::array optional_ur_usm_alloc_info_t = {
+    UR_USM_ALLOC_INFO_POOL,
+};
+
+template <> inline bool isQueryOptional(ur_usm_alloc_info_t query) {
+    return std::find(optional_ur_usm_alloc_info_t.begin(),
+                     optional_ur_usm_alloc_info_t.end(),
+                     query) != optional_ur_usm_alloc_info_t.end();
+}
+
 constexpr std::array optional_ur_program_info_t = {
     UR_PROGRAM_INFO_NUM_KERNELS,
     UR_PROGRAM_INFO_KERNEL_NAMES,