Skip to content

Commit 54829f0

Browse files
kbenziekbenzie
authored
Merge pull request #1144 from kbenzie/benie/cts-check-image-support
[CTS] Check if images are supported before testing
2 parents 7371150 + b1da44d commit 54829f0

File tree

5 files changed

+31
-58
lines changed

5 files changed

+31
-58
lines changed

‎source/adapters/level_zero/device.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
323323
return ReturnValue(
324324
uint64_t{Device->ZeDeviceComputeProperties->maxSharedLocalMemory});
325325
case UR_DEVICE_INFO_IMAGE_SUPPORTED:
326-
return ReturnValue(static_cast<uint32_t>(
327-
Device->ZeDeviceImageProperties->maxImageDims1D > 0));
326+
return ReturnValue(Device->ZeDeviceImageProperties->maxImageDims1D > 0);
328327
case UR_DEVICE_INFO_HOST_UNIFIED_MEMORY:
329328
return ReturnValue(
330329
static_cast<uint32_t>((Device->ZeDeviceProperties->flags &

‎test/conformance/device/device_adapter_level_zero.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
2-
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_IMAGE_SUPPORTED
32
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE
43
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ERROR_CORRECTION_SUPPORT
54
urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HOST_UNIFIED_MEMORY

‎test/conformance/memory/memory_adapter_cuda.match

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
urMemBufferCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
2-
{{OPT}}urMemGetInfoImageTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_SIZE
3-
{{OPT}}urMemGetInfoImageTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_CONTEXT
4-
urMemImageGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_IMAGE_INFO_ROW_PITCH
5-
urMemImageGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_IMAGE_INFO_SLICE_PITCH

‎test/conformance/memory/memory_adapter_native_cpu.match

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,12 @@ urMemGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_SIZE
44
urMemGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_CONTEXT
55
urMemGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_SIZE
66
urMemGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_CONTEXT
7-
urMemGetInfoImageTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_SIZE
8-
urMemGetInfoImageTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_INFO_CONTEXT
97
urMemImageCreateTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
108
urMemImageCreateTest.InvalidSize/SYCL_NATIVE_CPU___SYCL_Native_CPU_
119
urMemImageCreateTest.InvalidImageDescStype/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1210
urMemImageCreateTest.InvalidImageDescNumMipLevel/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1311
urMemImageCreateTest.InvalidImageDescNumSamples/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1412
urMemImageCreateTest.InvalidImageDescRowPitch/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1513
urMemImageCreateTest.InvalidImageDescSlicePitch/SYCL_NATIVE_CPU___SYCL_Native_CPU_
16-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
17-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
18-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
19-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
20-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
21-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
22-
urMemImageGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
23-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
24-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
25-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
26-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
27-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
28-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
29-
urMemImageGetInfoTest.InvalidNullHandleImage/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
30-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
31-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
32-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
33-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
34-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
35-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
36-
urMemImageGetInfoTest.InvalidEnumerationImageInfoType/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
37-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
38-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
39-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
40-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
41-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
42-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
43-
urMemImageGetInfoTest.InvalidSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
44-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
45-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
46-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
47-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
48-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
49-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
50-
urMemImageGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
51-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
52-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
53-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
54-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
55-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
56-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
57-
urMemImageGetInfoTest.InvalidNullPointerParamValue/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
58-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_FORMAT
59-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ELEMENT_SIZE
60-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_ROW_PITCH
61-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_SLICE_PITCH
62-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_WIDTH
63-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_HEIGHT
64-
urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_IMAGE_INFO_DEPTH
6514
urMemReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
6615
urMemRetainTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_

‎test/conformance/testing/include/uur/fixtures.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ struct urMemBufferTest : urContextTest {
180180
struct urMemImageTest : urContextTest {
181181
void SetUp() override {
182182
UUR_RETURN_ON_FATAL_FAILURE(urContextTest::SetUp());
183+
ur_bool_t imageSupported = false;
184+
ASSERT_SUCCESS(
185+
urDeviceGetInfo(this->device, UR_DEVICE_INFO_IMAGE_SUPPORTED,
186+
sizeof(ur_bool_t), &imageSupported, nullptr));
187+
if (!imageSupported) {
188+
GTEST_SKIP();
189+
}
183190
}
184191

185192
void TearDown() override {
@@ -276,6 +283,13 @@ template <class T> struct urMemBufferTestWithParam : urContextTestWithParam<T> {
276283
template <class T> struct urMemImageTestWithParam : urContextTestWithParam<T> {
277284
void SetUp() override {
278285
UUR_RETURN_ON_FATAL_FAILURE(urContextTestWithParam<T>::SetUp());
286+
ur_bool_t imageSupported = false;
287+
ASSERT_SUCCESS(
288+
urDeviceGetInfo(this->device, UR_DEVICE_INFO_IMAGE_SUPPORTED,
289+
sizeof(ur_bool_t), &imageSupported, nullptr));
290+
if (!imageSupported) {
291+
GTEST_SKIP();
292+
}
279293
ASSERT_SUCCESS(urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE,
280294
&format, &desc, nullptr, &image));
281295
ASSERT_NE(nullptr, image);
@@ -551,6 +565,13 @@ struct urMemBufferQueueTest : urQueueTest {
551565
struct urMemImageQueueTest : urQueueTest {
552566
void SetUp() override {
553567
UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp());
568+
ur_bool_t imageSupported = false;
569+
ASSERT_SUCCESS(
570+
urDeviceGetInfo(this->device, UR_DEVICE_INFO_IMAGE_SUPPORTED,
571+
sizeof(ur_bool_t), &imageSupported, nullptr));
572+
if (!imageSupported) {
573+
GTEST_SKIP();
574+
}
554575
ASSERT_SUCCESS(urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE,
555576
&format, &desc1D, nullptr, &image1D));
556577

@@ -626,6 +647,15 @@ struct urMemImageQueueTest : urQueueTest {
626647
struct urMultiDeviceMemImageTest : urMultiDeviceContextTest {
627648
void SetUp() override {
628649
UUR_RETURN_ON_FATAL_FAILURE(urMultiDeviceContextTest::SetUp());
650+
for (auto device : DevicesEnvironment::instance->devices) {
651+
ur_bool_t imageSupported = false;
652+
ASSERT_SUCCESS(
653+
urDeviceGetInfo(device, UR_DEVICE_INFO_IMAGE_SUPPORTED,
654+
sizeof(ur_bool_t), &imageSupported, nullptr));
655+
if (!imageSupported) {
656+
GTEST_SKIP();
657+
}
658+
}
629659
ASSERT_SUCCESS(urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE,
630660
&format, &desc1D, nullptr, &image1D));
631661

0 commit comments

Comments
 (0)