Skip to content

Commit 7e6432a

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
ULTs cleanup
- remove unused MemoryManagementFixture. MemoryLeaks are tracked using MemoryLeakListener no need to duplicate with Fixure. MMF should be used when you need to inject memory allocation failure Change-Id: I95bcaa7051acf540c5b015c5489ed6a6fc38ee8e
1 parent 9e509f3 commit 7e6432a

22 files changed

+52
-152
lines changed

‎unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -23,7 +23,6 @@
2323
#pragma once
2424
#include "gtest/gtest.h"
2525
#include "runtime/helpers/ptr_math.h"
26-
#include "unit_tests/fixtures/memory_management_fixture.h"
2726
#include "gen_cmd_parse.h"
2827
#include "unit_tests/command_queue/command_enqueue_fixture.h"
2928
#include "unit_tests/fixtures/buffer_fixture.h"
@@ -65,7 +64,6 @@ struct EnqueueCopyBufferRectHelper {
6564

6665
struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture,
6766
public EnqueueCopyBufferRectHelper,
68-
public MemoryManagementFixture,
6967
public ::testing::Test {
7068

7169
EnqueueCopyBufferRectTest(void) : srcBuffer(nullptr),
@@ -77,7 +75,6 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture,
7775
};
7876

7977
virtual void SetUp(void) override {
80-
MemoryManagementFixture::SetUp();
8178
CommandEnqueueFixture::SetUp();
8279
BufferDefaults::context = new MockContext;
8380

@@ -90,7 +87,6 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture,
9087
delete dstBuffer;
9188
delete BufferDefaults::context;
9289
CommandEnqueueFixture::TearDown();
93-
MemoryManagementFixture::TearDown();
9490
}
9591

9692
protected:

‎unit_tests/helpers/base_object_tests.cpp‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -33,7 +33,6 @@
3333
#include "runtime/sampler/sampler.h"
3434
#include "unit_tests/fixtures/buffer_fixture.h"
3535
#include "unit_tests/fixtures/image_fixture.h"
36-
#include "unit_tests/fixtures/memory_management_fixture.h"
3736
#include "unit_tests/mocks/mock_buffer.h"
3837
#include "unit_tests/fixtures/device_fixture.h"
3938
#include "runtime/api/api.h"
@@ -59,15 +58,7 @@ struct ObjectForTest2 : public OCLRT::BaseObject<_cl_object_for_test2> {
5958
};
6059

6160
template <typename TypeParam>
62-
struct BaseObjectTests : public MemoryManagementFixture,
63-
public ::testing::Test {
64-
void SetUp() override {
65-
MemoryManagementFixture::SetUp();
66-
}
67-
68-
void TearDown() override {
69-
MemoryManagementFixture::TearDown();
70-
}
61+
struct BaseObjectTests : public ::testing::Test {
7162
};
7263

7364
template <typename BaseType>
@@ -161,7 +152,7 @@ TYPED_TEST(BaseObjectTests, retain) {
161152

162153
object->release();
163154

164-
// MemoryManagementFixture will detect a leak
155+
// MemoryLeakListener will detect a leak
165156
// if release doesn't delete memory.
166157
}
167158

‎unit_tests/helpers/base_object_tests_mt.cpp‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -23,21 +23,12 @@
2323
#include "runtime/command_queue/command_queue.h"
2424
#include "runtime/platform/platform.h"
2525
#include "runtime/accelerators/intel_accelerator.h"
26-
#include "unit_tests/fixtures/memory_management_fixture.h"
26+
#include "gtest/gtest.h"
2727

2828
namespace OCLRT {
2929

3030
template <typename TypeParam>
31-
struct BaseObjectTestsMt : public MemoryManagementFixture,
32-
public ::testing::Test {
33-
void SetUp() override {
34-
MemoryManagementFixture::SetUp();
35-
}
36-
37-
void TearDown() override {
38-
MemoryManagementFixture::TearDown();
39-
}
40-
31+
struct BaseObjectTestsMt : public ::testing::Test {
4132
static void takeOwnerFailThreadFunc(TypeParam *obj) {
4233
auto ret = obj->takeOwnership(false);
4334
EXPECT_EQ(false, ret);

‎unit_tests/helpers/dispatch_info_builder_tests.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,14 @@
2424
#include "unit_tests/fixtures/context_fixture.h"
2525
#include "unit_tests/mocks/mock_kernel.h"
2626
#include "unit_tests/mocks/mock_buffer.h"
27-
#include "unit_tests/fixtures/memory_management_fixture.h"
2827
#include "unit_tests/fixtures/device_fixture.h"
2928
#include "test.h"
3029

3130
namespace OCLRT {
3231

3332
using namespace SplitDispatch;
3433

35-
class DispatchInfoBuilderFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture {
34+
class DispatchInfoBuilderFixture : public ContextFixture, public DeviceFixture {
3635
using ContextFixture::SetUp;
3736

3837
public:
@@ -42,8 +41,7 @@ class DispatchInfoBuilderFixture : public ContextFixture, public DeviceFixture,
4241
}
4342

4443
protected:
45-
void SetUp() override {
46-
MemoryManagementFixture::SetUp();
44+
void SetUp() {
4745
DeviceFixture::SetUp();
4846
cl_device_id device = pDevice;
4947
ContextFixture::SetUp(1, &device);
@@ -102,7 +100,6 @@ class DispatchInfoBuilderFixture : public ContextFixture, public DeviceFixture,
102100

103101
ContextFixture::TearDown();
104102
DeviceFixture::TearDown();
105-
MemoryManagementFixture::TearDown();
106103
}
107104

108105
KernelInfo *pKernelInfo = nullptr;

‎unit_tests/helpers/dispatch_info_tests.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "gtest/gtest.h"
2525
#include "unit_tests/mocks/mock_kernel.h"
2626
#include "unit_tests/fixtures/context_fixture.h"
27-
#include "unit_tests/fixtures/memory_management_fixture.h"
2827
#include "unit_tests/fixtures/device_fixture.h"
2928
#include "unit_tests/fixtures/image_fixture.h"
3029
#include <type_traits>
@@ -33,15 +32,14 @@
3332

3433
using namespace OCLRT;
3534

36-
class DispatchInfoFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture {
35+
class DispatchInfoFixture : public ContextFixture, public DeviceFixture {
3736
using ContextFixture::SetUp;
3837

3938
public:
4039
DispatchInfoFixture() {}
4140

4241
protected:
43-
void SetUp() override {
44-
MemoryManagementFixture::SetUp();
42+
void SetUp() {
4543
DeviceFixture::SetUp();
4644
cl_device_id device = pDevice;
4745
ContextFixture::SetUp(1, &device);
@@ -67,7 +65,6 @@ class DispatchInfoFixture : public ContextFixture, public DeviceFixture, public
6765

6866
ContextFixture::TearDown();
6967
DeviceFixture::TearDown();
70-
MemoryManagementFixture::TearDown();
7168
}
7269

7370
KernelInfo *pKernelInfo = nullptr;

‎unit_tests/kernel/clone_kernel_tests.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -30,7 +30,6 @@
3030
#include "runtime/memory_manager/svm_memory_manager.h"
3131
#include "unit_tests/fixtures/context_fixture.h"
3232
#include "unit_tests/fixtures/device_fixture.h"
33-
#include "unit_tests/fixtures/memory_management_fixture.h"
3433
#include "unit_tests/fixtures/image_fixture.h"
3534
#include "test.h"
3635
#include "unit_tests/mocks/mock_sampler.h"
@@ -45,16 +44,15 @@
4544

4645
using namespace OCLRT;
4746

48-
class CloneKernelFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture {
47+
class CloneKernelFixture : public ContextFixture, public DeviceFixture {
4948
using ContextFixture::SetUp;
5049

5150
public:
5251
CloneKernelFixture() {
5352
}
5453

5554
protected:
56-
void SetUp() override {
57-
MemoryManagementFixture::SetUp();
55+
void SetUp() {
5856
DeviceFixture::SetUp();
5957
cl_device_id device = pDevice;
6058
ContextFixture::SetUp(1, &device);
@@ -117,7 +115,6 @@ class CloneKernelFixture : public ContextFixture, public DeviceFixture, public M
117115
delete pProgram;
118116
ContextFixture::TearDown();
119117
DeviceFixture::TearDown();
120-
MemoryManagementFixture::TearDown();
121118
}
122119

123120
cl_int retVal = CL_SUCCESS;

‎unit_tests/kernel/kernel_arg_buffer_fixture.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,6 @@
2626
#include "runtime/mem_obj/buffer.h"
2727
#include "unit_tests/fixtures/context_fixture.h"
2828
#include "unit_tests/fixtures/device_fixture.h"
29-
#include "unit_tests/fixtures/memory_management_fixture.h"
3029
#include "test.h"
3130
#include "unit_tests/mocks/mock_buffer.h"
3231
#include "unit_tests/mocks/mock_context.h"
@@ -40,7 +39,6 @@
4039
using namespace OCLRT;
4140

4241
void KernelArgBufferFixture::SetUp() {
43-
MemoryManagementFixture::SetUp();
4442
DeviceFixture::SetUp();
4543
cl_device_id device = pDevice;
4644
ContextFixture::SetUp(1, &device);
@@ -78,5 +76,4 @@ void KernelArgBufferFixture::TearDown() {
7876
delete pProgram;
7977
ContextFixture::TearDown();
8078
DeviceFixture::TearDown();
81-
MemoryManagementFixture::TearDown();
8279
}

‎unit_tests/kernel/kernel_arg_buffer_fixture.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,6 @@
2626
#include "runtime/mem_obj/buffer.h"
2727
#include "unit_tests/fixtures/context_fixture.h"
2828
#include "unit_tests/fixtures/device_fixture.h"
29-
#include "unit_tests/fixtures/memory_management_fixture.h"
3029
#include "test.h"
3130
#include "unit_tests/mocks/mock_buffer.h"
3231
#include "unit_tests/mocks/mock_context.h"
@@ -38,7 +37,7 @@
3837

3938
using namespace OCLRT;
4039

41-
class KernelArgBufferFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture {
40+
class KernelArgBufferFixture : public ContextFixture, public DeviceFixture {
4241

4342
using ContextFixture::SetUp;
4443

@@ -48,8 +47,8 @@ class KernelArgBufferFixture : public ContextFixture, public DeviceFixture, publ
4847
}
4948

5049
protected:
51-
void SetUp() override;
52-
void TearDown() override;
50+
void SetUp();
51+
void TearDown();
5352

5453
cl_int retVal;
5554
MockProgram *pProgram;

‎unit_tests/kernel/kernel_arg_svm_tests.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,6 @@
2626
#include "runtime/mem_obj/buffer.h"
2727
#include "unit_tests/fixtures/context_fixture.h"
2828
#include "unit_tests/fixtures/device_fixture.h"
29-
#include "unit_tests/fixtures/memory_management_fixture.h"
3029
#include "unit_tests/mocks/mock_buffer.h"
3130
#include "unit_tests/mocks/mock_context.h"
3231
#include "unit_tests/mocks/mock_kernel.h"
@@ -38,7 +37,7 @@
3837

3938
using namespace OCLRT;
4039

41-
class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture, public MemoryManagementFixture {
40+
class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture {
4241

4342
using ContextFixture::SetUp;
4443

@@ -47,8 +46,7 @@ class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture, public
4746
}
4847

4948
protected:
50-
void SetUp() override {
51-
MemoryManagementFixture::SetUp();
49+
void SetUp() {
5250
DeviceFixture::SetUp();
5351
cl_device_id device = pDevice;
5452
ContextFixture::SetUp(1, &device);
@@ -84,7 +82,6 @@ class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture, public
8482
delete pProgram;
8583
ContextFixture::TearDown();
8684
DeviceFixture::TearDown();
87-
MemoryManagementFixture::TearDown();
8885
}
8986

9087
cl_int retVal = CL_SUCCESS;

‎unit_tests/kernel/kernel_tests.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,16 +286,13 @@ INSTANTIATE_TEST_CASE_P(KernelTests,
286286
::testing::ValuesIn(BinaryFileNames),
287287
::testing::ValuesIn(KernelNames)));
288288

289-
class KernelFromBinaryTest : public ProgramSimpleFixture,
290-
public MemoryManagementFixture {
289+
class KernelFromBinaryTest : public ProgramSimpleFixture {
291290
public:
292291
void SetUp() override {
293-
MemoryManagementFixture::SetUp();
294292
ProgramSimpleFixture::SetUp();
295293
}
296294
void TearDown() override {
297295
ProgramSimpleFixture::TearDown();
298-
MemoryManagementFixture::TearDown();
299296
}
300297
};
301298
typedef Test<KernelFromBinaryTest> KernelFromBinaryTests;

0 commit comments

Comments
 (0)