Skip to content

Commit 3d3881e

Browse files
zzdanowiczCompute-Runtime-Automation
zzdanowicz
authored and
Compute-Runtime-Automation
committed
Remove not needed virtual function from tests
Signed-off-by: Zbigniew Zdanowicz <[email protected]>
1 parent dbeb263 commit 3d3881e

File tree

15 files changed

+92
-72
lines changed

15 files changed

+92
-72
lines changed

‎level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ult {
1717

1818
class CommandListFixture : public DeviceFixture {
1919
public:
20-
void SetUp() override {
20+
void SetUp() {
2121
DeviceFixture::SetUp();
2222
ze_result_t returnValue;
2323
commandList.reset(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)));
@@ -35,7 +35,7 @@ class CommandListFixture : public DeviceFixture {
3535
event = std::unique_ptr<Event>(Event::create<uint32_t>(eventPool.get(), &eventDesc, device));
3636
}
3737

38-
void TearDown() override {
38+
void TearDown() {
3939
DeviceFixture::TearDown();
4040
}
4141

‎level_zero/core/test/unit_tests/fixtures/device_fixture.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class MockBuiltins;
3333

3434
struct DeviceFixture {
3535
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
36-
virtual void SetUp(); // NOLINT(readability-identifier-naming)
37-
virtual void TearDown(); // NOLINT(readability-identifier-naming)
36+
void SetUp(); // NOLINT(readability-identifier-naming)
37+
void TearDown(); // NOLINT(readability-identifier-naming)
3838
void setupWithExecutionEnvironment(NEO::ExecutionEnvironment &executionEnvironment);
3939

4040
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
@@ -46,8 +46,8 @@ struct DeviceFixture {
4646

4747
struct PageFaultDeviceFixture {
4848
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
49-
virtual void SetUp(); // NOLINT(readability-identifier-naming)
50-
virtual void TearDown(); // NOLINT(readability-identifier-naming)
49+
void SetUp(); // NOLINT(readability-identifier-naming)
50+
void TearDown(); // NOLINT(readability-identifier-naming)
5151

5252
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
5353
std::unique_ptr<MockMemoryManager> mockMemoryManager;
@@ -60,8 +60,8 @@ struct PageFaultDeviceFixture {
6060

6161
struct MultiDeviceFixture {
6262
NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true);
63-
virtual void SetUp(); // NOLINT(readability-identifier-naming)
64-
virtual void TearDown(); // NOLINT(readability-identifier-naming)
63+
void SetUp(); // NOLINT(readability-identifier-naming)
64+
void TearDown(); // NOLINT(readability-identifier-naming)
6565

6666
DebugManagerStateRestore restorer;
6767
std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
@@ -72,18 +72,18 @@ struct MultiDeviceFixture {
7272
};
7373

7474
struct SingleRootMultiSubDeviceFixture : public MultiDeviceFixture {
75-
void SetUp() override;
75+
void SetUp();
7676

7777
L0::Device *device = nullptr;
7878
NEO::Device *neoDevice = nullptr;
7979
};
8080

8181
struct ContextFixture : DeviceFixture {
82-
void SetUp() override;
83-
void TearDown() override;
82+
void SetUp();
83+
void TearDown();
8484
};
8585

86-
struct AubCsrFixture : ContextFixture {
86+
struct AubCsrFixture : public ContextFixture {
8787
template <typename T>
8888
void SetUpT() {
8989
auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + NEO::defaultHwInfo->platform.eRenderCoreFamily];
@@ -96,8 +96,8 @@ struct AubCsrFixture : ContextFixture {
9696
ContextFixture::TearDown();
9797
}
9898

99-
void SetUp() override{};
100-
void TearDown() override{};
99+
void SetUp() {}
100+
void TearDown() {}
101101
std::unique_ptr<VariableBackup<CommandStreamReceiverCreateFunc>> variableBackup;
102102
};
103103

‎level_zero/core/test/unit_tests/fixtures/module_fixture.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
136136
}
137137
};
138138

139-
void SetUp() override {
139+
void SetUp() {
140140
auto executionEnvironment = MockDevice::prepareExecutionEnvironment(NEO::defaultHwInfo.get(), 0u);
141141
memoryManager = new MockImmutableMemoryManager(*executionEnvironment);
142142
executionEnvironment->memoryManager.reset(memoryManager);
@@ -179,7 +179,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
179179
kernel->initialize(&desc);
180180
}
181181

182-
void TearDown() override {
182+
void TearDown() {
183183
DeviceFixture::TearDown();
184184
}
185185

@@ -191,7 +191,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
191191
};
192192

193193
struct ModuleFixture : public DeviceFixture {
194-
void SetUp() override {
194+
void SetUp() {
195195
NEO::MockCompilerEnableGuard mock(true);
196196
DeviceFixture::SetUp();
197197
createModuleFromBinary();
@@ -228,7 +228,7 @@ struct ModuleFixture : public DeviceFixture {
228228
kernel->initialize(&desc);
229229
}
230230

231-
void TearDown() override {
231+
void TearDown() {
232232
DeviceFixture::TearDown();
233233
}
234234

@@ -240,7 +240,7 @@ struct ModuleFixture : public DeviceFixture {
240240
};
241241

242242
struct MultiDeviceModuleFixture : public MultiDeviceFixture {
243-
void SetUp() override {
243+
void SetUp() {
244244
MultiDeviceFixture::SetUp();
245245
modules.resize(numRootDevices);
246246
}
@@ -277,7 +277,7 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture {
277277
kernel->initialize(&desc);
278278
}
279279

280-
void TearDown() override {
280+
void TearDown() {
281281
MultiDeviceFixture::TearDown();
282282
}
283283

@@ -289,14 +289,14 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture {
289289
};
290290

291291
struct ImportHostPointerModuleFixture : public ModuleFixture {
292-
void SetUp() override {
292+
void SetUp() {
293293
DebugManager.flags.EnableHostPointerImport.set(1);
294294
ModuleFixture::SetUp();
295295

296296
hostPointer = driverHandle->getMemoryManager()->allocateSystemMemory(MemoryConstants::pageSize, MemoryConstants::pageSize);
297297
}
298298

299-
void TearDown() override {
299+
void TearDown() {
300300
driverHandle->getMemoryManager()->freeSystemMemory(hostPointer);
301301
ModuleFixture::TearDown();
302302
}

‎level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,21 @@ HWTEST2_F(DeviceQueueGroupTest,
6565
EXPECT_EQ(count, 2u);
6666
}
6767

68-
class DeviceCopyQueueGroupTest : public DeviceFixture, public ::testing::Test {
68+
class DeviceCopyQueueGroupFixture : public DeviceFixture {
6969
public:
70-
void SetUp() override {
70+
void SetUp() {
7171
DebugManager.flags.EnableBlitterOperationsSupport.set(0);
7272
DeviceFixture::SetUp();
7373
}
7474

75-
void TearDown() override {
75+
void TearDown() {
7676
DeviceFixture::TearDown();
7777
}
7878
DebugManagerStateRestore restorer;
7979
};
8080

81+
using DeviceCopyQueueGroupTest = Test<DeviceCopyQueueGroupFixture>;
82+
8183
HWTEST2_F(DeviceCopyQueueGroupTest,
8284
givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsGen12LP) {
8385
const uint32_t rootDeviceIndex = 0u;

‎level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ HWTEST2_F(CommandQueueThreadArbitrationPolicyTests,
166166
}
167167
}
168168

169-
struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testing::Test {
170-
void SetUp() override {
169+
struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture {
170+
void SetUp() {
171171
NEO::MockCompilerEnableGuard mock(true);
172172
MultiDeviceFixture::SetUp();
173173
uint32_t count = 1;
@@ -177,12 +177,14 @@ struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testin
177177
device = L0::Device::fromHandle(hDevice);
178178
ASSERT_NE(nullptr, device);
179179
}
180-
void TearDown() override {
180+
void TearDown() {
181181
MultiDeviceFixture::TearDown();
182182
}
183183
L0::Device *device = nullptr;
184184
};
185185

186+
using CommandQueueGroupMultiDevice = Test<CommandQueueGroupMultiDeviceFixture>;
187+
186188
HWTEST2_F(CommandQueueGroupMultiDevice,
187189
givenCommandQueuePropertiesCallThenCallSucceedsAndCommandListImmediateIsCreated, IsGen9) {
188190
uint32_t count = 0;

‎level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
namespace L0 {
2525
namespace ult {
2626
template <bool useImagesBuiltins, bool isStateless>
27-
class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
27+
class BuiltinFunctionsLibFixture : public DeviceFixture {
2828
public:
2929
struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl {
3030
using BuiltinFunctionsLibImpl::builtins;
@@ -68,12 +68,12 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
6868
module.release();
6969
}
7070
};
71-
void SetUp() override {
71+
void SetUp() {
7272
DeviceFixture::SetUp();
7373
mockDevicePtr = std::unique_ptr<MockDeviceForSpv<useImagesBuiltins, isStateless>>(new MockDeviceForSpv<useImagesBuiltins, isStateless>(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get()));
7474
mockBuiltinFunctionsLibImpl.reset(new MockBuiltinFunctionsLibImpl(mockDevicePtr.get(), neoDevice->getBuiltIns()));
7575
}
76-
void TearDown() override {
76+
void TearDown() {
7777
mockBuiltinFunctionsLibImpl.reset();
7878
DeviceFixture::TearDown();
7979
}
@@ -82,6 +82,9 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
8282
std::unique_ptr<MockDeviceForSpv<useImagesBuiltins, isStateless>> mockDevicePtr;
8383
};
8484

85+
template <bool useImagesBuiltins, bool isStateless>
86+
using TestBuiltinFunctionsLibImpl = Test<BuiltinFunctionsLibFixture<useImagesBuiltins, isStateless>>;
87+
8588
class TestBuiltinFunctionsLibImplDefault : public TestBuiltinFunctionsLibImpl<false, false> {};
8689
class TestBuiltinFunctionsLibImplStateless : public TestBuiltinFunctionsLibImpl<false, true> {};
8790
class TestBuiltinFunctionsLibImplImages : public TestBuiltinFunctionsLibImpl<true, false> {};

‎level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ namespace ult {
1717

1818
class CacheReservationFixture : public DeviceFixture {
1919
public:
20-
void SetUp() override {
20+
void SetUp() {
2121
DeviceFixture::SetUp();
2222
auto deviceImp = static_cast<DeviceImp *>(device);
2323
ASSERT_NE(nullptr, deviceImp->cacheReservation.get());
2424

2525
cache = deviceImp->cacheReservation.get();
2626
}
27-
void TearDown() override {
27+
void TearDown() {
2828
DeviceFixture::TearDown();
2929
}
3030
CacheReservation *cache = nullptr;

‎level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ namespace ult {
1717

1818
class CacheReservationFixture : public DeviceFixture {
1919
public:
20-
void SetUp() override {
20+
void SetUp() {
2121
DeviceFixture::SetUp();
2222
auto deviceImp = static_cast<DeviceImp *>(device);
2323
ASSERT_NE(nullptr, deviceImp->cacheReservation.get());
2424
cache = deviceImp->cacheReservation.get();
2525
}
26-
void TearDown() override {
26+
void TearDown() {
2727
DeviceFixture::TearDown();
2828
}
2929
CacheReservation *cache = nullptr;

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace L0 {
2222
namespace ult {
2323

24-
class AppendFillFixture : public DeviceFixture, public ::testing::Test {
24+
class AppendFillFixture : public DeviceFixture {
2525
public:
2626
class MockDriverFillHandle : public L0::DriverHandleImp {
2727
public:
@@ -68,7 +68,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
6868
uint32_t numberOfCallsToAppendLaunchKernelWithParams = 0;
6969
};
7070

71-
void SetUp() override {
71+
void SetUp() {
7272
dstPtr = new uint8_t[allocSize];
7373
immediateDstPtr = new uint8_t[allocSize];
7474

@@ -82,7 +82,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
8282
device = driverHandle->devices[0];
8383
}
8484

85-
void TearDown() override {
85+
void TearDown() {
8686
delete[] immediateDstPtr;
8787
delete[] dstPtr;
8888
}
@@ -100,9 +100,11 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test {
100100
uint8_t *immediateDstPtr = nullptr;
101101
};
102102

103+
using AppendFillTest = Test<AppendFillFixture>;
104+
103105
using Platforms = IsAtLeastProduct<IGFX_SKYLAKE>;
104106

105-
HWTEST2_F(AppendFillFixture,
107+
HWTEST2_F(AppendFillTest,
106108
givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned, Platforms) {
107109
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
108110

@@ -115,7 +117,7 @@ HWTEST2_F(AppendFillFixture,
115117
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
116118
}
117119

118-
HWTEST2_F(AppendFillFixture,
120+
HWTEST2_F(AppendFillTest,
119121
givenCallToAppendMemoryFillThenSuccessIsReturned, Platforms) {
120122
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
121123

@@ -126,7 +128,7 @@ HWTEST2_F(AppendFillFixture,
126128
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
127129
}
128130

129-
HWTEST2_F(AppendFillFixture,
131+
HWTEST2_F(AppendFillTest,
130132
givenCallToAppendMemoryFillWithAppendLaunchKernelFailureThenSuccessIsNotReturned, Platforms) {
131133
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
132134

@@ -138,7 +140,7 @@ HWTEST2_F(AppendFillFixture,
138140
EXPECT_NE(ZE_RESULT_SUCCESS, result);
139141
}
140142

141-
HWTEST2_F(AppendFillFixture,
143+
HWTEST2_F(AppendFillTest,
142144
givenTwoCallsToAppendMemoryFillWithSamePatternThenAllocationIsCreatedForEachCall, Platforms) {
143145
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
144146

@@ -160,7 +162,7 @@ HWTEST2_F(AppendFillFixture,
160162
delete[] newDstPtr;
161163
}
162164

163-
HWTEST2_F(AppendFillFixture,
165+
HWTEST2_F(AppendFillTest,
164166
givenTwoCallsToAppendMemoryFillWithDifferentPatternsThenAllocationIsCreatedForEachPattern, Platforms) {
165167
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
166168

@@ -180,7 +182,7 @@ HWTEST2_F(AppendFillFixture,
180182
EXPECT_EQ(patternAllocationsVectorSize + 1u, newPatternAllocationsVectorSize);
181183
}
182184

183-
HWTEST2_F(AppendFillFixture,
185+
HWTEST2_F(AppendFillTest,
184186
givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeThenSuccessIsReturned, Platforms) {
185187
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
186188

@@ -195,7 +197,7 @@ HWTEST2_F(AppendFillFixture,
195197
delete[] nonMultipleDstPtr;
196198
}
197199

198-
HWTEST2_F(AppendFillFixture,
200+
HWTEST2_F(AppendFillTest,
199201
givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeAndAppendLaunchKernelFailureOnRemainderThenSuccessIsNotReturned, Platforms) {
200202
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
201203

0 commit comments

Comments
 (0)