Rename ocl DeviceFixture and add shared tests specific one

Change-Id: Ib61e987388ba14b721a573e3e84332a7f6c9ef9c
Signed-off-by: Konstanty Misiak <konstanty.misiak@intel.com>
This commit is contained in:
Konstanty Misiak
2020-05-28 14:05:12 +02:00
committed by sys_ocldev
parent d5ad9b42c1
commit aa8e9fb634
208 changed files with 611 additions and 546 deletions

View File

@@ -20,7 +20,7 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h"
#include "opencl/test/unit_test/fixtures/buffer_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
@@ -31,7 +31,7 @@
using namespace NEO;
struct EnqueueSvmTest : public DeviceFixture,
struct EnqueueSvmTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::Test {
typedef CommandQueueHwFixture CommandQueueFixture;
@@ -41,7 +41,7 @@ struct EnqueueSvmTest : public DeviceFixture,
void SetUp() override {
REQUIRE_SVM_OR_SKIP(defaultHwInfo);
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
ptrSVM = context->getSVMAllocsManager()->createSVMAlloc(pDevice->getRootDeviceIndex(), 256, {}, {});
}
@@ -52,7 +52,7 @@ struct EnqueueSvmTest : public DeviceFixture,
}
context->getSVMAllocsManager()->freeSVMAlloc(ptrSVM);
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_int retVal = CL_SUCCESS;
@@ -890,14 +890,14 @@ TEST(CreateSvmAllocTests, givenVariousSvmAllocationPropertiesWhenAllocatingSvmTh
}
}
struct EnqueueSvmTestLocalMemory : public DeviceFixture,
struct EnqueueSvmTestLocalMemory : public ClDeviceFixture,
public ::testing::Test {
void SetUp() override {
REQUIRE_SVM_OR_SKIP(defaultHwInfo);
dbgRestore = std::make_unique<DebugManagerStateRestore>();
DebugManager.flags.EnableLocalMemory.set(1);
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = std::make_unique<MockContext>(pClDevice, true);
size = 256;
svmPtr = context->getSVMAllocsManager()->createSVMAlloc(pDevice->getRootDeviceIndex(), size, {}, {});
@@ -911,7 +911,7 @@ struct EnqueueSvmTestLocalMemory : public DeviceFixture,
}
context->getSVMAllocsManager()->freeSVMAlloc(svmPtr);
context.reset(nullptr);
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_int retVal = CL_SUCCESS;