rework get info test so devicedefault and size is in another suite

Author: martygrant

bisect.sh

@@ -1,2 +1,2 @@
-urQueueGetInfoTest.DeviceDefault/*
-urQueueGetInfoTest.Size/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.DeviceDefault/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.Size/*

test/conformance/queue/queue_adapter_cuda.match

@@ -1,2 +1,2 @@
-urQueueGetInfoTest.DeviceDefault/*
-urQueueGetInfoTest.Size/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.DeviceDefault/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.Size/*

test/conformance/queue/queue_adapter_hip.match

@@ -1,2 +1,2 @@
-urQueueGetInfoTest.DeviceDefault/*
-urQueueGetInfoTest.Size/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.DeviceDefault/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.Size/*

test/conformance/queue/queue_adapter_level_zero.match

@@ -1,2 +1,2 @@
-urQueueGetInfoTest.DeviceDefault/*
-urQueueGetInfoTest.Size/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.DeviceDefault/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.Size/*

test/conformance/queue/queue_adapter_level_zero_v2.match

@@ -5,10 +5,10 @@ urQueueCreateWithParamTest.MatchingDeviceHandles/*
 urQueueFlushTest.Success/*
 urQueueGetInfoTest.Context/*
 urQueueGetInfoTest.Device/*
-urQueueGetInfoTest.DeviceDefault/*
 urQueueGetInfoTest.Flags/*
 urQueueGetInfoTest.ReferenceCount/*
 urQueueGetInfoTest.EmptyQueue/*
 urQueueGetInfoTest.InvalidSizeSmall/*
+urQueueGetInfoDeviceQueueTestWithInfoParam.DeviceDefault/*
 urQueueRetainTest.Success/*
 urQueueReleaseTest.Success/*

test/conformance/queue/queue_adapter_native_cpu.match

@@ -37,21 +37,6 @@ TEST_P(urQueueGetInfoTest, Device) {
     ASSERT_EQ(device, *returned_device);
 }
 
-TEST_P(urQueueGetInfoTest, DeviceDefault) {
-    size_t size = 0;
-    auto infoType = UR_QUEUE_INFO_DEVICE_DEFAULT;
-    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
-    ASSERT_EQ(sizeof(ur_queue_handle_t), size);
-
-    std::vector<uint8_t> data(size);
-    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, size, data.data(), nullptr));
-
-    auto returned_default_queue =
-        reinterpret_cast<ur_queue_handle_t *>(data.data());
-    ASSERT_EQ(queue, *returned_default_queue);
-}
-
 TEST_P(urQueueGetInfoTest, Flags) {
     size_t size = 0;
     auto infoType = UR_QUEUE_INFO_FLAGS;
@@ -80,20 +65,6 @@ TEST_P(urQueueGetInfoTest, ReferenceCount) {
     ASSERT_GT(*returned_reference_count, 0U);
 }
 
-TEST_P(urQueueGetInfoTest, Size) {
-    size_t size = 0;
-    auto infoType = UR_QUEUE_INFO_SIZE;
-    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
-    ASSERT_EQ(sizeof(uint32_t), size);
-
-    std::vector<uint8_t> data(size);
-    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, size, data.data(), nullptr));
-
-    auto returned_size = reinterpret_cast<uint32_t *>(data.data());
-    ASSERT_GT(*returned_size, 0);
-}
-
 TEST_P(urQueueGetInfoTest, EmptyQueue) {
     size_t size = 0;
     auto infoType = UR_QUEUE_INFO_EMPTY;
@@ -152,3 +123,64 @@ TEST_P(urQueueGetInfoTest, InvalidNullPointerPropSizeRet) {
         UR_RESULT_ERROR_INVALID_NULL_POINTER,
         urQueueGetInfo(queue, UR_QUEUE_INFO_CONTEXT, 0, nullptr, nullptr));
 }
+
+struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {
+    void SetUp() {
+        urQueueGetInfoTest::SetUp();
+        ur_queue_flags_t deviceQueueCapabilities;
+        ASSERT_SUCCESS(
+            urDeviceGetInfo(device, UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES,
+                            sizeof(deviceQueueCapabilities),
+                            &deviceQueueCapabilities, nullptr));
+        if (!deviceQueueCapabilities) {
+            GTEST_SKIP() << "Queue on device is not supported.";
+        }
+        ASSERT_SUCCESS(
+            urQueueCreate(context, device, &queueProperties, &queue));
+    }
+
+    void TearDown() {
+        if (queue) {
+            ASSERT_SUCCESS(urQueueRelease(queue));
+        }
+        urQueueGetInfoTest::TearDown();
+    }
+
+    ur_queue_handle_t queue = nullptr;
+    ur_queue_properties_t queueProperties = {
+        UR_STRUCTURE_TYPE_QUEUE_PROPERTIES, nullptr,
+        UR_QUEUE_FLAG_ON_DEVICE | UR_QUEUE_FLAG_ON_DEVICE_DEFAULT |
+            UR_QUEUE_FLAG_OUT_OF_ORDER_EXEC_MODE_ENABLE};
+};
+
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urQueueGetInfoDeviceQueueTestWithInfoParam);
+
+TEST_P(urQueueGetInfoDeviceQueueTestWithInfoParam, DeviceDefault) {
+
+    size_t size = 0;
+    auto infoType = UR_QUEUE_INFO_DEVICE_DEFAULT;
+    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, 0, nullptr, &size));
+    ASSERT_NE(size, 0);
+    ASSERT_EQ(sizeof(ur_queue_handle_t), size);
+
+    std::vector<uint8_t> data(size);
+    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, size, data.data(), nullptr));
+
+    auto returned_queue = reinterpret_cast<ur_queue_handle_t *>(data.data());
+    ASSERT_EQ(queue, *returned_queue);
+}
+
+TEST_P(urQueueGetInfoDeviceQueueTestWithInfoParam, Size) {
+
+    size_t size = 0;
+    auto infoType = UR_QUEUE_INFO_SIZE;
+    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, 0, nullptr, &size));
+    ASSERT_NE(size, 0);
+    ASSERT_EQ(sizeof(uint32_t), size);
+
+    std::vector<uint8_t> data(size);
+    ASSERT_SUCCESS(urQueueGetInfo(queue, infoType, size, data.data(), nullptr));
+
+    auto returned_size = reinterpret_cast<uint32_t *>(data.data());
+    ASSERT_GT(*returned_size, 0);
+}

test/conformance/queue/urQueueGetInfo.cpp

@@ -365,9 +365,7 @@ struct urQueueTest : urContextTest {
     }
 
     ur_queue_properties_t queue_properties = {
-        UR_STRUCTURE_TYPE_QUEUE_PROPERTIES, nullptr,
-        UR_QUEUE_FLAG_ON_DEVICE | UR_QUEUE_FLAG_ON_DEVICE_DEFAULT |
-            UR_QUEUE_FLAG_OUT_OF_ORDER_EXEC_MODE_ENABLE};
+        UR_STRUCTURE_TYPE_QUEUE_PROPERTIES, nullptr, 0};
     ur_queue_handle_t queue = nullptr;
 };