Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add reference on device while creating a context

Browse Source 
- Context uses device, it needs to make sure it exists.

Change-Id: I1aeaabc53b6198965dc8f4e6fa37585490774a3f
This commit is contained in:
Mrozek, Michal
2018-06-27 15:53:35 +02:00
committed by sys_ocldev
parent d447c8c951
commit 887df5a90d
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
unit_tests/context/context_tests.cpp
View File

@ -58,9 +58,6 @@ struct ContextTest : public PlatformFixture,
using PlatformFixture::SetUp;
ContextTest() {
}
void SetUp() override {
PlatformFixture::SetUp();
@ -215,6 +212,30 @@ TEST_F(ContextTest, givenDefaultDeviceCmdQueueWithContextWhenBeingCreatedNextDel
EXPECT_EQ(1, context.getRefInternalCount());
}
TEST_F(ContextTest, givenContextWhenItIsCreatedFromDeviceThenItAddsRefCountToThisDevice) {
auto device = castToObject<Device>(devices[0]);
EXPECT_EQ(2, device->getRefInternalCount());
cl_device_id deviceID = devices[0];
std::unique_ptr<Context> context(Context::create<Context>(0, DeviceVector(&deviceID, 1), nullptr, nullptr, retVal));
EXPECT_EQ(3, device->getRefInternalCount());
context.reset(nullptr);
EXPECT_EQ(2, device->getRefInternalCount());
}
TEST_F(ContextTest, givenContextWhenItIsCreatedFromMultipleDevicesThenItAddsRefCountToThoseDevices) {
auto device = castToObject<Device>(devices[0]);
EXPECT_EQ(2, device->getRefInternalCount());
DeviceVector devicesVector;
devicesVector.push_back(device);
devicesVector.push_back(device);
std::unique_ptr<Context> context(Context::create<Context>(0, devicesVector, nullptr, nullptr, retVal));
EXPECT_EQ(4, device->getRefInternalCount());
context.reset(nullptr);
EXPECT_EQ(2, device->getRefInternalCount());
}
TEST_F(ContextTest, givenSpecialCmdQueueWithContextWhenBeingCreatedNextAutoDeletedThenContextRefCountShouldNeitherBeIncrementedNorNextDecremented) {
MockContext context((Device *)devices[0], true);
EXPECT_EQ(1, context.getRefInternalCount());

7
unit_tests/mocks/mock_context.cpp
View File

@ -43,6 +43,7 @@ MockContext::MockContext(Device *device, bool noSpecialQueue) {
assert(retVal == CL_SUCCESS);
overrideSpecialQueueAndDecrementRefCount(commandQueue);
}
device->incRefInternal();
}
MockContext::MockContext(
@ -70,13 +71,13 @@ MockContext::~MockContext() {
}
MockContext::MockContext() {
device = std::unique_ptr<Device>(DeviceHelper<>::create());
devices.push_back(device.get());
device = DeviceHelper<>::create();
devices.push_back(device);
memoryManager = device->getMemoryManager();
svmAllocsManager = new SVMAllocsManager(memoryManager);
cl_int retVal;
if (!specialQueue) {
auto commandQueue = CommandQueue::create(this, device.get(), nullptr, retVal);
auto commandQueue = CommandQueue::create(this, device, nullptr, retVal);
assert(retVal == CL_SUCCESS);
overrideSpecialQueueAndDecrementRefCount(commandQueue);
}

4
unit_tests/mocks/mock_context.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -51,6 +51,6 @@ class MockContext : public Context {
DriverDiagnostics *getDriverDiagnostics() { return this->driverDiagnostics; }
private:
std::unique_ptr<Device> device;
Device *device;
};
} // namespace OCLRT