intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not force cl_khr_3d_image_writes extension when compiling kernels

Browse Source 
Update usage of SUPPORTED_IMAGES flag and do not use images when disabled.
Use SUPPORTED_2_0 only on fully OCL 2.1 conformant platforms.

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2020-11-25 15:11:11 +01:00
committed by Compute-Runtime-Automation
parent 1792516043
commit 6c4b1f951c
56 changed files with 727 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h
View File

@@ -7,6 +7,7 @@
#pragma once
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
@@ -21,6 +22,8 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture,
public ::testing::Test {
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
BufferDefaults::context = new MockContext(pClDevice);
@@ -30,6 +33,9 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture,
}
void TearDown() override {
if (IsSkipped()) {
return;
}
delete dstImage;
delete srcBuffer;
delete BufferDefaults::context;
@@ -58,6 +64,7 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture,
public ::testing::WithParamInterface<uint32_t> {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
BufferDefaults::context = new MockContext(pClDevice);
context = new MockContext(pClDevice);
@@ -65,6 +72,9 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete srcBuffer;
delete BufferDefaults::context;
delete context;

7
opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp
View File

@@ -5,6 +5,8 @@
*
*/
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/source/built_ins/builtins_dispatch_builder.h"
#include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h"
#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
@@ -280,9 +282,8 @@ INSTANTIATE_TEST_CASE_P(MipMapCopyBufferToImageTest_GivenImageWithMipLevelNonZer
struct EnqueueCopyBufferToImageHw : public ::testing::Test {
void SetUp() override {
if (is32bit) {
GTEST_SKIP();
}
REQUIRE_64BIT_OR_SKIP();
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
context = std::make_unique<MockContext>(device.get());
dstImage = std::unique_ptr<Image>(Image2dHelper<>::create(context.get()));

9
opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h
View File

@@ -7,6 +7,7 @@
#pragma once
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
@@ -21,6 +22,7 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture,
public ::testing::Test {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
context = new MockContext(pClDevice);
srcImage = Image2dHelper<>::create(context);
@@ -28,6 +30,9 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete dstImage;
delete srcImage;
delete context;
@@ -55,11 +60,15 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture,
public ::testing::WithParamInterface<std::tuple<uint32_t, uint32_t>> {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
context = new MockContext(pClDevice);
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete context;
CommandEnqueueFixture::TearDown();
}

10
opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h
View File

@@ -7,6 +7,7 @@
#pragma once
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
@@ -21,6 +22,8 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture,
public ::testing::Test {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
BufferDefaults::context = new MockContext(pClDevice);
context = new MockContext(pClDevice);
@@ -29,6 +32,9 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete srcImage;
delete dstBuffer;
delete BufferDefaults::context;
@@ -57,6 +63,7 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture,
public ::testing::WithParamInterface<uint32_t> {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
BufferDefaults::context = new MockContext(pClDevice);
context = new MockContext(pClDevice);
@@ -64,6 +71,9 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete dstBuffer;
delete BufferDefaults::context;
delete context;

5
opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp
View File

@@ -280,9 +280,8 @@ INSTANTIATE_TEST_CASE_P(MipMapCopyImageToBufferTest_GivenImageWithMipLevelNonZer
struct EnqueueCopyImageToBufferHw : public ::testing::Test {
void SetUp() override {
if (is32bit) {
GTEST_SKIP();
}
REQUIRE_64BIT_OR_SKIP();
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
context = std::make_unique<MockContext>(device.get());
srcImage = std::unique_ptr<Image>(Image2dHelper<>::create(context.get()));

9
opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h
View File

@@ -6,22 +6,27 @@
*/
#pragma once
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "gtest/gtest.h"
#include "test.h"
namespace NEO {
struct EnqueueFillImageTestFixture : public CommandEnqueueFixture {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
context = new MockContext(pClDevice);
image = Image2dHelper<>::create(context);
}
void TearDown(void) override {
if (testing::Test::IsSkipped()) {
return;
}
delete image;
delete context;
CommandEnqueueFixture::TearDown();

6
opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp
View File

@@ -8,6 +8,7 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/os_interface/os_context.h"
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/source/event/user_event.h"
#include "opencl/source/helpers/memory_properties_helpers.h"
@@ -33,6 +34,8 @@ struct EnqueueMapImageTest : public ClDeviceFixture,
}
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
context = new MockContext(pClDevice);
@@ -40,6 +43,9 @@ struct EnqueueMapImageTest : public ClDeviceFixture,
}
void TearDown() override {
if (IsSkipped()) {
return;
}
delete image;
context->release();
CommandQueueFixture::TearDown();

6
opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h
View File

@@ -7,6 +7,7 @@
#pragma once
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
@@ -23,6 +24,8 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture,
using CommandQueueHwFixture::pCmdQ;
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
context = new MockContext(pClDevice);
@@ -33,6 +36,9 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete srcImage;
delete[] dstPtr;
delete context;

25
opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp
View File

@@ -8,6 +8,7 @@
#include "shared/source/command_stream/command_stream_receiver_hw.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/helpers/memory_properties_helpers.h"
@@ -123,6 +124,18 @@ struct EnqueueThreadingFixture : public ClDeviceFixture {
typedef Test<EnqueueThreadingFixture> EnqueueThreading;
struct EnqueueThreadingImage : EnqueueThreading {
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
EnqueueThreading::SetUp();
}
void TearDown() override {
if (!IsSkipped()) {
EnqueueThreading::TearDown();
}
}
};
HWTEST_F(EnqueueThreading, WhenEnqueuingReadBufferThenKernelHasOwnership) {
createCQ<FamilyType>();
@@ -199,7 +212,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingCopyBufferRectThenKernelHasOwnership) {
pCmdQ->enqueueCopyBufferRect(srcBuffer.get(), dstBuffer.get(), srcOrigin, dstOrigin, region, 0, 0, 0, 0, 0, nullptr, nullptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingCopyBufferToImageThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingCopyBufferToImageThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;
@@ -229,7 +242,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingCopyBufferToImageThenKernelHasOwnership)
pCmdQ->enqueueCopyBufferToImage(srcBuffer.get(), dstImage.get(), 0, dstOrigin, region, 0, nullptr, nullptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingCopyImageThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingCopyImageThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;
@@ -261,7 +274,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingCopyImageThenKernelHasOwnership) {
pCmdQ->enqueueCopyImage(srcImage.get(), dstImage.get(), srcOrigin, dstOrigin, region, 0, nullptr, nullptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingCopyImageToBufferThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingCopyImageToBufferThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;
@@ -303,7 +316,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingFillBufferThenKernelHasOwnership) {
pCmdQ->enqueueFillBuffer(buffer.get(), &pattern, sizeof(pattern), 0, 1024u, 0, nullptr, nullptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingFillImageThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingFillImageThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;
@@ -352,7 +365,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingReadBufferRectThenKernelHasOwnership) {
::alignedFree(ptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingReadImageThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingReadImageThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;
@@ -405,7 +418,7 @@ HWTEST_F(EnqueueThreading, WhenEnqueuingWriteBufferRectThenKernelHasOwnership) {
::alignedFree(ptr);
}
HWTEST_F(EnqueueThreading, WhenEnqueuingWriteImageThenKernelHasOwnership) {
HWTEST_F(EnqueueThreadingImage, WhenEnqueuingWriteImageThenKernelHasOwnership) {
createCQ<FamilyType>();
cl_int retVal;

5
opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h
View File

@@ -7,6 +7,7 @@
#pragma once
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
@@ -21,6 +22,7 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture,
public ::testing::Test {
void SetUp(void) override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
context = new MockContext(pClDevice);
@@ -32,6 +34,9 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture,
}
void TearDown(void) override {
if (IsSkipped()) {
return;
}
delete dstImage;
delete[] srcPtr;
delete context;

4
opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp
View File

@@ -35,6 +35,7 @@ struct GetSizeRequiredImageTest : public CommandEnqueueFixture,
}
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
CommandEnqueueFixture::SetUp();
srcImage = Image2dHelper<>::create(context);
@@ -44,6 +45,9 @@ struct GetSizeRequiredImageTest : public CommandEnqueueFixture,
}
void TearDown() override {
if (IsSkipped()) {
return;
}
delete dstImage;
delete srcImage;

5
opencl/test/unit_test/command_queue/oom_image_tests.cpp
View File

@@ -6,6 +6,7 @@
*/
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/event/event.h"
@@ -36,6 +37,7 @@ struct OOMCommandQueueImageTest : public ClDeviceFixture,
}
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
CommandQueueFixture::SetUp(context, pClDevice, 0);
@@ -63,6 +65,9 @@ struct OOMCommandQueueImageTest : public ClDeviceFixture,
}
void TearDown() override {
if (IsSkipped()) {
return;
}
delete dstImage;
delete srcImage;
context->release();

12
opencl/test/unit_test/command_queue/ooq_task_tests.cpp
View File

@@ -6,6 +6,7 @@
*/
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "shared/test/unit_test/test_macros/test_checks_shared.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
#include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
@@ -20,10 +21,21 @@ struct OOQFixtureFactory : public HelloWorldFixtureFactory {
template <typename TypeParam>
struct OOQTaskTypedTests : public HelloWorldTest<OOQFixtureFactory> {
void SetUp() override {
if (std::is_same<TypeParam, EnqueueCopyImageHelper<>>::value ||
std::is_same<TypeParam, EnqueueFillImageHelper<>>::value ||
std::is_same<TypeParam, EnqueueReadImageHelper<>>::value ||
std::is_same<TypeParam, EnqueueWriteImageHelper<>>::value) {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
}
DebugManager.flags.PerformImplicitFlushForNewResource.set(0);
DebugManager.flags.PerformImplicitFlushForIdleGpu.set(0);
HelloWorldTest<OOQFixtureFactory>::SetUp();
}
void TearDown() override {
if (!IsSkipped()) {
HelloWorldTest<OOQFixtureFactory>::TearDown();
}
}
DebugManagerStateRestore stateRestore;
};

31
opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp
View File

@@ -433,7 +433,14 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenFillingBu
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenReadingImageThenCommandMarkerShouldBeEnqueued) {
struct ZeroSizeEnqueueHandlerImageTest : ZeroSizeEnqueueHandlerTest {
void SetUp() override {
REQUIRE_IMAGES_OR_SKIP(defaultHwInfo);
ZeroSizeEnqueueHandlerTest::SetUp();
}
};
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenReadingImageThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Image> image(Image2dHelper<>::create(&context));
@@ -469,7 +476,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenReadingIm
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenReadingImageThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenReadingImageThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;
@@ -490,7 +497,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenReadingIm
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenWritingImageThenCommandMarkerShouldBeEnqueued) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenWritingImageThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Image> image(Image2dHelper<>::create(&context));
@@ -526,7 +533,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenWritingIm
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenWritingImageThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenWritingImageThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;
@@ -547,7 +554,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenWritingIm
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageThenCommandMarkerShouldBeEnqueued) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Image> srcImage(Image2dHelper<>::create(&context));
@@ -584,7 +591,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingIm
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;
@@ -606,7 +613,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingIm
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageToBufferThenCommandMarkerShouldBeEnqueued) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageToBufferThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Image> srcImage(Image2dHelper<>::create(&context));
@@ -642,7 +649,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingIm
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageToBufferThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingImageToBufferThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;
@@ -663,7 +670,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingIm
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBufferToImageThenCommandMarkerShouldBeEnqueued) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBufferToImageThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Buffer> srcBuffer(Buffer::create(&context, CL_MEM_READ_WRITE, 1024u, nullptr, retVal));
@@ -699,7 +706,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBu
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBufferToImageThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBufferToImageThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;
@@ -720,7 +727,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenCopyingBu
delete pEvent;
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenFillingImageThenCommandMarkerShouldBeEnqueued) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenFillingImageThenCommandMarkerShouldBeEnqueued) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
std::unique_ptr<Image> image(Image2dHelper<>::create(&context));
@@ -756,7 +763,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenFillingIm
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
}
HWTEST_F(ZeroSizeEnqueueHandlerTest, GivenZeroSizeEnqueueIsDetectedWhenFillingImageThenEventCommandTypeShouldBeUnchanged) {
HWTEST_F(ZeroSizeEnqueueHandlerImageTest, GivenZeroSizeEnqueueIsDetectedWhenFillingImageThenEventCommandTypeShouldBeUnchanged) {
auto mockCmdQ = std::unique_ptr<MockCommandQueueHw<FamilyType>>(new MockCommandQueueHw<FamilyType>(&context, pClDevice, 0));
cl_event event;