Skip to content

Commit 1bc7275

Browse files
Fix false positive memory leak in buffer tests
Remove platform fixture from buffer tests Change-Id: Iea0e40c31c2a7ea9e7eab9e60b9d06ba56f0effe
1 parent f61f72b commit 1bc7275

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

unit_tests/mem_obj/buffer_tests.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "test.h"
3232
#include "unit_tests/fixtures/device_fixture.h"
3333
#include "unit_tests/fixtures/memory_management_fixture.h"
34-
#include "unit_tests/fixtures/platform_fixture.h"
3534
#include "unit_tests/gen_common/matchers.h"
3635
#include "unit_tests/helpers/debug_manager_state_restore.h"
3736
#include "unit_tests/helpers/memory_management.h"
@@ -613,30 +612,25 @@ INSTANTIATE_TEST_CASE_P(
613612

614613
struct ValidHostPtr
615614
: public BufferTest,
616-
public MemoryManagementFixture,
617-
public PlatformFixture {
615+
public MemoryManagementFixture {
618616
typedef BufferTest BaseClass;
619617

620618
using BufferTest::SetUp;
621619
using MemoryManagementFixture::SetUp;
622-
using PlatformFixture::SetUp;
623620

624621
ValidHostPtr() {
625622
}
626623

627624
void SetUp() override {
628625
MemoryManagementFixture::SetUp();
629-
PlatformFixture::SetUp();
630626
BaseClass::SetUp();
631627

632-
auto pDevice = pPlatform->getDevice(0);
633628
ASSERT_NE(nullptr, pDevice);
634629
}
635630

636631
void TearDown() override {
637632
delete buffer;
638633
BaseClass::TearDown();
639-
PlatformFixture::TearDown();
640634
MemoryManagementFixture::TearDown();
641635
}
642636

@@ -809,17 +803,17 @@ TEST_P(ValidHostPtr, failedAllocationInjection) {
809803
}
810804

811805
TEST_P(ValidHostPtr, SvmHostPtr) {
812-
const DeviceInfo &devInfo = pPlatform->getDevice(0)->getDeviceInfo();
806+
const DeviceInfo &devInfo = pDevice->getDeviceInfo();
813807
if (devInfo.svmCapabilities != 0) {
814-
auto ptr = clSVMAlloc(context.get(), CL_MEM_READ_WRITE, 64, 64);
808+
auto ptr = context->getSVMAllocsManager()->createSVMAlloc(64, false);
815809

816810
auto bufferSvm = Buffer::create(context.get(), CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR, 64, ptr, retVal);
817811
EXPECT_NE(nullptr, bufferSvm);
818812
EXPECT_TRUE(bufferSvm->isMemObjWithHostPtrSVM());
819813
EXPECT_EQ(context->getSVMAllocsManager()->getSVMAlloc(ptr), bufferSvm->getGraphicsAllocation());
820814
EXPECT_EQ(CL_SUCCESS, retVal);
821815

822-
clSVMFree(context.get(), ptr);
816+
context->getSVMAllocsManager()->freeSVMAlloc(ptr);
823817
delete bufferSvm;
824818
}
825819
}

0 commit comments

Comments
 (0)