intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 13:33:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ClDevice

Browse Source 
Decouple cl_device_id from Device class.

Related-To: NEO-3938

Change-Id: I68543a753aea562f3b47ba0d23a059ff3cffa906
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2020-01-14 14:32:11 +01:00
parent b982fb058c
commit 8fcff2241f
333 changed files with 2482 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unit_tests/command_queue/enqueue_thread_tests.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -27,11 +27,13 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
private:
std::vector<GraphicsAllocation *> toFree; // pointers to be freed on destruction
Device *pDevice;
ClDevice *pClDevice;
public:
size_t expectedToFreeCount = (size_t)-1;
CommandStreamReceiverMock(Device *pDevice) : UltCommandStreamReceiver<FamilyType>(*pDevice->getExecutionEnvironment(), pDevice->getRootDeviceIndex()) {
this->pDevice = pDevice;
this->pClDevice = platform()->clDeviceMap[pDevice];
}
bool flush(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency) override {
@@ -47,7 +49,7 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
}
~CommandStreamReceiverMock() override {
EXPECT_FALSE(pDevice->hasOwnership());
EXPECT_FALSE(pClDevice->hasOwnership());
if (expectedToFreeCount == (size_t)-1) {
EXPECT_GT(toFree.size(), 0u); //make sure flush was called
} else {
@@ -64,7 +66,7 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
struct EnqueueThreadingFixture : public DeviceFixture {
void SetUp() {
DeviceFixture::SetUp();
context = new MockContext(pDevice);
context = new MockContext(pClDevice);
pCmdQ = nullptr;
}
@@ -78,12 +80,12 @@ struct EnqueueThreadingFixture : public DeviceFixture {
class MyCommandQueue : public CommandQueueHw<FamilyType> {
public:
MyCommandQueue(Context *context,
Device *device,
ClDevice *device,
const cl_queue_properties *props) : CommandQueueHw<FamilyType>(context, device, props), kernel(nullptr) {
}
static CommandQueue *create(Context *context,
Device *device,
ClDevice *device,
cl_command_queue_properties props) {
const cl_queue_properties properties[3] = {CL_QUEUE_PROPERTIES, props, 0};
return new MyCommandQueue<FamilyType>(context, device, properties);
@@ -110,7 +112,7 @@ struct EnqueueThreadingFixture : public DeviceFixture {
template <typename FamilyType>
void createCQ() {
pCmdQ = MyCommandQueue<FamilyType>::create(context, pDevice, 0);
pCmdQ = MyCommandQueue<FamilyType>::create(context, pClDevice, 0);
ASSERT_NE(nullptr, pCmdQ);
auto pCommandStreamReceiver = new CommandStreamReceiverMock<FamilyType>(pDevice);