Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add specializedDevice pointer to Device 

Related-To: NEO-3938

Change-Id: Ic3386580a22c41f34c67949ccb7f7c6957c8f60d
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski 2020-01-31 15:00:25 +01:00 committed by sys_ocldev
parent 5c4abe1261
commit 5495a4b458
26 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/api/api.cpp
View File

@ -5352,7 +5352,8 @@ cl_int CL_API_CALL clEnqueueNDCountKernelINTEL(cl_command_queue commandQueue,
retVal = CL_INVALID_KERNEL;
return retVal;
}
platform()->clDeviceMap[&pCommandQueue->getDevice()]->allocateSyncBufferHandler();
pCommandQueue->getDevice().getSpecializedDevice<ClDevice>()->allocateSyncBufferHandler();
}
TakeOwnershipWrapper<Kernel> kernelOwnership(*pKernel, gtpinIsGTPinInitialized());

2
runtime/device/cl_device.cpp
View File

@ -23,7 +23,7 @@ ClDevice::ClDevice(Device &device, Platform *platform) : device(device), platfor
if (numAvailableDevices > 1) {
for (uint32_t i = 0; i < numAvailableDevices; i++) {
subDevices.push_back(std::make_unique<ClDevice>(*device.getDeviceById(i), platform));
platform->clDeviceMap.emplace(device.getDeviceById(i), subDevices[i].get());
device.getDeviceById(i)->setSpecializedDevice(subDevices[i].get());
}
}
}

10
runtime/device/device.h
View File

@ -61,6 +61,14 @@ class Device : public ReferenceTrackedObject<Device> {
bool areSharedSystemAllocationsAllowed() const {
return this->deviceInfo.sharedSystemMemCapabilities != 0u;
}
template <typename SpecializedDeviceT>
void setSpecializedDevice(SpecializedDeviceT *specializedDevice) {
this->specializedDevice = reinterpret_cast<uintptr_t>(specializedDevice);
}
template <typename SpecializedDeviceT>
SpecializedDeviceT *getSpecializedDevice() const {
return reinterpret_cast<SpecializedDeviceT *>(specializedDevice);
}
virtual uint32_t getRootDeviceIndex() const = 0;
virtual uint32_t getNumAvailableDevices() const = 0;
@ -106,6 +114,8 @@ class Device : public ReferenceTrackedObject<Device> {
PreemptionMode preemptionMode;
ExecutionEnvironment *executionEnvironment = nullptr;
uint32_t defaultEngineIndex = 0;
uintptr_t specializedDevice = reinterpret_cast<uintptr_t>(nullptr);
};
inline EngineControl &Device::getDefaultEngine() {

9
runtime/helpers/queue_helpers.h
View File

@ -8,8 +8,9 @@
#pragma once
#include "core/helpers/get_info.h"
#include "runtime/command_queue/command_queue.h"
#include "runtime/device/cl_device.h"
#include "runtime/device/device.h"
#include "runtime/device_queue/device_queue.h"
#include "runtime/platform/platform.h"
namespace NEO {
@ -61,9 +62,11 @@ cl_int getQueueInfo(QueueType *queue,
case CL_QUEUE_CONTEXT:
getInfoHelper.set<cl_context>(&queue->getContext());
break;
case CL_QUEUE_DEVICE:
getInfoHelper.set<cl_device_id>(platform()->clDeviceMap[&queue->getDevice()]);
case CL_QUEUE_DEVICE: {
Device &device = queue->getDevice();
getInfoHelper.set<cl_device_id>(device.getSpecializedDevice<ClDevice>());
break;
}
case CL_QUEUE_REFERENCE_COUNT:
getInfoHelper.set<cl_int>(queue->getReference());
break;

2
runtime/kernel/kernel.cpp
View File

@ -2279,7 +2279,7 @@ void Kernel::patchSyncBuffer(Device &device, GraphicsAllocation *gfxAllocation,
patchInfo.pAllocateSyncBuffer->SurfaceStateHeapOffset);
auto addressToPatch = gfxAllocation->getUnderlyingBuffer();
auto sizeToPatch = gfxAllocation->getUnderlyingBufferSize();
Buffer::setSurfaceState(platform()->clDeviceMap[&device], surfaceState, sizeToPatch, addressToPatch, 0, gfxAllocation, 0, 0);
Buffer::setSurfaceState(device.getSpecializedDevice<ClDevice>(), surfaceState, sizeToPatch, addressToPatch, 0, gfxAllocation, 0, 0);
}
}

3
runtime/platform/platform.cpp
View File

@ -52,7 +52,6 @@ Platform *constructPlatform() {
Platform::Platform() {
clDevices.reserve(4);
clDeviceMap.reserve(20);
setAsyncEventsHandler(std::unique_ptr<AsyncEventsHandler>(new AsyncEventsHandler()));
executionEnvironment = new ExecutionEnvironment;
executionEnvironment->incRefInternal();
@ -161,7 +160,7 @@ bool Platform::initialize() {
DEBUG_BREAK_IF(!pClDevice);
if (pClDevice) {
this->clDevices[deviceOrdinal] = pClDevice;
this->clDeviceMap.emplace(pDevice, pClDevice);
pDevice->setSpecializedDevice(pClDevice);
this->platformInfo->extensions = pDevice->getDeviceInfo().deviceExtensions;

1
runtime/platform/platform.h
View File

@ -54,7 +54,6 @@ class Platform : public BaseObject<_cl_platform_id> {
Device *getDevice(size_t deviceOrdinal);
ClDevice **getClDevices();
ClDevice *getClDevice(size_t deviceOrdinal);
std::unordered_map<const Device *, ClDevice *> clDeviceMap;
const PlatformInfo &getPlatformInfo() const;
AsyncEventsHandler *getAsyncEventsHandler();

3
runtime/program/build.cpp
View File

@ -8,6 +8,7 @@
#include "core/compiler_interface/compiler_interface.h"
#include "core/utilities/time_measure_wrapper.h"
#include "runtime/device/cl_device.h"
#include "runtime/device/device.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gtpin/gtpin_notify.h"
#include "runtime/helpers/validators.h"
@ -186,7 +187,7 @@ void Program::notifyDebuggerWithSourceCode(std::string &filename) {
cl_int Program::build(const Device *pDevice, const char *buildOptions, bool enableCaching,
std::unordered_map<std::string, BuiltinDispatchInfoBuilder *> &builtinsMap) {
cl_device_id deviceId = platform()->clDeviceMap[pDevice];
cl_device_id deviceId = pDevice->getSpecializedDevice<ClDevice>();
auto ret = this->build(1, &deviceId, buildOptions, nullptr, nullptr, enableCaching);
if (ret != CL_SUCCESS) {
return ret;

3
runtime/program/create.inl
View File

@ -9,6 +9,7 @@
#include "core/memory_manager/memory_constants.h"
#include "runtime/context/context.h"
#include "runtime/device/cl_device.h"
#include "runtime/device/device.h"
#include "runtime/helpers/string_helpers.h"
#include "runtime/platform/platform.h"
#include "runtime/program/program.h"
@ -122,7 +123,7 @@ T *Program::create(
Device &device,
bool isBuiltIn,
cl_int *errcodeRet) {
return Program::create<T>(nullTerminatedString, context, *platform()->clDeviceMap[&device], isBuiltIn, errcodeRet);
return Program::create<T>(nullTerminatedString, context, *device.getSpecializedDevice<ClDevice>(), isBuiltIn, errcodeRet);
}
template <typename T>

2
runtime/program/program.cpp
View File

@ -287,7 +287,7 @@ bool Program::isValidLlvmBinary(
}
void Program::setDevice(Device *device) {
this->pDevice = platform()->clDeviceMap[device];
this->pDevice = device->getSpecializedDevice<ClDevice>();
}
cl_int Program::getSource(std::string &binary) const {

2
unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp
View File

@ -32,7 +32,7 @@ struct CopyBufferHw
typedef CopyBufferHw AUBCopyBuffer;
HWTEST_P(AUBCopyBuffer, simple) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
cl_float srcMemory[] = {1.0f, 2.0f, 3.0f, 4.0f};
cl_float dstMemory[] = {0.0f, 0.0f, 0.0f, 0.0f};

4
unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp
View File

@ -35,7 +35,7 @@ typedef FillBufferHw AUBFillBuffer;
HWTEST_P(AUBFillBuffer, simple) {
cl_float destMemory[] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
auto pDestMemory = &destMemory[0];
MockContext context(platform()->clDeviceMap[&this->pCmdQ->getDevice()]);
MockContext context(this->pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
auto retVal = CL_INVALID_VALUE;
auto destBuffer = Buffer::create(
&context,
@ -97,7 +97,7 @@ HWTEST_F(AUBFillBuffer, givenFillBufferWhenSeveralSubmissionsWithoutPollForCompl
cl_float destMemory[] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
auto pDestMemory = &destMemory[0];
MockContext context(platform()->clDeviceMap[&this->pCmdQ->getDevice()]);
MockContext context(this->pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
auto retVal = CL_INVALID_VALUE;
std::unique_ptr<Buffer> destBuffer(Buffer::create(
&context,

2
unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp
View File

@ -26,7 +26,7 @@ struct AUBMapBuffer
};
HWTEST_F(AUBMapBuffer, MapUpdateUnmapVerify) {
MockContext context(platform()->clDeviceMap[&this->pCmdQ->getDevice()]);
MockContext context(this->pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
auto retVal = CL_INVALID_VALUE;
size_t bufferSize = 10;

2
unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp
View File

@ -171,7 +171,7 @@ struct AUBReadBufferUnaligned
template <typename FamilyType>
void testReadBufferUnaligned(size_t offset, size_t size) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const auto bufferSize = sizeof(srcMemory);

2
unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp
View File

@ -127,7 +127,7 @@ struct AUBReadBufferRectUnaligned
template <typename FamilyType>
void testReadBufferUnaligned(size_t offset, size_t size) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const auto bufferSize = sizeof(srcMemory);

4
unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h
View File

@ -32,7 +32,7 @@ struct AUBImageUnaligned
template <typename FamilyType>
void testReadImageUnaligned(size_t offset, size_t size, size_t pixelSize) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnoprstuwxyz";
const auto bufferSize = sizeof(srcMemory) - 1;
@ -128,7 +128,7 @@ struct AUBImageUnaligned
void testWriteImageUnaligned(size_t offset, size_t size, size_t pixelSize) {
DebugManagerStateRestore restorer;
DebugManager.flags.ForceLinearImages.set(true);
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnoprstuwxyz";
const auto bufferSize = sizeof(srcMemory);

2
unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp
View File

@ -76,7 +76,7 @@ HWTEST_P(VerifyMemoryBufferHw, givenDifferentBuffersWhenValidatingMemoryThenSucc
invalidContent2.get()[offset + itemOffset] = pTestItemWrong2[itemOffset];
}
MockContext context(platform()->clDeviceMap[&this->pCmdQ->getDevice()]);
MockContext context(this->pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
cl_int retVal = CL_INVALID_VALUE;
std::unique_ptr<Buffer> buffer(Buffer::create(

4
unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp
View File

@ -29,7 +29,7 @@ struct TimestampPacketAubTests : public CommandEnqueueAUBFixture, public ::testi
};
HWTEST_F(TimestampPacketAubTests, givenTwoBatchedEnqueuesWhenDependencyIsResolvedThenDecrementCounterOnGpu) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
pCommandStreamReceiver->overrideDispatchPolicy(DispatchMode::BatchedDispatch);
const size_t bufferSize = 1024;
@ -70,7 +70,7 @@ HWTEST_F(TimestampPacketAubTests, givenTwoBatchedEnqueuesWhenDependencyIsResolve
}
HWTEST_F(TimestampPacketAubTests, givenMultipleWalkersWhenEnqueueingThenWriteAllTimestamps) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
const size_t bufferSize = 70;
const size_t writeSize = bufferSize - 2;
uint8_t writeData[writeSize] = {};

4
unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp
View File

@ -33,7 +33,7 @@ struct WriteBufferHw
typedef WriteBufferHw AUBWriteBuffer;
HWTEST_P(AUBWriteBuffer, simple) {
MockContext context(platform()->clDeviceMap[&this->pCmdQ->getDevice()]);
MockContext context(this->pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
cl_float *srcMemory = new float[1024];
cl_float *destMemory = new float[1024];
@ -124,7 +124,7 @@ struct AUBWriteBufferUnaligned
template <typename FamilyType>
void testWriteBufferUnaligned(size_t offset, size_t size) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const auto bufferSize = sizeof(srcMemory);

2
unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp
View File

@ -126,7 +126,7 @@ struct AUBWriteBufferRectUnaligned
template <typename FamilyType>
void testWriteBufferUnaligned(size_t offset, size_t size) {
MockContext context(platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockContext context(pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
char srcMemory[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const auto bufferSize = sizeof(srcMemory);

2
unit_tests/command_queue/command_queue_hw_tests.cpp
View File

@ -291,7 +291,7 @@ HWTEST_F(CommandQueueHwTest, GivenNonEmptyQueueOnBlockingMapBufferWillWaitForPre
bool finishWasCalled;
};
MockCmdQ cmdQ(context, platform()->clDeviceMap[&pCmdQ->getDevice()]);
MockCmdQ cmdQ(context, pCmdQ->getDevice().getSpecializedDevice<ClDevice>());
auto b1 = clCreateBuffer(context, CL_MEM_READ_WRITE, 20, nullptr, nullptr);
auto b2 = clCreateBuffer(context, CL_MEM_READ_WRITE, 20, nullptr, nullptr);

2
unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h
View File

@ -26,7 +26,7 @@ struct EnqueueReadBufferRectTest : public CommandEnqueueFixture,
void SetUp() override {
CommandEnqueueFixture::SetUp();
context.reset(new MockContext(platform()->clDeviceMap[&pCmdQ->getDevice()]));
context.reset(new MockContext(pCmdQ->getDevice().getSpecializedDevice<ClDevice>()));
BufferDefaults::context = context.get();
//For 3D

2
unit_tests/command_queue/enqueue_thread_tests.cpp
View File

@ -33,7 +33,7 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
size_t expectedToFreeCount = (size_t)-1;
CommandStreamReceiverMock(Device *pDevice) : UltCommandStreamReceiver<FamilyType>(*pDevice->getExecutionEnvironment(), pDevice->getRootDeviceIndex()) {
this->pDevice = pDevice;
this->pClDevice = platform()->clDeviceMap[pDevice];
this->pClDevice = pDevice->getSpecializedDevice<ClDevice>();
}
bool flush(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency) override {

13
unit_tests/mocks/mock_device.cpp
View File

@ -28,9 +28,9 @@ MockClDevice::MockClDevice(MockDevice *pMockDevice)
executionEnvironment(pMockDevice->executionEnvironment),
subdevices(pMockDevice->subdevices), mockMemoryManager(pMockDevice->mockMemoryManager), engines(pMockDevice->engines) {
platform()->clDeviceMap.emplace(pMockDevice, this);
pMockDevice->setSpecializedDevice(static_cast<ClDevice *>(this));
for (uint32_t i = 0; i < getNumAvailableDevices(); i++) {
platform()->clDeviceMap.emplace(pMockDevice->getDeviceById(i), this->getDeviceById(i));
pMockDevice->getDeviceById(i)->setSpecializedDevice(this->getDeviceById(i));
}
}
@ -45,15 +45,6 @@ MockDevice::MockDevice()
initializeCaps();
}
MockClDevice::~MockClDevice() {
if (platform()) {
platform()->clDeviceMap.erase(&device);
for (uint32_t i = 0; i < getNumAvailableDevices(); i++) {
platform()->clDeviceMap.erase(device.getDeviceById(i));
}
}
}
const char *MockDevice::getProductAbbrev() const {
return hardwarePrefix[getHardwareInfo().platform.eProductFamily];
}

1
unit_tests/mocks/mock_device.h
View File

@ -126,7 +126,6 @@ class MockClDevice : public ClDevice {
using ClDevice::simultaneousInterops;
explicit MockClDevice(MockDevice *pMockDevice);
~MockClDevice();
bool createEngines() { return device.createEngines(); }
void setOSTime(OSTime *osTime) { device.setOSTime(osTime); }

2
unit_tests/mocks/mock_kernel.h
View File

@ -117,7 +117,7 @@ class MockKernel : public Kernel {
static KernelType *create(Device &device, Program *program, uint32_t grfNumber) {
auto info = new KernelInfo();
const size_t crossThreadSize = 160;
auto pClDevice = platform()->clDeviceMap[&device];
auto pClDevice = device.getSpecializedDevice<ClDevice>();
SKernelBinaryHeaderCommon *header = new SKernelBinaryHeaderCommon;
header->DynamicStateHeapSize = 0;