Improve image aub tests

BartoszDunajski · Compute-Runtime-Automation · commit 5ab638658102 · 2019-11-13T19:23:56.000+01:00
Change-Id: I14e37cbc87606a702f153c8823bbe883398f4365
Signed-off-by: Dunajski, Bartosz &lt;bartosz.dunajski@intel.com&gt;
diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp
@@ -85,11 +85,12 @@ struct AubFillImage
     typedef AUBCommandStreamFixture CommandStreamFixture;
 
     void SetUp() override {
-        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
-        CommandStreamFixture::SetUp(pCmdQ);
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
+        CommandStreamFixture::SetUp(pCmdQ);
+
         context = std::make_unique<MockContext>(pDevice);
     }
 
diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp
@@ -38,11 +38,12 @@ struct AUBMapImage
     using AUBCommandStreamFixture::SetUp;
 
     void SetUp() override {
-        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
-        CommandStreamFixture::SetUp(pCmdQ);
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
+        CommandStreamFixture::SetUp(pCmdQ);
+
         context = std::make_unique<MockContext>(pDevice);
     }
 
diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp
@@ -41,11 +41,12 @@ struct AUBReadImage
     using AUBCommandStreamFixture::SetUp;
 
     void SetUp() override {
-        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
-        CommandStreamFixture::SetUp(pCmdQ);
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
+        CommandStreamFixture::SetUp(pCmdQ);
+
         context = std::make_unique<MockContext>(pDevice);
     }
 
diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h
@@ -20,10 +20,10 @@ struct AUBImageUnaligned
       public ::testing::Test {
 
     void SetUp() override {
-        CommandEnqueueAUBFixture::SetUp();
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandEnqueueAUBFixture::SetUp();
     }
 
     void TearDown() override {
diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp
@@ -39,11 +39,12 @@ struct AUBWriteImage
     using AUBCommandStreamFixture::SetUp;
 
     void SetUp() override {
-        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
-        CommandStreamFixture::SetUp(pCmdQ);
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
+        CommandStreamFixture::SetUp(pCmdQ);
+
         context = std::make_unique<MockContext>(pDevice);
     }
 
diff --git a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp b/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp
@@ -35,11 +35,11 @@ struct AUBCreateImage
     using AUBCommandStreamFixture::SetUp;
 
     void SetUp() override {
-        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
-        CommandStreamFixture::SetUp(pCmdQ);
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
+        CommandStreamFixture::SetUp(pCmdQ);
 
         imageFormat.image_channel_data_type = CL_UNORM_INT8;
         imageFormat.image_channel_order = CL_RGBA;
@@ -72,10 +72,10 @@ struct AUBCreateImage
 struct AUBCreateImageArray : public AUBCreateImage,
                              public ::testing::WithParamInterface<uint32_t /*cl_mem_object_type*/> {
     void SetUp() override {
-        AUBCreateImage::SetUp();
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        AUBCreateImage::SetUp();
     }
     void TearDown() override {
         AUBCreateImage::TearDown();
@@ -175,10 +175,10 @@ HWTEST_P(AUBCreateImageArray, CheckArrayImages) {
 struct AUBCreateImageHostPtr : public AUBCreateImage,
                                public ::testing::WithParamInterface<uint64_t /*cl_mem_object_type*/> {
     void SetUp() override {
-        AUBCreateImage::SetUp();
-        if (!pDevice->getDeviceInfo().imageSupport) {
+        if (!(platformDevices[0]->capabilityTable.supportsImages)) {
             GTEST_SKIP();
         }
+        AUBCreateImage::SetUp();
     }
     void TearDown() override {
         AUBCreateImage::TearDown();

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,12 @@ struct AubFillImage`
`85`	`85`	`typedef AUBCommandStreamFixture CommandStreamFixture;`
`86`	`86`
`87`	`87`	`void SetUp() override {`
`88`		`- CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
`89`		`- CommandStreamFixture::SetUp(pCmdQ);`
`90`		`- if (!pDevice->getDeviceInfo().imageSupport) {`
	`88`	`+ if (!(platformDevices[0]->capabilityTable.supportsImages)) {`
`91`	`89`	`GTEST_SKIP();`
`92`	`90`	`}`
	`91`	`+ CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
	`92`	`+ CommandStreamFixture::SetUp(pCmdQ);`
	`93`	`+`
`93`	`94`	`context = std::make_unique<MockContext>(pDevice);`
`94`	`95`	`}`
`95`	`96`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,12 @@ struct AUBMapImage`
`38`	`38`	`using AUBCommandStreamFixture::SetUp;`
`39`	`39`
`40`	`40`	`void SetUp() override {`
`41`		`- CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
`42`		`- CommandStreamFixture::SetUp(pCmdQ);`
`43`		`- if (!pDevice->getDeviceInfo().imageSupport) {`
	`41`	`+ if (!(platformDevices[0]->capabilityTable.supportsImages)) {`
`44`	`42`	`GTEST_SKIP();`
`45`	`43`	`}`
	`44`	`+ CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
	`45`	`+ CommandStreamFixture::SetUp(pCmdQ);`
	`46`	`+`
`46`	`47`	`context = std::make_unique<MockContext>(pDevice);`
`47`	`48`	`}`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ struct AUBReadImage`
`41`	`41`	`using AUBCommandStreamFixture::SetUp;`
`42`	`42`
`43`	`43`	`void SetUp() override {`
`44`		`- CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
`45`		`- CommandStreamFixture::SetUp(pCmdQ);`
`46`		`- if (!pDevice->getDeviceInfo().imageSupport) {`
	`44`	`+ if (!(platformDevices[0]->capabilityTable.supportsImages)) {`
`47`	`45`	`GTEST_SKIP();`
`48`	`46`	`}`
	`47`	`+ CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
	`48`	`+ CommandStreamFixture::SetUp(pCmdQ);`
	`49`	`+`
`49`	`50`	`context = std::make_unique<MockContext>(pDevice);`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ struct AUBImageUnaligned`
`20`	`20`	`public ::testing::Test {`
`21`	`21`
`22`	`22`	`void SetUp() override {`
`23`		`- CommandEnqueueAUBFixture::SetUp();`
`24`		`- if (!pDevice->getDeviceInfo().imageSupport) {`
	`23`	`+ if (!(platformDevices[0]->capabilityTable.supportsImages)) {`
`25`	`24`	`GTEST_SKIP();`
`26`	`25`	`}`
	`26`	`+ CommandEnqueueAUBFixture::SetUp();`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`void TearDown() override {`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ struct AUBWriteImage`
`39`	`39`	`using AUBCommandStreamFixture::SetUp;`
`40`	`40`
`41`	`41`	`void SetUp() override {`
`42`		`- CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
`43`		`- CommandStreamFixture::SetUp(pCmdQ);`
`44`		`- if (!pDevice->getDeviceInfo().imageSupport) {`
	`42`	`+ if (!(platformDevices[0]->capabilityTable.supportsImages)) {`
`45`	`43`	`GTEST_SKIP();`
`46`	`44`	`}`
	`45`	`+ CommandDeviceFixture::SetUp(cl_command_queue_properties(0));`
	`46`	`+ CommandStreamFixture::SetUp(pCmdQ);`
	`47`	`+`
`47`	`48`	`context = std::make_unique<MockContext>(pDevice);`
`48`	`49`	`}`
`49`	`50`