Fix most or possibly all match file issues.

Author: aarongreig

scripts/core/device.yml

@@ -200,7 +200,7 @@ etors:
     - name: VENDOR_ID
       desc: "[uint32_t] vendor Id of the device"
     - name: DEVICE_ID
-      desc: "[uint32_t] Id of the device"
+      desc: "[uint32_t][optional-query] Id of the device"
     - name: MAX_COMPUTE_UNITS
       desc: "[uint32_t] the number of compute units"
     - name: MAX_WORK_ITEM_DIMENSIONS

test/conformance/device/device_adapter_cuda.match

@@ -1,3 +1,4 @@
 {{NONDETERMINISTIC}}
 urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
+urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_READ_WRITE_IMAGE_ARGS

test/conformance/device/device_adapter_native_cpu.match

@@ -28,4 +28,7 @@ urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_WORK_GROUPS_3D
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ASYNC_BARRIER
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_REGISTERS_PER_WORK_GROUP
+urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES
+urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES
+urDeviceGetInfoTest.Success/UR_DEVICE_INFO_IP_VERSION
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS

test/conformance/kernel/kernel_adapter_opencl.match

@@ -1,2 +1 @@
 {{NONDETERMINISTIC}}
-urKernelGetInfoTest.Success/Intel_R__OpenCL_{{.*}}_UR_KERNEL_INFO_NUM_REGS

test/conformance/program/program_adapter_cuda.match

@@ -6,8 +6,6 @@ urProgramBuildTest.BuildFailure/NVIDIA_CUDA_BACKEND___{{.*}}_
 # This test flakily fails
 {{OPT}}urProgramGetBuildInfoSingleTest.LogIsNullTerminated/NVIDIA_CUDA_BACKEND___{{.*}}
 # CUDA doesn't expose kernel numbers or names
-urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROGRAM_INFO_NUM_KERNELS
-urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROGRAM_INFO_KERNEL_NAMES
 {{OPT}}urProgramSetSpecializationConstantsTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
 {{OPT}}urProgramSetSpecializationConstantsTest.UseDefaultValue/NVIDIA_CUDA_BACKEND___{{.*}}
 urProgramSetMultipleSpecializationConstantsTest.MultipleCalls/NVIDIA_CUDA_BACKEND___{{.*}}

test/conformance/usm/urUSMGetMemAllocInfo.cpp

@@ -3,10 +3,9 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <map>
 #include <uur/fixtures.h>
 
-struct urUSMAllocInfoTest
+struct urUSMGetMemAllocInfoTest
     : uur::urUSMDeviceAllocTestWithParam<ur_usm_alloc_info_t> {
     void SetUp() override {
         use_pool = getParam() == UR_USM_ALLOC_INFO_POOL;
@@ -15,7 +14,7 @@ struct urUSMAllocInfoTest
     }
 };
 
-UUR_TEST_SUITE_P(urUSMAllocInfoTest,
+UUR_TEST_SUITE_P(urUSMGetMemAllocInfoTest,
                  ::testing::Values(UR_USM_ALLOC_INFO_TYPE,
                                    UR_USM_ALLOC_INFO_BASE_PTR,
                                    UR_USM_ALLOC_INFO_SIZE,
@@ -31,7 +30,7 @@ static std::unordered_map<ur_usm_alloc_info_t, size_t> usm_info_size_map = {
     {UR_USM_ALLOC_INFO_POOL, sizeof(ur_usm_pool_handle_t)},
 };
 
-TEST_P(urUSMAllocInfoTest, Success) {
+TEST_P(urUSMGetMemAllocInfoTest, Success) {
     size_t size = 0;
     auto alloc_info = getParam();
     ASSERT_QUERY_SUCCESS(
@@ -81,34 +80,34 @@ TEST_P(urUSMAllocInfoTest, Success) {
     }
 }
 
-using urUSMGetMemAllocInfoTest = uur::urUSMDeviceAllocTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoTest);
+using urUSMGetMemAllocInfoNegativeTest = uur::urUSMDeviceAllocTest;
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoNegativeTest);
 
-TEST_P(urUSMGetMemAllocInfoTest, InvalidNullHandleContext) {
+TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullHandleContext) {
     ur_usm_type_t USMType;
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
                      urUSMGetMemAllocInfo(nullptr, ptr, UR_USM_ALLOC_INFO_TYPE,
                                           sizeof(ur_usm_type_t), &USMType,
                                           nullptr));
 }
 
-TEST_P(urUSMGetMemAllocInfoTest, InvalidNullPointerMem) {
+TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullPointerMem) {
     ur_usm_type_t USMType;
     ASSERT_EQ_RESULT(
         UR_RESULT_ERROR_INVALID_NULL_POINTER,
         urUSMGetMemAllocInfo(context, nullptr, UR_USM_ALLOC_INFO_TYPE,
                              sizeof(ur_usm_type_t), &USMType, nullptr));
 }
 
-TEST_P(urUSMGetMemAllocInfoTest, InvalidEnumeration) {
+TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidEnumeration) {
     ur_usm_type_t USMType;
     ASSERT_EQ_RESULT(
         UR_RESULT_ERROR_INVALID_ENUMERATION,
         urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_FORCE_UINT32,
                              sizeof(ur_usm_type_t), &USMType, nullptr));
 }
 
-TEST_P(urUSMGetMemAllocInfoTest, InvalidValuePropSize) {
+TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidValuePropSize) {
     ur_usm_type_t USMType;
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_SIZE,
                      urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_TYPE,