Merge pull request #1593 from kbenzie/benie/cl-update-device-match-file

kbenzie · web-flow · commit 4ea7253b2417 · 2024-05-10T10:07:53.000+01:00
[CL] Update device CTS match file
diff --git a/.github/scripts/get_system_info.sh b/.github/scripts/get_system_info.sh
@@ -53,7 +53,7 @@ function system_info {
 	echo "**********/proc/meminfo**********"
 	cat /proc/meminfo
 	echo "**********build/bin/urinfo**********"
-	$(dirname "$(readlink -f "$0")")/../../build/bin/urinfo || true
+	$(dirname "$(readlink -f "$0")")/../../build/bin/urinfo --no-linear-ids --verbose || true
 	echo "******OpenCL*******"
 	# The driver version of OpenCL Graphics is the compute-runtime version
 	clinfo || echo "OpenCL not installed"
diff --git a/source/adapters/opencl/device.cpp b/source/adapters/opencl/device.cpp
@@ -507,7 +507,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
           cl_adapter::cast<cl_device_id>(hDevice), {"cl_khr_fp16"}, Supported));
 
       if (!Supported) {
-        return UR_RESULT_ERROR_INVALID_ENUMERATION;
+        return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
       }
     }
 
diff --git a/test/conformance/device/device_adapter_opencl.match b/test/conformance/device/device_adapter_opencl.match
@@ -1 +0,0 @@
-urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HALF_FP_CONFIG

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,`
`507`	`507`	`cl_adapter::cast<cl_device_id>(hDevice), {"cl_khr_fp16"}, Supported));`
`508`	`508`
`509`	`509`	`if (!Supported) {`
`510`		`- return UR_RESULT_ERROR_INVALID_ENUMERATION;`
	`510`	`+ return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`
Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HALF_FP_CONFIG`