Add test and use same error across adapters

Author: againull

source/adapters/native_cpu/device.cpp

@@ -365,8 +365,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
   case UR_DEVICE_INFO_MAX_WORK_GROUPS_3D:
   case UR_DEVICE_INFO_MEMORY_CLOCK_RATE:
   case UR_DEVICE_INFO_MEMORY_BUS_WIDTH:
-  case UR_DEVICE_INFO_2D_BLOCK_ARRAY_CAPABILITIES_EXP:
     return UR_RESULT_ERROR_INVALID_VALUE;
+  case UR_DEVICE_INFO_2D_BLOCK_ARRAY_CAPABILITIES_EXP:
+    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   case UR_DEVICE_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES: {
     // Currently for Native CPU fences are implemented using OCK
     // builtins, so we have different capabilities than atomic operations

test/adapters/level_zero/CMakeLists.txt

@@ -29,6 +29,7 @@ if(UR_BUILD_ADAPTER_L0)
         target_link_libraries(test-adapter-level_zero PRIVATE
             LevelZeroLoader
             LevelZeroLoader-Headers
+            ComputeRuntimeLevelZero-Headers
         )
 
         target_include_directories(test-adapter-level_zero PRIVATE

test/conformance/device/urDeviceGetInfo.cpp

@@ -115,7 +115,8 @@ static std::unordered_map<ur_device_info_t, size_t> device_info_size_map = {
     {UR_DEVICE_INFO_MAX_REGISTERS_PER_WORK_GROUP, sizeof(uint32_t)},
     {UR_DEVICE_INFO_COMPONENT_DEVICES, sizeof(uint32_t)},
     {UR_DEVICE_INFO_COMPOSITE_DEVICE, sizeof(ur_device_handle_t)},
-};
+    {UR_DEVICE_INFO_2D_BLOCK_ARRAY_CAPABILITIES_EXP,
+     sizeof(ur_exp_device_2d_block_array_capability_flags_t)}};
 
 struct urDeviceGetInfoTest : uur::urAllDevicesTest,
                              ::testing::WithParamInterface<ur_device_info_t> {
@@ -236,7 +237,8 @@ INSTANTIATE_TEST_SUITE_P(
         UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED,         //
         UR_DEVICE_INFO_MAX_REGISTERS_PER_WORK_GROUP,           //
         UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT,                 //
-        UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS     //
+        UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS,    //
+        UR_DEVICE_INFO_2D_BLOCK_ARRAY_CAPABILITIES_EXP         //
         ),
     [](const ::testing::TestParamInfo<ur_device_info_t> &info) {
         std::stringstream ss;