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

Remove not needed virtual function from tests

Browse Source 
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2021-10-21 18:23:30 +00:00
committed by Compute-Runtime-Automation
parent dbeb263868
commit 3d3881e7ad
15 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h
View File

@@ -17,7 +17,7 @@ namespace ult {
class CommandListFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DeviceFixture::SetUp();
ze_result_t returnValue;
commandList.reset(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)));
@@ -35,7 +35,7 @@ class CommandListFixture : public DeviceFixture {
event = std::unique_ptr<Event>(Event::create<uint32_t>(eventPool.get(), &eventDesc, device));
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}

24
level_zero/core/test/unit_tests/fixtures/device_fixture.h
View File

@@ -33,8 +33,8 @@ class MockBuiltins;
struct DeviceFixture {
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
virtual void SetUp(); // NOLINT(readability-identifier-naming)
virtual void TearDown(); // NOLINT(readability-identifier-naming)
void SetUp(); // NOLINT(readability-identifier-naming)
void TearDown(); // NOLINT(readability-identifier-naming)
void setupWithExecutionEnvironment(NEO::ExecutionEnvironment &executionEnvironment);
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
@@ -46,8 +46,8 @@ struct DeviceFixture {
struct PageFaultDeviceFixture {
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
virtual void SetUp(); // NOLINT(readability-identifier-naming)
virtual void TearDown(); // NOLINT(readability-identifier-naming)
void SetUp(); // NOLINT(readability-identifier-naming)
void TearDown(); // NOLINT(readability-identifier-naming)
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
std::unique_ptr<MockMemoryManager> mockMemoryManager;
@@ -60,8 +60,8 @@ struct PageFaultDeviceFixture {
struct MultiDeviceFixture {
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
virtual void SetUp(); // NOLINT(readability-identifier-naming)
virtual void TearDown(); // NOLINT(readability-identifier-naming)
void SetUp(); // NOLINT(readability-identifier-naming)
void TearDown(); // NOLINT(readability-identifier-naming)
DebugManagerStateRestore restorer;
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
@@ -72,18 +72,18 @@ struct MultiDeviceFixture {
};
struct SingleRootMultiSubDeviceFixture : public MultiDeviceFixture {
void SetUp() override;
void SetUp();
L0::Device *device = nullptr;
NEO::Device *neoDevice = nullptr;
};
struct ContextFixture : DeviceFixture {
void SetUp() override;
void TearDown() override;
void SetUp();
void TearDown();
};
struct AubCsrFixture : ContextFixture {
struct AubCsrFixture : public ContextFixture {
template <typename T>
void SetUpT() {
auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + NEO::defaultHwInfo->platform.eRenderCoreFamily];
@@ -96,8 +96,8 @@ struct AubCsrFixture : ContextFixture {
ContextFixture::TearDown();
}
void SetUp() override{};
void TearDown() override{};
void SetUp() {}
void TearDown() {}
std::unique_ptr<VariableBackup<CommandStreamReceiverCreateFunc>> variableBackup;
};

16
level_zero/core/test/unit_tests/fixtures/module_fixture.h
View File

@@ -136,7 +136,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
}
};
void SetUp() override {
void SetUp() {
auto executionEnvironment = MockDevice::prepareExecutionEnvironment(NEO::defaultHwInfo.get(), 0u);
memoryManager = new MockImmutableMemoryManager(*executionEnvironment);
executionEnvironment->memoryManager.reset(memoryManager);
@@ -179,7 +179,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
kernel->initialize(&desc);
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
@@ -191,7 +191,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
};
struct ModuleFixture : public DeviceFixture {
void SetUp() override {
void SetUp() {
NEO::MockCompilerEnableGuard mock(true);
DeviceFixture::SetUp();
createModuleFromBinary();
@@ -228,7 +228,7 @@ struct ModuleFixture : public DeviceFixture {
kernel->initialize(&desc);
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
@@ -240,7 +240,7 @@ struct ModuleFixture : public DeviceFixture {
};
struct MultiDeviceModuleFixture : public MultiDeviceFixture {
void SetUp() override {
void SetUp() {
MultiDeviceFixture::SetUp();
modules.resize(numRootDevices);
}
@@ -277,7 +277,7 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture {
kernel->initialize(&desc);
}
void TearDown() override {
void TearDown() {
MultiDeviceFixture::TearDown();
}
@@ -289,14 +289,14 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture {
};
struct ImportHostPointerModuleFixture : public ModuleFixture {
void SetUp() override {
void SetUp() {
DebugManager.flags.EnableHostPointerImport.set(1);
ModuleFixture::SetUp();
hostPointer = driverHandle->getMemoryManager()->allocateSystemMemory(MemoryConstants::pageSize, MemoryConstants::pageSize);
}
void TearDown() override {
void TearDown() {
driverHandle->getMemoryManager()->freeSystemMemory(hostPointer);
ModuleFixture::TearDown();
}

8
level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp
View File

@@ -65,19 +65,21 @@ HWTEST2_F(DeviceQueueGroupTest,
EXPECT_EQ(count, 2u);
}
class DeviceCopyQueueGroupTest : public DeviceFixture, public ::testing::Test {
class DeviceCopyQueueGroupFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DebugManager.flags.EnableBlitterOperationsSupport.set(0);
DeviceFixture::SetUp();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
DebugManagerStateRestore restorer;
};
using DeviceCopyQueueGroupTest = Test<DeviceCopyQueueGroupFixture>;
HWTEST2_F(DeviceCopyQueueGroupTest,
givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsGen12LP) {
const uint32_t rootDeviceIndex = 0u;

8
level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
View File

@@ -166,8 +166,8 @@ HWTEST2_F(CommandQueueThreadArbitrationPolicyTests,
}
}
struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testing::Test {
void SetUp() override {
struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture {
void SetUp() {
NEO::MockCompilerEnableGuard mock(true);
MultiDeviceFixture::SetUp();
uint32_t count = 1;
@@ -177,12 +177,14 @@ struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testin
device = L0::Device::fromHandle(hDevice);
ASSERT_NE(nullptr, device);
}
void TearDown() override {
void TearDown() {
MultiDeviceFixture::TearDown();
}
L0::Device *device = nullptr;
};
using CommandQueueGroupMultiDevice = Test<CommandQueueGroupMultiDeviceFixture>;
HWTEST2_F(CommandQueueGroupMultiDevice,
givenCommandQueuePropertiesCallThenCallSucceedsAndCommandListImmediateIsCreated, IsGen9) {
uint32_t count = 0;

9
level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp
View File

@@ -24,7 +24,7 @@
namespace L0 {
namespace ult {
template <bool useImagesBuiltins, bool isStateless>
class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
class BuiltinFunctionsLibFixture : public DeviceFixture {
public:
struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl {
using BuiltinFunctionsLibImpl::builtins;
@@ -68,12 +68,12 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
module.release();
}
};
void SetUp() override {
void SetUp() {
DeviceFixture::SetUp();
mockDevicePtr = std::unique_ptr<MockDeviceForSpv<useImagesBuiltins, isStateless>>(new MockDeviceForSpv<useImagesBuiltins, isStateless>(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get()));
mockBuiltinFunctionsLibImpl.reset(new MockBuiltinFunctionsLibImpl(mockDevicePtr.get(), neoDevice->getBuiltIns()));
}
void TearDown() override {
void TearDown() {
mockBuiltinFunctionsLibImpl.reset();
DeviceFixture::TearDown();
}
@@ -82,6 +82,9 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
std::unique_ptr<MockDeviceForSpv<useImagesBuiltins, isStateless>> mockDevicePtr;
};
template <bool useImagesBuiltins, bool isStateless>
using TestBuiltinFunctionsLibImpl = Test<BuiltinFunctionsLibFixture<useImagesBuiltins, isStateless>>;
class TestBuiltinFunctionsLibImplDefault : public TestBuiltinFunctionsLibImpl<false, false> {};
class TestBuiltinFunctionsLibImplStateless : public TestBuiltinFunctionsLibImpl<false, true> {};
class TestBuiltinFunctionsLibImplImages : public TestBuiltinFunctionsLibImpl<true, false> {};

4
level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp vendored
View File

@@ -17,14 +17,14 @@ namespace ult {
class CacheReservationFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DeviceFixture::SetUp();
auto deviceImp = static_cast<DeviceImp *>(device);
ASSERT_NE(nullptr, deviceImp->cacheReservation.get());
cache = deviceImp->cacheReservation.get();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
CacheReservation *cache = nullptr;

4
level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp vendored
View File

@@ -17,13 +17,13 @@ namespace ult {
class CacheReservationFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DeviceFixture::SetUp();
auto deviceImp = static_cast<DeviceImp *>(device);
ASSERT_NE(nullptr, deviceImp->cacheReservation.get());
cache = deviceImp->cacheReservation.get();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
CacheReservation *cache = nullptr;

22
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp
View File

@@ -21,7 +21,7 @@
namespace L0 {
namespace ult {
class AppendFillFixture : public DeviceFixture, public ::testing::Test {
class AppendFillFixture : public DeviceFixture {
public:
class MockDriverFillHandle : public L0::DriverHandleImp {
public:
@@ -68,7 +68,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
uint32_t numberOfCallsToAppendLaunchKernelWithParams = 0;
};
void SetUp() override {
void SetUp() {
dstPtr = new uint8_t[allocSize];
immediateDstPtr = new uint8_t[allocSize];
@@ -82,7 +82,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
device = driverHandle->devices[0];
}
void TearDown() override {
void TearDown() {
delete[] immediateDstPtr;
delete[] dstPtr;
}
@@ -100,9 +100,11 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
uint8_t *immediateDstPtr = nullptr;
};
using AppendFillTest = Test<AppendFillFixture>;
using Platforms = IsAtLeastProduct<IGFX_SKYLAKE>;
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -115,7 +117,7 @@ HWTEST2_F(AppendFillFixture,
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenCallToAppendMemoryFillThenSuccessIsReturned, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -126,7 +128,7 @@ HWTEST2_F(AppendFillFixture,
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenCallToAppendMemoryFillWithAppendLaunchKernelFailureThenSuccessIsNotReturned, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -138,7 +140,7 @@ HWTEST2_F(AppendFillFixture,
EXPECT_NE(ZE_RESULT_SUCCESS, result);
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenTwoCallsToAppendMemoryFillWithSamePatternThenAllocationIsCreatedForEachCall, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -160,7 +162,7 @@ HWTEST2_F(AppendFillFixture,
delete[] newDstPtr;
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenTwoCallsToAppendMemoryFillWithDifferentPatternsThenAllocationIsCreatedForEachPattern, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -180,7 +182,7 @@ HWTEST2_F(AppendFillFixture,
EXPECT_EQ(patternAllocationsVectorSize + 1u, newPatternAllocationsVectorSize);
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeThenSuccessIsReturned, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
@@ -195,7 +197,7 @@ HWTEST2_F(AppendFillFixture,
delete[] nonMultipleDstPtr;
}
HWTEST2_F(AppendFillFixture,
HWTEST2_F(AppendFillTest,
givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeAndAppendLaunchKernelFailureOnRemainderThenSuccessIsNotReturned, Platforms) {
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;

17
level_zero/core/test/unit_tests/sources/event/test_event.cpp
View File

@@ -1186,17 +1186,16 @@ TEST_F(EventPoolCreateNegativeTest, whenInitializingEventPoolButMemoryManagerFai
delete[] devices;
}
class EventTests : public DeviceFixture,
public testing::Test {
class EventFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DeviceFixture::SetUp();
auto hDevice = device->toHandle();
eventPool = whitebox_cast(EventPool::create(device->getDriverHandle(), context, 1, &hDevice, &eventPoolDesc));
}
void TearDown() override {
void TearDown() {
eventPool->destroy();
DeviceFixture::TearDown();
@@ -1212,6 +1211,8 @@ class EventTests : public DeviceFixture,
EventPool *eventPool;
};
using EventTests = Test<EventFixture>;
TEST_F(EventTests, WhenQueryingStatusThenSuccessIsReturned) {
auto event = whitebox_cast(Event::create<uint32_t>(eventPool, &eventDesc, device));
ASSERT_NE(event, nullptr);
@@ -1269,13 +1270,13 @@ TEST_F(EventTests, givenTwoEventsCreatedThenTheyHaveDifferentAddresses) {
event1->destroy();
}
struct EventSizeTests : public DeviceFixture, public testing::Test {
void SetUp() override {
struct EventSizeFixture : public DeviceFixture {
void SetUp() {
DeviceFixture::SetUp();
hDevice = device->toHandle();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
@@ -1311,6 +1312,8 @@ struct EventSizeTests : public DeviceFixture, public testing::Test {
std::unique_ptr<L0::Event> eventObj1;
};
using EventSizeTests = Test<EventSizeFixture>;
HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) {
eventPool.reset(static_cast<EventPoolImp *>(EventPool::create(device->getDriverHandle(), context, 1, &hDevice, &eventPoolDesc)));

8
level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
View File

@@ -271,17 +271,19 @@ HWTEST2_F(SetKernelArg, givenBufferArgumentWhichHasNotBeenAllocatedByRuntimeThen
EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, res);
}
class KernelImmutableDataTests : public ModuleImmutableDataFixture, public ::testing::Test {
class KernelImmutableDataFixture : public ModuleImmutableDataFixture {
public:
void SetUp() override {
void SetUp() {
ModuleImmutableDataFixture::SetUp();
}
void TearDown() override {
void TearDown() {
ModuleImmutableDataFixture::TearDown();
}
};
using KernelImmutableDataTests = Test<KernelImmutableDataFixture>;
TEST_F(KernelImmutableDataTests, givenKernelInitializedWithNoPrivateMemoryThenPrivateMemoryIsNull) {
uint32_t perHwThreadPrivateMemorySizeRequested = 0u;
bool isInternal = false;

20
level_zero/core/test/unit_tests/sources/module/test_module.cpp
View File

@@ -477,10 +477,10 @@ HWTEST_F(ModuleTest, GivenIncorrectNameWhenCreatingKernelThenResultErrorInvalidA
EXPECT_EQ(ZE_RESULT_ERROR_INVALID_KERNEL_NAME, res);
}
template <typename T1, typename T2>
struct ModuleSpecConstantsTests : public DeviceFixture,
public ::testing::Test {
void SetUp() override {
struct ModuleSpecConstantsFixture : public DeviceFixture {
void SetUp() {
DeviceFixture::SetUp();
mockCompiler = new MockCompilerInterfaceWithSpecConstants<T1, T2>(moduleNumSpecConstants);
@@ -490,7 +490,7 @@ struct ModuleSpecConstantsTests : public DeviceFixture,
mockTranslationUnit = new MockModuleTranslationUnit(device);
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
@@ -600,6 +600,9 @@ struct ModuleSpecConstantsTests : public DeviceFixture,
MockModuleTranslationUnit *mockTranslationUnit;
};
template <typename T1, typename T2>
using ModuleSpecConstantsTests = Test<ModuleSpecConstantsFixture<T1, T2>>;
using ModuleSpecConstantsLongTests = ModuleSpecConstantsTests<uint32_t, uint64_t>;
TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWithLongSizeInDescriptorThenModuleCorrectlyPassesThemToTheCompiler) {
runTest();
@@ -763,13 +766,12 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
module->destroy();
}
struct ModuleStaticLinkTests : public DeviceFixture,
public ::testing::Test {
void SetUp() override {
struct ModuleStaticLinkFixture : public DeviceFixture {
void SetUp() {
DeviceFixture::SetUp();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
@@ -892,6 +894,8 @@ struct ModuleStaticLinkTests : public DeviceFixture,
ze_module_program_exp_desc_t staticLinkModuleDesc = {ZE_STRUCTURE_TYPE_MODULE_PROGRAM_EXP_DESC};
};
using ModuleStaticLinkTests = Test<ModuleStaticLinkFixture>;
TEST_F(ModuleStaticLinkTests, givenMultipleModulesProvidedForSpirVStaticLinkAndCompilerFailsThenFailureIsReturned) {
runLinkFailureTest();
}

8
level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp
View File

@@ -93,19 +93,21 @@ HWTEST2_F(DeviceQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAre
}
}
class DeviceCopyQueueGroupTest : public DeviceFixture, public ::testing::Test {
class DeviceCopyQueueGroupFixture : public DeviceFixture {
public:
void SetUp() override {
void SetUp() {
DebugManager.flags.EnableBlitterOperationsSupport.set(0);
DeviceFixture::SetUp();
}
void TearDown() override {
void TearDown() {
DeviceFixture::TearDown();
}
DebugManagerStateRestore restorer;
};
using DeviceCopyQueueGroupTest = Test<DeviceCopyQueueGroupFixture>;
HWTEST2_F(DeviceCopyQueueGroupTest,
givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpCore) {
const uint32_t rootDeviceIndex = 0u;