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

@ -12,7 +12,7 @@
#include "opencl/source/helpers/surface_formats.h"
#include "opencl/source/kernel/kernel.h"
#include "opencl/source/mem_obj/image.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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
#include "opencl/test/unit_test/mocks/mock_program.h"
@ -20,14 +20,14 @@
using namespace NEO;
class MediaImageSetArgTest : public DeviceFixture,
class MediaImageSetArgTest : public ClDeviceFixture,
public testing::Test {
public:
MediaImageSetArgTest() = default;
protected:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
pKernelInfo = std::make_unique<KernelInfo>();
program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
@ -65,7 +65,7 @@ class MediaImageSetArgTest : public DeviceFixture,
delete pKernel;
delete context;
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_int retVal = CL_SUCCESS;

View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/mocks/mock_ostime.h"
#include "cl_api_tests.h"

View File

@ -7,7 +7,7 @@
#include "shared/source/memory_manager/unified_memory_manager.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/mocks/mock_kernel.h"
#include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
#include "test.h"
@ -16,11 +16,11 @@
using namespace NEO;
class KernelArgSvmFixture : public ApiFixture<>, public DeviceFixture {
class KernelArgSvmFixture : public ApiFixture<>, public ClDeviceFixture {
protected:
void SetUp() override {
ApiFixture::SetUp();
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
REQUIRE_SVM_OR_SKIP(defaultHwInfo);
// define kernel info
@ -50,7 +50,7 @@ class KernelArgSvmFixture : public ApiFixture<>, public DeviceFixture {
delete pMockKernel;
}
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
ApiFixture::TearDown();
}

View File

@ -13,7 +13,7 @@
#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
#include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
#include "opencl/source/command_stream/aub_command_stream_receiver_hw.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/mocks/mock_lrca_helper.h"
#include "test.h"
@ -52,7 +52,7 @@ TEST(AubHelper, GivenMultipleSubDevicesWhenGettingDeviceCountThenCorrectValueIsR
EXPECT_EQ(devicesCount, 1u);
}
typedef Test<DeviceFixture> AubHelperHwTest;
typedef Test<ClDeviceFixture> AubHelperHwTest;
HWTEST_F(AubHelperHwTest, GivenDisabledLocalMemoryWhenGetDataHintForPml4EntryIsCalledThenTraceNotypeIsReturned) {
AubHelperHw<FamilyType> aubHelper(false);

View File

@ -11,7 +11,7 @@
#include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
#include "opencl/source/mem_obj/buffer.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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
#include "opencl/test/unit_test/mocks/mock_gmm.h"
@ -21,7 +21,7 @@
using namespace NEO;
typedef Test<DeviceFixture> AubAllocDumpTests;
typedef Test<ClDeviceFixture> AubAllocDumpTests;
struct AubFileStreamMock : public AubMemDump::AubFileStream {
void write(const char *data, size_t size) override {

View File

@ -13,7 +13,7 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
#include "opencl/test/unit_test/fixtures/built_in_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
namespace NEO {

View File

@ -12,7 +12,7 @@
#include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
#include "aub_command_stream_fixture.h"
@ -23,13 +23,13 @@ using namespace NEO;
struct AUBFixture : public AUBCommandStreamFixture,
public CommandQueueFixture,
public DeviceFixture {
public ClDeviceFixture {
using AUBCommandStreamFixture::SetUp;
using CommandQueueFixture::SetUp;
void SetUp() {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(nullptr, pClDevice, 0);
AUBCommandStreamFixture::SetUp(pCmdQ);
}
@ -37,7 +37,7 @@ struct AUBFixture : public AUBCommandStreamFixture,
void TearDown() override {
AUBCommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
template <typename FamilyType>

View File

@ -11,13 +11,13 @@
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "opencl/source/aub/aub_helper.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/mocks/mock_aub_csr.h"
using NEO::AUBCommandStreamReceiver;
using NEO::AUBCommandStreamReceiverHw;
using NEO::AUBFamilyMapper;
using NEO::DeviceFixture;
using NEO::ClDeviceFixture;
using NEO::folderAUB;
std::string getAubFileName(const NEO::Device *pDevice, const std::string baseName) {
@ -42,7 +42,7 @@ TEST(PageTableTraits, when32BitTraitsAreUsedThenPageTableAddressesAreCorrect) {
EXPECT_EQ(BIT(36), AubMemDump::PageTableTraits<32>::pdpBaseAddress);
}
typedef Test<DeviceFixture> AubMemDumpTests;
typedef Test<ClDeviceFixture> AubMemDumpTests;
HWTEST_F(AubMemDumpTests, givenAubFileStreamWhenOpenAndCloseIsCalledThenFileNameIsReportedCorrectly) {
AUBCommandStreamReceiver::AubFileStream aubFile;

View File

@ -37,7 +37,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
public FixtureFactory::CommandStreamFixture,
public FixtureFactory::CommandQueueFixture,
public FixtureFactory::KernelFixture,
public DeviceFixture {
public ClDeviceFixture {
typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture;
typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture;
typedef typename FixtureFactory::CommandQueueFixture CommandQueueFixture;
@ -52,7 +52,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
public:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
ASSERT_NE(nullptr, pClDevice);
CommandQueueFixture::SetUp(pClDevice, 0);
ASSERT_NE(nullptr, pCmdQ);
@ -96,7 +96,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
IndirectHeapFixture::TearDown();
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
int argVal = 0;

View File

@ -7,9 +7,9 @@
#include "aub_batch_buffer_tests_gen11.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
using Gen11AubBatchBufferTests = Test<NEO::DeviceFixture>;
using Gen11AubBatchBufferTests = Test<NEO::ClDeviceFixture>;
static constexpr auto gpuBatchBufferAddr = 0x800400001000; // 48-bit GPU address

View File

@ -6,11 +6,11 @@
*/
#include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
namespace NEO {
using Gen12LPAubMemDumpTests = Test<DeviceFixture>;
using Gen12LPAubMemDumpTests = Test<ClDeviceFixture>;
GEN12LPTEST_F(Gen12LPAubMemDumpTests, simpleCCS) {
setupAUB<FamilyType>(pDevice, aub_stream::ENGINE_CCS);

View File

@ -18,11 +18,11 @@
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"
#include "opencl/test/unit_test/aub_tests/fixtures/hello_world_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/mocks/mock_context.h"
#include "test.h"
using Gen12LPAubBatchBufferTests = Test<NEO::DeviceFixture>;
using Gen12LPAubBatchBufferTests = Test<NEO::ClDeviceFixture>;
using Gen12LPTimestampTests = Test<HelloWorldFixture<AUBHelloWorldFixtureFactory>>;
static constexpr auto gpuBatchBufferAddr = 0x400400001000; // 47-bit GPU address

View File

@ -7,9 +7,9 @@
#include "aub_batch_buffer_tests.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
using AubBatchBufferTests = Test<NEO::DeviceFixture>;
using AubBatchBufferTests = Test<NEO::ClDeviceFixture>;
static constexpr auto gpuBatchBufferAddr = 0x800400001000ull; // 48-bit GPU address

View File

@ -24,8 +24,8 @@
#include "opencl/source/kernel/kernel.h"
#include "opencl/test/unit_test/built_ins/built_ins_file_names.h"
#include "opencl/test/unit_test/fixtures/built_in_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/context_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h"
#include "opencl/test/unit_test/global_environment.h"
@ -46,7 +46,7 @@ using namespace NEO;
class BuiltInTests
: public BuiltInFixture,
public DeviceFixture,
public ClDeviceFixture,
public ContextFixture,
public ::testing::Test {
@ -62,7 +62,7 @@ class BuiltInTests
void SetUp() override {
DebugManager.flags.ForceAuxTranslationMode.set(static_cast<int32_t>(AuxTranslationMode::Builtin));
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
cl_device_id device = pClDevice;
ContextFixture::SetUp(1, &device);
BuiltInFixture::SetUp(pDevice);
@ -72,7 +72,7 @@ class BuiltInTests
allBuiltIns.clear();
BuiltInFixture::TearDown();
ContextFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
void AppendBuiltInStringFromFile(std::string builtInFile, size_t &size) {

View File

@ -12,24 +12,24 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h"
#include "opencl/test/unit_test/mocks/mock_memory_manager.h"
namespace NEO {
struct CommandDeviceFixture : public DeviceFixture,
struct CommandDeviceFixture : public ClDeviceFixture,
public CommandQueueHwFixture {
using CommandQueueHwFixture::SetUp;
void SetUp(cl_command_queue_properties cmdQueueProperties = 0) {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueHwFixture::SetUp(pClDevice, cmdQueueProperties);
}
void TearDown() override {
CommandQueueHwFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -12,8 +12,8 @@
#include "opencl/source/helpers/dispatch_info_builder.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/fixtures/buffer_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/context_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
@ -28,7 +28,7 @@
using namespace NEO;
struct CommandQueueHwTest
: public DeviceFixture,
: public ClDeviceFixture,
public ContextFixture,
public CommandQueueHwFixture,
::testing::Test {
@ -36,7 +36,7 @@ struct CommandQueueHwTest
using ContextFixture::SetUp;
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
cl_device_id device = pClDevice;
ContextFixture::SetUp(1, &device);
CommandQueueHwFixture::SetUp(pClDevice, 0);
@ -45,14 +45,14 @@ struct CommandQueueHwTest
void TearDown() override {
CommandQueueHwFixture::TearDown();
ContextFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_command_queue_properties properties;
const HardwareInfo *pHwInfo = nullptr;
};
struct OOQueueHwTest : public DeviceFixture,
struct OOQueueHwTest : public ClDeviceFixture,
public ContextFixture,
public OOQueueFixture,
::testing::Test {
@ -62,7 +62,7 @@ struct OOQueueHwTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
cl_device_id device = pClDevice;
ContextFixture::SetUp(1, &device);
OOQueueFixture::SetUp(pClDevice, 0);
@ -74,7 +74,7 @@ struct OOQueueHwTest : public DeviceFixture,
void TearDown() override {
OOQueueFixture::TearDown();
ContextFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -19,8 +19,8 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
#include "opencl/test/unit_test/fixtures/buffer_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/context_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
@ -43,15 +43,15 @@ using namespace NEO;
struct CommandQueueMemoryDevice
: public MemoryManagementFixture,
public DeviceFixture {
public ClDeviceFixture {
void SetUp() override {
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
platformsImpl.clear();
MemoryManagementFixture::TearDown();
}
@ -120,7 +120,7 @@ TEST(CommandQueue, WhenConstructingCommandQueueThenTaskLevelAndTaskCountAreZero)
EXPECT_EQ(0u, cmdQ.taskCount);
}
struct GetTagTest : public DeviceFixture,
struct GetTagTest : public ClDeviceFixture,
public CommandQueueFixture,
public CommandStreamFixture,
public ::testing::Test {
@ -128,7 +128,7 @@ struct GetTagTest : public DeviceFixture,
using CommandQueueFixture::SetUp;
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(nullptr, pClDevice, 0);
CommandStreamFixture::SetUp(pCmdQ);
}
@ -136,7 +136,7 @@ struct GetTagTest : public DeviceFixture,
void TearDown() override {
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -18,7 +18,7 @@
#include "opencl/source/helpers/hardware_commands_helper.h"
#include "opencl/source/helpers/task_information.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/mocks/mock_buffer.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
@ -30,13 +30,13 @@
using namespace NEO;
struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test {
struct DispatchWalkerTest : public CommandQueueFixture, public ClDeviceFixture, public ::testing::Test {
using CommandQueueFixture::SetUp;
void SetUp() override {
DebugManager.flags.EnableTimestampPacket.set(0);
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = std::make_unique<MockContext>(pClDevice);
CommandQueueFixture::SetUp(context.get(), pClDevice, 0);
@ -82,7 +82,7 @@ struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, pu
void TearDown() override {
CommandQueueFixture::TearDown();
context.reset();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
std::unique_ptr<KernelOperation> createBlockedCommandsData(CommandQueue &commandQueue) {

View File

@ -12,7 +12,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/mocks/mock_buffer.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
@ -23,7 +23,7 @@
using namespace NEO;
struct EnqueueMapBufferTest : public DeviceFixture,
struct EnqueueMapBufferTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::Test {
typedef CommandQueueHwFixture CommandQueueFixture;
@ -32,7 +32,7 @@ struct EnqueueMapBufferTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
BufferDefaults::context = new MockContext;
@ -43,7 +43,7 @@ struct EnqueueMapBufferTest : public DeviceFixture,
delete buffer;
delete BufferDefaults::context;
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_int retVal = CL_SUCCESS;

View File

@ -13,7 +13,7 @@
#include "opencl/source/helpers/memory_properties_helpers.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
@ -24,7 +24,7 @@
using namespace NEO;
struct EnqueueMapImageTest : public DeviceFixture,
struct EnqueueMapImageTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::Test {
typedef CommandQueueHwFixture CommandQueueFixture;
@ -33,7 +33,7 @@ struct EnqueueMapImageTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
context = new MockContext(pClDevice);
image = ImageHelper<ImageUseHostPtr<Image2dDefaults>>::create(context);
@ -43,7 +43,7 @@ struct EnqueueMapImageTest : public DeviceFixture,
delete image;
context->release();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *context;

View File

@ -10,25 +10,25 @@
#include "opencl/source/event/user_event.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_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/mocks/mock_buffer.h"
#include "test.h"
using namespace NEO;
class MigrateMemObjectsFixture
: public DeviceFixture,
: public ClDeviceFixture,
public CommandQueueHwFixture {
public:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueHwFixture::SetUp(pClDevice, 0);
ASSERT_NE(nullptr, pCmdQ);
}
void TearDown() override {
CommandQueueHwFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -11,7 +11,7 @@
#include "opencl/source/built_ins/builtins_dispatch_builder.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/command_queue_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_builtin_dispatch_info_builder.h"
#include "opencl/test/unit_test/mocks/mock_builtins.h"
@ -19,7 +19,7 @@
using namespace NEO;
struct EnqueueSvmMemCopyTest : public DeviceFixture,
struct EnqueueSvmMemCopyTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::Test {
typedef CommandQueueHwFixture CommandQueueFixture;
@ -28,7 +28,7 @@ struct EnqueueSvmMemCopyTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
if (!pDevice->isFullRangeSvm()) {
return;
@ -55,7 +55,7 @@ struct EnqueueSvmMemCopyTest : public DeviceFixture,
context->getSVMAllocsManager()->freeSVMAlloc(dstSvmPtr);
CommandQueueFixture::TearDown();
}
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
void *srcSvmPtr = nullptr;

View File

@ -10,7 +10,7 @@
#include "opencl/source/built_ins/builtins_dispatch_builder.h"
#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/mocks/mock_builtin_dispatch_info_builder.h"
#include "opencl/test/unit_test/mocks/mock_builtins.h"
#include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
@ -18,7 +18,7 @@
using namespace NEO;
struct EnqueueSvmMemFillTest : public DeviceFixture,
struct EnqueueSvmMemFillTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::TestWithParam<size_t> {
typedef CommandQueueHwFixture CommandQueueFixture;
@ -27,7 +27,7 @@ struct EnqueueSvmMemFillTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
REQUIRE_SVM_OR_SKIP(pDevice);
patternSize = (size_t)GetParam();
@ -47,7 +47,7 @@ struct EnqueueSvmMemFillTest : public DeviceFixture,
context->getSVMAllocsManager()->freeSVMAlloc(svmPtr);
}
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
const uint64_t pattern[16] = {0x0011223344556677, 0x8899AABBCCDDEEFF, 0xFFEEDDCCBBAA9988, 0x7766554433221100,

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;

View File

@ -14,7 +14,7 @@
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/memory_manager/os_agnostic_memory_manager.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_context.h"
#include "test.h"
@ -64,9 +64,9 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
}
};
struct EnqueueThreadingFixture : public DeviceFixture {
struct EnqueueThreadingFixture : public ClDeviceFixture {
void SetUp() {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
pCmdQ = nullptr;
}
@ -74,7 +74,7 @@ struct EnqueueThreadingFixture : public DeviceFixture {
void TearDown() {
delete pCmdQ;
context->release();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
template <typename FamilyType>

View File

@ -11,7 +11,7 @@
#include "opencl/source/event/event.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "test.h"
@ -20,7 +20,7 @@
using namespace NEO;
struct EnqueueUnmapMemObjTest : public DeviceFixture,
struct EnqueueUnmapMemObjTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public ::testing::Test {
typedef CommandQueueHwFixture CommandQueueFixture;
@ -29,7 +29,7 @@ struct EnqueueUnmapMemObjTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(pClDevice, 0);
BufferDefaults::context = new MockContext;
buffer = BufferHelper<BufferUseHostPtr<>>::create();
@ -40,7 +40,7 @@ struct EnqueueUnmapMemObjTest : public DeviceFixture,
delete buffer;
delete BufferDefaults::context;
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
cl_int retVal = CL_SUCCESS;

View File

@ -11,7 +11,7 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_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/mocks/mock_command_queue.h"
#include "test.h"
@ -19,13 +19,13 @@
using namespace NEO;
struct FinishFixture : public DeviceFixture,
struct FinishFixture : public ClDeviceFixture,
public CommandQueueHwFixture,
public CommandStreamFixture,
public HardwareParse {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueHwFixture::SetUp(pClDevice, 0);
ASSERT_NE(nullptr, pCmdQ);
CommandStreamFixture::SetUp(pCmdQ);
@ -37,7 +37,7 @@ struct FinishFixture : public DeviceFixture,
HardwareParse::TearDown();
CommandStreamFixture::TearDown();
CommandQueueHwFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -8,14 +8,14 @@
#include "opencl/source/command_queue/command_queue.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "gtest/gtest.h"
using namespace NEO;
struct FlushTest
: public DeviceFixture,
: public ClDeviceFixture,
public CommandQueueFixture,
public CommandStreamFixture,
public ::testing::Test {
@ -23,7 +23,7 @@ struct FlushTest
using CommandQueueFixture::SetUp;
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(nullptr, pClDevice, 0);
CommandStreamFixture::SetUp(pCmdQ);
}
@ -31,7 +31,7 @@ struct FlushTest
void TearDown() override {
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -6,14 +6,14 @@
*/
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/context_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "gtest/gtest.h"
using namespace NEO;
struct GetCommandQueueInfoTest : public DeviceFixture,
struct GetCommandQueueInfoTest : public ClDeviceFixture,
public ContextFixture,
public CommandQueueFixture,
::testing::TestWithParam<uint64_t /*cl_command_queue_properties*/> {
@ -25,7 +25,7 @@ struct GetCommandQueueInfoTest : public DeviceFixture,
void SetUp() override {
properties = GetParam();
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
cl_device_id device = pClDevice;
ContextFixture::SetUp(1, &device);
@ -35,7 +35,7 @@ struct GetCommandQueueInfoTest : public DeviceFixture,
void TearDown() override {
CommandQueueFixture::TearDown();
ContextFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
const HardwareInfo *pHwInfo = nullptr;

View File

@ -22,7 +22,7 @@
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h"
#include "opencl/test/unit_test/fixtures/built_in_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/mocks/mock_kernel.h"
#include "test.h"

View File

@ -8,14 +8,14 @@
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/event/user_event.h"
#include "opencl/source/mem_obj/buffer.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/mocks/mock_allocation_properties.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "test.h"
using namespace NEO;
struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test {
struct MultipleMapBufferTest : public ClDeviceFixture, public ::testing::Test {
template <typename T>
struct MockBuffer : public BufferHw<T> {
using Buffer::mapOperationsHandler;
@ -106,13 +106,13 @@ struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test {
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
}
void TearDown() override {
delete context;
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *context = nullptr;

View File

@ -9,7 +9,7 @@
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/event/user_event.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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
@ -18,7 +18,7 @@
namespace NEO {
extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE];
struct MultipleMapImageTest : public DeviceFixture, public ::testing::Test {
struct MultipleMapImageTest : public ClDeviceFixture, public ::testing::Test {
template <typename T>
struct MockImage : public ImageHw<T> {
using Image::mapOperationsHandler;
@ -127,13 +127,13 @@ struct MultipleMapImageTest : public DeviceFixture, public ::testing::Test {
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
}
void TearDown() override {
delete context;
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *context = nullptr;

View File

@ -12,7 +12,7 @@
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_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/fixtures/hello_world_kernel_fixture.h"
#include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
#include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h"
@ -31,7 +31,7 @@ static OOMSetting oomSettings[] = {
{true, true}};
struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
public DeviceFixture,
public ClDeviceFixture,
public CommandQueueFixture,
public SimpleArgKernelFixture,
public HelloWorldKernelFixture,
@ -47,7 +47,7 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
void SetUp() override {
MemoryManagement::breakOnAllocationEvent = 77;
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
BufferDefaults::context = context;
CommandQueueFixture::SetUp(context, pClDevice, 0);
@ -83,7 +83,7 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
HelloWorldKernelFixture::TearDown();
SimpleArgKernelFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}

View File

@ -11,7 +11,7 @@
#include "opencl/source/event/event.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
@ -26,7 +26,7 @@ static OOMSetting oomSettings[] = {
{false, true},
{true, true}};
struct OOMCommandQueueImageTest : public DeviceFixture,
struct OOMCommandQueueImageTest : public ClDeviceFixture,
public CommandQueueFixture,
public ::testing::TestWithParam<OOMSetting> {
@ -36,7 +36,7 @@ struct OOMCommandQueueImageTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
CommandQueueFixture::SetUp(context, pClDevice, 0);
@ -68,7 +68,7 @@ struct OOMCommandQueueImageTest : public DeviceFixture,
context->release();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *context;

View File

@ -10,7 +10,7 @@
#include "opencl/source/event/event.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/mocks/mock_context.h"
#include "test.h"
@ -26,7 +26,7 @@ static OOMSetting oomSettings[] = {
{false, true},
{true, true}};
struct OOMCommandQueueTest : public DeviceFixture,
struct OOMCommandQueueTest : public ClDeviceFixture,
public CommandQueueFixture,
public ::testing::TestWithParam<OOMSetting> {
@ -36,7 +36,7 @@ struct OOMCommandQueueTest : public DeviceFixture,
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new MockContext(pClDevice);
CommandQueueFixture::SetUp(context, pClDevice, 0);
@ -62,7 +62,7 @@ struct OOMCommandQueueTest : public DeviceFixture,
void TearDown() override {
CommandQueueFixture::TearDown();
context->release();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *context;

View File

@ -8,7 +8,7 @@
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "opencl/source/command_queue/gpgpu_walker.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
#include "patch_shared.h"

View File

@ -8,7 +8,7 @@
#include "shared/source/memory_manager/unified_memory_manager.h"
#include "opencl/source/event/event.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/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_buffer.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
@ -19,7 +19,7 @@
using namespace NEO;
class ZeroSizeEnqueueHandlerTest : public Test<DeviceFixture> {
class ZeroSizeEnqueueHandlerTest : public Test<ClDeviceFixture> {
public:
MockContext context;
cl_int retVal;

View File

@ -13,7 +13,7 @@
#include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
#include "opencl/source/helpers/hardware_context_controller.h"
#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_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/fixtures/mock_aub_center_fixture.h"
#include "opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h"
#include "opencl/test/unit_test/mocks/mock_aub_center.h"

View File

@ -14,7 +14,7 @@
#include "opencl/source/mem_obj/mem_obj_helper.h"
#include "opencl/source/platform/platform.h"
#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_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/fixtures/mock_aub_center_fixture.h"
#include "opencl/test/unit_test/mocks/mock_aub_center.h"
#include "opencl/test/unit_test/mocks/mock_aub_csr.h"
@ -725,7 +725,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenEngineI
EXPECT_NE(0u, aubCsr->handle);
}
using InjectMmmioTest = Test<DeviceFixture>;
using InjectMmmioTest = Test<ClDeviceFixture>;
HWTEST_F(InjectMmmioTest, givenAddMmioKeySetToZeroWhenInitAdditionalMmioCalledThenDoNotWriteMmio) {
DebugManagerStateRestore stateRestore;

View File

@ -13,7 +13,7 @@
#include "opencl/source/helpers/hardware_context_controller.h"
#include "opencl/source/helpers/neo_driver_version.h"
#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_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/mocks/mock_aub_center.h"
#include "opencl/test/unit_test/mocks/mock_aub_csr.h"
#include "opencl/test/unit_test/mocks/mock_aub_file_stream.h"

View File

@ -9,7 +9,7 @@
#include "opencl/source/command_stream/aub_subcapture.h"
#include "opencl/source/helpers/dispatch_info.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/mocks/mock_aub_subcapture_manager.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
#include "opencl/test/unit_test/mocks/mock_program.h"
@ -17,17 +17,17 @@
using namespace NEO;
struct AubSubCaptureTest : public DeviceFixture,
struct AubSubCaptureTest : public ClDeviceFixture,
public ::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
kernelInfo.name = "kernel_name";
dbgRestore = new DebugManagerStateRestore();
}
void TearDown() override {
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
delete dbgRestore;
}

View File

@ -7,20 +7,20 @@
#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
struct CommandParse
: public DeviceFixture,
: public ClDeviceFixture,
public ::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -823,7 +823,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, flushTaskWithBothCSCallsChainsWith
EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT, bbs->getAddressSpaceIndicator());
}
typedef Test<DeviceFixture> CommandStreamReceiverCQFlushTaskTests;
typedef Test<ClDeviceFixture> CommandStreamReceiverCQFlushTaskTests;
HWTEST_F(CommandStreamReceiverCQFlushTaskTests, getCSShouldReturnACSWithEnoughSizeCSRTraffic) {
CommandQueueHw<FamilyType> commandQueue(nullptr, pClDevice, 0, false);
auto &commandStreamReceiver = commandQueue.getGpgpuCommandStreamReceiver();

View File

@ -28,7 +28,7 @@
#include "opencl/source/event/user_event.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/fixtures/built_in_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/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
#include "opencl/test/unit_test/mocks/mock_buffer.h"

View File

@ -33,7 +33,7 @@
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/source/mem_obj/mem_obj_helper.h"
#include "opencl/test/unit_test/fixtures/built_in_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/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
@ -243,7 +243,7 @@ HWTEST_F(CommandStreamReceiverFlushTests, WhenAligningCommandStreamReceiverToCac
EXPECT_EQ(0u, commandStream.getUsed() % MemoryConstants::cacheLineSize);
}
typedef Test<DeviceFixture> CommandStreamReceiverHwTest;
typedef Test<ClDeviceFixture> CommandStreamReceiverHwTest;
HWTEST_F(CommandStreamReceiverHwTest, givenCsrHwWhenTypeIsCheckedThenCsrHwIsReturned) {
auto csr = std::unique_ptr<CommandStreamReceiver>(CommandStreamReceiverHw<FamilyType>::create(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex()));
@ -1747,7 +1747,7 @@ struct MockScratchSpaceController : ScratchSpaceControllerBase {
using ScratchSpaceControllerBase::ScratchSpaceControllerBase;
};
using ScratchSpaceControllerTest = Test<DeviceFixture>;
using ScratchSpaceControllerTest = Test<ClDeviceFixture>;
TEST_F(ScratchSpaceControllerTest, whenScratchSpaceControllerIsDestroyedThenItReleasePrivateScratchSpaceAllocation) {
MockScratchSpaceController scratchSpaceController(pDevice->getRootDeviceIndex(), *pDevice->getExecutionEnvironment(), *pDevice->getGpgpuCommandStreamReceiver().getInternalAllocationStorage());

View File

@ -8,18 +8,18 @@
using namespace NEO;
template <typename GfxFamily>
struct CommandStreamReceiverHwTest : public DeviceFixture,
struct CommandStreamReceiverHwTest : public ClDeviceFixture,
public HardwareParse,
public ::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
}
void TearDown() override {
HardwareParse::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
void givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl();

View File

@ -22,7 +22,7 @@
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/source/platform/platform.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/fixtures/multi_root_device_fixture.h"
#include "opencl/test/unit_test/gen_common/matchers.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
@ -45,10 +45,10 @@
using namespace NEO;
struct CommandStreamReceiverTest : public DeviceFixture,
struct CommandStreamReceiverTest : public ClDeviceFixture,
public ::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
commandStreamReceiver = &pDevice->getGpgpuCommandStreamReceiver();
ASSERT_NE(nullptr, commandStreamReceiver);
@ -57,7 +57,7 @@ struct CommandStreamReceiverTest : public DeviceFixture,
}
void TearDown() override {
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
CommandStreamReceiver *commandStreamReceiver;

View File

@ -23,7 +23,7 @@
#include "opencl/source/memory_manager/memory_banks.h"
#include "opencl/source/platform/platform.h"
#include "opencl/test/unit_test/command_queue/command_queue_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/fixtures/mock_aub_center_fixture.h"
#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
#include "opencl/test/unit_test/mocks/mock_aub_center.h"
@ -54,7 +54,7 @@ extern const char *tbxLibName;
}
struct TbxFixture : public TbxCommandStreamFixture,
public DeviceFixture,
public ClDeviceFixture,
public MockAubCenterFixture {
using TbxCommandStreamFixture::SetUp;
@ -62,7 +62,7 @@ struct TbxFixture : public TbxCommandStreamFixture,
TbxFixture() : MockAubCenterFixture(CommandStreamReceiverType::CSR_TBX) {}
void SetUp() {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]);
TbxCommandStreamFixture::SetUp(pDevice);
MockAubCenterFixture::SetUp();
@ -71,7 +71,7 @@ struct TbxFixture : public TbxCommandStreamFixture,
void TearDown() override {
MockAubCenterFixture::TearDown();
TbxCommandStreamFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -12,7 +12,7 @@
#include "shared/test/unit_test/utilities/base_object_utils.h"
#include "opencl/source/context/context.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/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
#include "test.h"

View File

@ -7,7 +7,7 @@
#include "opencl/source/context/context.h"
#include "opencl/source/platform/platform.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/fixtures/memory_management_fixture.h"
#include "opencl/test/unit_test/mocks/mock_platform.h"
#include "test.h"

View File

@ -15,7 +15,7 @@
#include "opencl/source/command_stream/tbx_command_stream_receiver.h"
#include "opencl/source/platform/platform.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/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
@ -28,7 +28,7 @@
using namespace NEO;
typedef Test<DeviceFixture> DeviceTest;
typedef Test<ClDeviceFixture> DeviceTest;
TEST_F(DeviceTest, givenDeviceWhenGetProductAbbrevThenReturnsHardwarePrefix) {
const auto productAbbrev = pDevice->getProductAbbrev();

View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/mocks/mock_ostime.h"
#include "gtest/gtest.h"

View File

@ -7,7 +7,7 @@
#include "shared/source/execution_environment/root_device_environment.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/mocks/mock_execution_environment.h"
#include "opencl/test/unit_test/mocks/mock_ostime.h"
#include "opencl/test/unit_test/mocks/mock_ostime_win.h"

View File

@ -8,7 +8,7 @@
#include "shared/source/helpers/get_info.h"
#include "opencl/source/cl_device/cl_device_info_map.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/mocks/mock_platform.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"

View File

@ -8,7 +8,7 @@
#include "shared/source/helpers/get_info.h"
#include "opencl/source/cl_device/cl_device_info_map.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/fixtures/device_info_fixture.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
#include "test.h"

View File

@ -11,7 +11,7 @@
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
#include "gmock/gmock.h"

View File

@ -7,7 +7,7 @@
#include "opencl/source/event/async_events_handler.h"
#include "opencl/source/event/user_event.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/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_event.h"

View File

@ -15,7 +15,7 @@
#include "opencl/source/event/user_event.h"
#include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
#include "opencl/test/unit_test/command_stream/command_stream_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/fixtures/hello_world_fixture.h"
#include "opencl/test/unit_test/mocks/mock_buffer.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
@ -25,7 +25,7 @@
using namespace NEO;
struct EventTest
: public DeviceFixture,
: public ClDeviceFixture,
public CommandQueueFixture,
public CommandStreamFixture,
public ::testing::Test {
@ -33,7 +33,7 @@ struct EventTest
using CommandQueueFixture::SetUp;
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueFixture::SetUp(&mockContext, pClDevice, 0);
CommandStreamFixture::SetUp(pCmdQ);
}
@ -41,26 +41,26 @@ struct EventTest
void TearDown() override {
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext mockContext;
};
struct InternalsEventTest
: public DeviceFixture,
: public ClDeviceFixture,
public ::testing::Test {
InternalsEventTest() {
}
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
mockContext = new MockContext(pClDevice);
}
void TearDown() override {
delete mockContext;
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockContext *mockContext = nullptr;

View File

@ -7,19 +7,19 @@
#pragma once
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
namespace NEO {
struct AubCommandStreamReceiverFixture : public DeviceFixture, MockAubCenterFixture {
struct AubCommandStreamReceiverFixture : public ClDeviceFixture, MockAubCenterFixture {
void SetUp() {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
MockAubCenterFixture::SetUp();
setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]);
}
void TearDown() {
MockAubCenterFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};
} // namespace NEO

View File

@ -0,0 +1,40 @@
/*
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "gtest/gtest.h"
namespace NEO {
void ClDeviceFixture::SetUp() {
hardwareInfo = *defaultHwInfo;
SetUpImpl(&hardwareInfo);
}
void ClDeviceFixture::SetUpImpl(const NEO::HardwareInfo *hardwareInfo) {
pDevice = MockDevice::createWithNewExecutionEnvironment<MockDevice>(hardwareInfo);
ASSERT_NE(nullptr, pDevice);
pClDevice = new MockClDevice{pDevice};
ASSERT_NE(nullptr, pClDevice);
auto &commandStreamReceiver = pDevice->getGpgpuCommandStreamReceiver();
pTagMemory = commandStreamReceiver.getTagAddress();
ASSERT_NE(nullptr, const_cast<uint32_t *>(pTagMemory));
}
void ClDeviceFixture::TearDown() {
delete pClDevice;
pClDevice = nullptr;
pDevice = nullptr;
}
MockDevice *ClDeviceFixture::createWithUsDeviceId(unsigned short usDeviceId) {
hardwareInfo = *defaultHwInfo;
hardwareInfo.platform.usDeviceID = usDeviceId;
return MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hardwareInfo);
}
} // namespace NEO

View File

@ -0,0 +1,29 @@
/*
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/test/unit_test/mocks/mock_device.h"
#include "opencl/test/unit_test/mocks/mock_cl_device.h"
namespace NEO {
struct HardwareInfo;
struct ClDeviceFixture {
void SetUp();
void SetUpImpl(const NEO::HardwareInfo *hardwareInfo);
void TearDown();
MockDevice *createWithUsDeviceId(unsigned short usDeviceId);
MockDevice *pDevice = nullptr;
MockClDevice *pClDevice = nullptr;
volatile uint32_t *pTagMemory = nullptr;
HardwareInfo hardwareInfo = {};
PLATFORM platformHelper = {};
};
} // namespace NEO

View File

@ -6,22 +6,22 @@
*/
#pragma once
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "gtest/gtest.h"
class EnqueueHandlerTest : public NEO::DeviceFixture,
class EnqueueHandlerTest : public NEO::ClDeviceFixture,
public testing::Test {
public:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
context = new NEO::MockContext(pClDevice);
}
void TearDown() override {
context->decRefInternal();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
NEO::MockContext *context;
};

View File

@ -78,12 +78,12 @@ class ExecutionModelKernelTest : public ExecutionModelKernelFixture,
DebugManagerStateRestore dbgRestore;
};
class ExecutionModelSchedulerTest : public DeviceFixture,
class ExecutionModelSchedulerTest : public ClDeviceFixture,
public CommandQueueHwFixture,
public DeviceQueueFixture {
public:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
CommandQueueHwFixture::SetUp(pClDevice, 0);
DeviceQueueFixture::SetUp(context, pClDevice);
@ -96,7 +96,7 @@ class ExecutionModelSchedulerTest : public DeviceFixture,
DeviceQueueFixture::TearDown();
CommandQueueHwFixture::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
MockParentKernel *parentKernel = nullptr;

View File

@ -35,7 +35,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
public FixtureFactory::CommandStreamFixture,
public FixtureFactory::CommandQueueFixture,
public FixtureFactory::KernelFixture,
public DeviceFixture {
public ClDeviceFixture {
typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture;
typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture;
@ -52,7 +52,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
public:
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
ASSERT_NE(nullptr, pClDevice);
CommandQueueFixture::SetUp(pClDevice, 0);
ASSERT_NE(nullptr, pCmdQ);
@ -100,7 +100,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
BufferDefaults::context->release();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
Buffer *srcBuffer = nullptr;
Buffer *destBuffer = nullptr;

View File

@ -13,7 +13,7 @@
#include "opencl/source/kernel/kernel.h"
#include "opencl/source/platform/platform.h"
#include "opencl/source/program/program.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/fixtures/program_fixture.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"

View File

@ -13,7 +13,7 @@
#include "opencl/source/helpers/memory_properties_helpers.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/platform/platform.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/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_platform.h"
#include "test.h"

View File

@ -55,7 +55,7 @@ void KernelImageArgTest::SetUp() {
pKernelInfo->kernelArgInfo[1].isImage = true;
pKernelInfo->kernelArgInfo[0].isImage = true;
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
pKernel.reset(new MockKernel(program.get(), *pKernelInfo, *pClDevice));
ASSERT_EQ(CL_SUCCESS, pKernel->initialize());
@ -81,5 +81,5 @@ void KernelImageArgTest::TearDown() {
pKernel.reset();
program.reset();
context.reset();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}

View File

@ -7,7 +7,7 @@
#pragma once
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
#include <cstdint>
@ -24,7 +24,7 @@ namespace iOpenCL {
struct SKernelBinaryHeaderCommon;
}
class KernelImageArgTest : public Test<NEO::DeviceFixture> {
class KernelImageArgTest : public Test<NEO::ClDeviceFixture> {
public:
KernelImageArgTest() {
}

View File

@ -13,7 +13,7 @@
#include "opencl/source/kernel/kernel.h"
#include "opencl/source/program/program.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/fixtures/program_fixture.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"

View File

@ -14,7 +14,7 @@
#include "shared/source/memory_manager/graphics_allocation.h"
#include "shared/test/unit_test/cmd_parse/hw_parse.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/helpers/unit_test_helper.h"
#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
@ -22,11 +22,11 @@
namespace NEO {
struct UltCommandStreamReceiverTest
: public DeviceFixture,
: public ClDeviceFixture,
public HardwareParse,
::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
size_t sizeStream = 512;
@ -73,7 +73,7 @@ struct UltCommandStreamReceiverTest
alignedFree(dshBuffer);
alignedFree(cmdBuffer);
HardwareParse::TearDown();
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
template <typename CommandStreamReceiverType>

View File

@ -10,7 +10,7 @@
#include "shared/test/unit_test/cmd_parse/hw_parse.h"
#include "opencl/source/command_queue/command_queue_hw.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/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_csr.h"

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
using EhlTest = Test<DeviceFixture>;
using EhlTest = Test<ClDeviceFixture>;
EHLTEST_F(EhlTest, givenDeviceIdWhenAskingForSimulationThenReturnValidValue) {
unsigned short ehlSimulationIds[2] = {

View File

@ -8,7 +8,7 @@
#include "shared/test/unit_test/cmd_parse/hw_parse.h"
#include "opencl/source/command_queue/command_queue_hw.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/helpers/static_size3.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
#include "test.h"
@ -17,7 +17,7 @@
namespace NEO {
using Gen11EnqueueTest = Test<DeviceFixture>;
using Gen11EnqueueTest = Test<ClDeviceFixture>;
GEN11TEST_F(Gen11EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenDefaultPolicyIsProgrammed) {
MockContext mc;
CommandQueueHw<FamilyType> cmdQ{&mc, pClDevice, 0, false};

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
using IcllpTest = Test<DeviceFixture>;
using IcllpTest = Test<ClDeviceFixture>;
ICLLPTEST_F(IcllpTest, givenIcllpWhenSlmSizeIsRequiredThenReturnCorrectValue) {
EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize);

View File

@ -6,13 +6,13 @@
*/
#include "opencl/source/helpers/hardware_commands_helper.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/mocks/mock_kernel.h"
#include "test.h"
using namespace NEO;
using Gen11KernelTest = Test<DeviceFixture>;
using Gen11KernelTest = Test<ClDeviceFixture>;
GEN11TEST_F(Gen11KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) {
MockKernelWithInternals mockKernel(*pClDevice);
auto retVal = mockKernel.mockKernel->Kernel::canTransformImages();

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
using LkfTest = Test<DeviceFixture>;
using LkfTest = Test<ClDeviceFixture>;
LKFTEST_F(LkfTest, givenLkfWhenSlmSizeIsRequiredThenReturnCorrectValue) {
EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize);

View File

@ -6,7 +6,7 @@
*/
#include "opencl/source/sampler/sampler.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/mocks/mock_context.h"
#include "test.h"
@ -14,7 +14,7 @@
using namespace NEO;
typedef Test<DeviceFixture> Gen11SamplerTest;
typedef Test<ClDeviceFixture> Gen11SamplerTest;
GEN11TEST_F(Gen11SamplerTest, appendSamplerStateParamsDoesNothing) {
typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE;

View File

@ -6,12 +6,12 @@
*/
#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
using Gen11TbxCommandStreamReceiverTests = Test<DeviceFixture>;
using Gen11TbxCommandStreamReceiverTests = Test<ClDeviceFixture>;
GEN11TEST_F(Gen11TbxCommandStreamReceiverTests, whenAskedForPollForCompletionParametersThenReturnCorrectValues) {
class MyMockTbxHw : public TbxCommandStreamReceiverHw<FamilyType> {

View File

@ -7,12 +7,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> Gen11DeviceCaps;
typedef Test<ClDeviceFixture> Gen11DeviceCaps;
GEN11TEST_F(Gen11DeviceCaps, defaultPreemptionMode) {
EXPECT_TRUE(PreemptionMode::MidThread == pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode);

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> Gen11OnlyTeset;
typedef Test<ClDeviceFixture> Gen11OnlyTeset;
GEN11TEST_F(Gen11OnlyTeset, shouldPassOnGen11) {
EXPECT_NE(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily());

View File

@ -10,7 +10,7 @@
#include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
#include "opencl/source/command_stream/aub_command_stream_receiver_hw.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/helpers/hw_helper_tests.h"
#include "opencl/test/unit_test/mocks/mock_aub_csr.h"
#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
@ -19,7 +19,7 @@
using namespace NEO;
using Gen12LPAubCommandStreamReceiverTests = Test<DeviceFixture>;
using Gen12LPAubCommandStreamReceiverTests = Test<ClDeviceFixture>;
GEN12LPTEST_F(Gen12LPAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGetGUCWorkQueueItemHeaderIsCalledThenAppropriateValueDependingOnEngineTypeIsReturned) {
std::unique_ptr<AUBCommandStreamReceiverHw<FamilyType>> aubCsr(new AUBCommandStreamReceiverHw<FamilyType>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex()));

View File

@ -10,7 +10,7 @@
#include "shared/test/unit_test/cmd_parse/hw_parse.h"
#include "opencl/source/command_queue/command_queue_hw.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/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"

View File

@ -7,7 +7,7 @@
#include "shared/test/unit_test/helpers/debug_manager_state_restore.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/mocks/mock_aub_stream.h"
#include "test.h"
@ -15,7 +15,7 @@
using namespace NEO;
using Gen12LPCommandStreamReceiverSimulatedCommonHwTests = Test<DeviceFixture>;
using Gen12LPCommandStreamReceiverSimulatedCommonHwTests = Test<ClDeviceFixture>;
template <typename FamilyType>
class MockSimulatedCsrHw : public CommandStreamReceiverSimulatedHw<FamilyType> {

View File

@ -6,13 +6,13 @@
*/
#include "opencl/source/helpers/hardware_commands_helper.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/mocks/mock_kernel.h"
#include "test.h"
using namespace NEO;
using Gen12LpKernelTest = Test<DeviceFixture>;
using Gen12LpKernelTest = Test<ClDeviceFixture>;
GEN12LPTEST_F(Gen12LpKernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) {
MockKernelWithInternals mockKernel(*pClDevice);
auto retVal = mockKernel.mockKernel->Kernel::canTransformImages();

View File

@ -10,7 +10,7 @@
#include "shared/test/unit_test/utilities/base_object_utils.h"
#include "opencl/source/sampler/sampler.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/mocks/mock_context.h"
#include "test.h"
@ -18,7 +18,7 @@
using namespace NEO;
typedef Test<DeviceFixture> Gen12LpSamplerTest;
typedef Test<ClDeviceFixture> Gen12LpSamplerTest;
TGLLPTEST_F(Gen12LpSamplerTest, givenTglLpSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) {
EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get());

View File

@ -7,13 +7,13 @@
#include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.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/mocks/mock_graphics_allocation.h"
#include "test.h"
using namespace NEO;
using Gen12LPTbxCommandStreamReceiverTests = Test<DeviceFixture>;
using Gen12LPTbxCommandStreamReceiverTests = Test<ClDeviceFixture>;
GEN12LPTEST_F(Gen12LPTbxCommandStreamReceiverTests, givenNullPtrGraphicsAlloctionWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) {
auto tbxCsr = std::make_unique<TbxCommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex());

View File

@ -7,12 +7,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> Gen12LpDeviceCaps;
typedef Test<ClDeviceFixture> Gen12LpDeviceCaps;
TGLLPTEST_F(Gen12LpDeviceCaps, givenGen12LpDeviceWhenQueryingDeviceInfoThenOcl30IsReported) {
const auto &caps = pClDevice->getDeviceInfo();
@ -112,7 +112,7 @@ TGLLPTEST_F(Gen12LpDeviceCaps, givenGen12LpDeviceWhenCheckingPipesSupportThenFal
EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportsPipes);
}
using TglLpUsDeviceIdTest = Test<DeviceFixture>;
using TglLpUsDeviceIdTest = Test<ClDeviceFixture>;
TGLLPTEST_F(TglLpUsDeviceIdTest, isSimulationCap) {
unsigned short tglLpSimulationIds[2] = {

View File

@ -5,18 +5,18 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> TigerlakeLpOnlyTest;
typedef Test<ClDeviceFixture> TigerlakeLpOnlyTest;
TGLLPTEST_F(TigerlakeLpOnlyTest, shouldPassOnTglLp) {
EXPECT_EQ(IGFX_TIGERLAKE_LP, pDevice->getHardwareInfo().platform.eProductFamily);
}
typedef Test<DeviceFixture> Gen12LpOnlyTeset;
typedef Test<ClDeviceFixture> Gen12LpOnlyTeset;
GEN12LPTEST_F(Gen12LpOnlyTeset, shouldPassOnGen12) {
EXPECT_NE(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily());

View File

@ -7,19 +7,19 @@
#include "shared/test/unit_test/mocks/mock_device.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/mocks/mock_source_level_debugger.h"
#include "test.h"
using namespace NEO;
struct BdwDeviceTest : public DeviceFixture,
struct BdwDeviceTest : public ClDeviceFixture,
public ::testing::Test {
void SetUp() override {
DeviceFixture::SetUp();
ClDeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
ClDeviceFixture::TearDown();
}
};

View File

@ -7,12 +7,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> BdwDeviceCaps;
typedef Test<ClDeviceFixture> BdwDeviceCaps;
BDWTEST_F(BdwDeviceCaps, givenBdwDeviceWhenAskedForClVersionThenReport21) {
const auto &caps = pClDevice->getDeviceInfo();
@ -59,7 +59,7 @@ BDWTEST_F(BdwDeviceCaps, givenHwInfoWhenRequestedMaxFrontEndThreadsThenReturnVal
EXPECT_EQ(HwHelper::getMaxThreadsForVfe(hwInfo), pDevice->getDeviceInfo().maxFrontEndThreads);
}
typedef Test<DeviceFixture> BdwUsDeviceIdTest;
typedef Test<ClDeviceFixture> BdwUsDeviceIdTest;
BDWTEST_F(BdwUsDeviceIdTest, isSimulationCap) {
unsigned short bdwSimulationIds[6] = {

View File

@ -7,12 +7,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> BdwDeviceCaps;
typedef Test<ClDeviceFixture> BdwDeviceCaps;
BDWTEST_F(BdwDeviceCaps, kmdNotifyMechanism) {
EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify);

View File

@ -11,7 +11,7 @@
#include "shared/test/unit_test/helpers/dispatch_flags_helper.h"
#include "opencl/source/command_queue/command_queue_hw.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/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_csr.h"

View File

@ -6,13 +6,13 @@
*/
#include "opencl/source/helpers/hardware_commands_helper.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/mocks/mock_kernel.h"
#include "test.h"
using namespace NEO;
using Gen8KernelTest = Test<DeviceFixture>;
using Gen8KernelTest = Test<ClDeviceFixture>;
GEN8TEST_F(Gen8KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) {
MockKernelWithInternals mockKernel(*pClDevice);
auto retVal = mockKernel.mockKernel->Kernel::canTransformImages();

View File

@ -6,7 +6,7 @@
*/
#include "opencl/source/sampler/sampler.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/mocks/mock_context.h"
#include "test.h"
@ -14,7 +14,7 @@
using namespace NEO;
typedef Test<DeviceFixture> Gen8SamplerTest;
typedef Test<ClDeviceFixture> Gen8SamplerTest;
GEN8TEST_F(Gen8SamplerTest, appendSamplerStateParamsDoesNothing) {
typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE;

View File

@ -7,12 +7,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> Gen8DeviceCaps;
typedef Test<ClDeviceFixture> Gen8DeviceCaps;
GEN8TEST_F(Gen8DeviceCaps, defaultPreemptionMode) {
EXPECT_TRUE(PreemptionMode::Disabled == pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode);

View File

@ -5,18 +5,18 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> BroadwellOnlyTest;
typedef Test<ClDeviceFixture> BroadwellOnlyTest;
BDWTEST_F(BroadwellOnlyTest, shouldPassOnBdw) {
EXPECT_EQ(IGFX_BROADWELL, pDevice->getHardwareInfo().platform.eProductFamily);
}
typedef Test<DeviceFixture> Gen8OnlyTest;
typedef Test<ClDeviceFixture> Gen8OnlyTest;
GEN8TEST_F(Gen8OnlyTest, shouldPassOnGen8) {
EXPECT_EQ(IGFX_GEN8_CORE, pDevice->getRenderCoreFamily());

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> DeviceTest;
typedef Test<ClDeviceFixture> DeviceTest;
BXTTEST_F(DeviceTest, getEnabledClVersion12Device) {
auto version = pClDevice->getEnabledClVersion();

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> BxtDeviceCaps;
typedef Test<ClDeviceFixture> BxtDeviceCaps;
BXTTEST_F(BxtDeviceCaps, reportsOcl12) {
const auto &caps = pClDevice->getDeviceInfo();
@ -52,7 +52,7 @@ BXTTEST_F(BxtDeviceCaps, givenBXTWhenCheckFtrSupportsInteger64BitAtomicsThenRetu
EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics);
}
typedef Test<DeviceFixture> BxtUsDeviceIdTest;
typedef Test<ClDeviceFixture> BxtUsDeviceIdTest;
BXTTEST_F(BxtUsDeviceIdTest, isSimulationCap) {
unsigned short bxtSimulationIds[3] = {

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> BxtDeviceCapsWindows;
typedef Test<ClDeviceFixture> BxtDeviceCapsWindows;
BXTTEST_F(BxtDeviceCapsWindows, givenHwInfoWhenAskedForKmdNotifyMechanismThenReturnCorrectValues) {
EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify);

View File

@ -5,12 +5,12 @@
*
*/
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
using namespace NEO;
typedef Test<DeviceFixture> CflDeviceCaps;
typedef Test<ClDeviceFixture> CflDeviceCaps;
CFLTEST_F(CflDeviceCaps, reportsOcl21) {
const auto &caps = pClDevice->getDeviceInfo();

Some files were not shown because too many files have changed in this diff Show More