intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename DeviceIndex to DevicesBitfield to reflect type usage

Browse Source 
Change-Id: Ic5ac1d2d49082dc3c6e98c1fa5178b93ec9ddf56
This commit is contained in:
Hoppe, Mateusz
2018-09-23 06:47:27 -07:00
committed by sys_ocldev
parent b67143b8cb
commit 5aae5a3d62
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/mem_obj/buffer.cpp
View File

@@ -148,9 +148,9 @@ Buffer *Buffer::create(Context *context,
if (!memory) {
AllocationFlags allocFlags = MemObjHelper::getAllocationFlags(flags);
DeviceIndex deviceIndex = MemObjHelper::getDeviceIndex(flags);
DevicesBitfield devices = MemObjHelper::getDevicesBitfield(flags);
allocFlags.flags.allocateMemory = allocateMemory;
memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, deviceIndex, hostPtr, static_cast<size_t>(size), allocationType);
memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, devices, hostPtr, static_cast<size_t>(size), allocationType);
}
if (allocateMemory) {
@@ -166,9 +166,9 @@ Buffer *Buffer::create(Context *context,
zeroCopyAllowed = false;
copyMemoryFromHostPtr = true;
AllocationFlags allocFlags = MemObjHelper::getAllocationFlags(flags);
DeviceIndex deviceIndex = MemObjHelper::getDeviceIndex(flags);
DevicesBitfield devices = MemObjHelper::getDevicesBitfield(flags);
allocFlags.flags.allocateMemory = true;
memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, deviceIndex, nullptr, static_cast<size_t>(size), allocationType);
memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, devices, nullptr, static_cast<size_t>(size), allocationType);
}
}

4
runtime/mem_obj/mem_obj_helper.cpp
View File

@@ -17,8 +17,8 @@ AllocationFlags MemObjHelper::getAllocationFlags(cl_mem_flags flags) {
return AllocationFlags(); // Initialized by default constructor
}
DeviceIndex MemObjHelper::getDeviceIndex(cl_mem_flags flags) {
return DeviceIndex(0);
DevicesBitfield MemObjHelper::getDevicesBitfield(cl_mem_flags flags) {
return DevicesBitfield(0);
}
} // namespace OCLRT

2
runtime/mem_obj/mem_obj_helper.h
View File

@@ -30,7 +30,7 @@ class MemObjHelper {
static AllocationFlags getAllocationFlags(cl_mem_flags flags);
static DeviceIndex getDeviceIndex(cl_mem_flags flags);
static DevicesBitfield getDevicesBitfield(cl_mem_flags flags);
static bool checkMemFlagsForSubBuffer(cl_mem_flags flags) {
const cl_mem_flags allValidFlags =

4
runtime/mem_obj/pipe.cpp
View File

@@ -49,10 +49,10 @@ Pipe *Pipe::create(Context *context,
while (true) {
AllocationFlags allocFlags = MemObjHelper::getAllocationFlags(flags);
DeviceIndex deviceIndex = MemObjHelper::getDeviceIndex(flags);
DevicesBitfield devices = MemObjHelper::getDevicesBitfield(flags);
allocFlags.flags.allocateMemory = true;
auto size = static_cast<size_t>(packetSize * (maxPackets + 1) + intelPipeHeaderReservedSpace);
GraphicsAllocation *memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, deviceIndex, nullptr, size, GraphicsAllocation::AllocationType::PIPE);
GraphicsAllocation *memory = memoryManager->allocateGraphicsMemoryInPreferredPool(allocFlags, devices, nullptr, size, GraphicsAllocation::AllocationType::PIPE);
if (!memory) {
errcodeRet = CL_OUT_OF_HOST_MEMORY;
break;

4
runtime/memory_manager/graphics_allocation.h
View File

@@ -21,7 +21,7 @@
namespace OCLRT {
using osHandle = unsigned int;
using DeviceIndex = uint32_t;
using DevicesBitfield = uint32_t;
namespace Sharing {
constexpr auto nonSharedResource = 0u;
@@ -54,7 +54,7 @@ class GraphicsAllocation : public IDNode<GraphicsAllocation> {
uint64_t allocationOffset = 0u;
int residencyTaskCount[maxOsContextCount] = {ObjectNotResident, ObjectNotResident, ObjectNotResident, ObjectNotResident};
bool cpuPtrAllocated = false; // flag indicating if cpuPtr is driver-allocated
DeviceIndex deviceIndex = 0;
DevicesBitfield devicesBitfield = 0;
bool flushL3Required = false;
enum class AllocationType {

8
runtime/memory_manager/memory_manager.cpp
View File

@@ -362,7 +362,7 @@ void MemoryManager::registerOsContext(OsContext *contextToRegister) {
registeredOsContexts[contextToRegister->getContextId()] = contextToRegister;
}
bool MemoryManager::getAllocationData(AllocationData &allocationData, const AllocationFlags &flags, const DeviceIndex deviceIndex,
bool MemoryManager::getAllocationData(AllocationData &allocationData, const AllocationFlags &flags, const DevicesBitfield devicesBitfield,
const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type) {
UNRECOVERABLE_IF(hostPtr == nullptr && !flags.flags.allocateMemory);
@@ -426,7 +426,7 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
allocationData.hostPtr = hostPtr;
allocationData.size = size;
allocationData.type = type;
allocationData.deviceIndex = deviceIndex;
allocationData.devicesBitfield = devicesBitfield;
if (allocationData.flags.allocateMemory) {
allocationData.hostPtr = nullptr;
@@ -434,11 +434,11 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
return true;
}
GraphicsAllocation *MemoryManager::allocateGraphicsMemoryInPreferredPool(AllocationFlags flags, DeviceIndex deviceIndex, const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type) {
GraphicsAllocation *MemoryManager::allocateGraphicsMemoryInPreferredPool(AllocationFlags flags, DevicesBitfield devicesBitfield, const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type) {
AllocationData allocationData;
AllocationStatus status = AllocationStatus::Error;
getAllocationData(allocationData, flags, deviceIndex, hostPtr, size, type);
getAllocationData(allocationData, flags, devicesBitfield, hostPtr, size, type);
UNRECOVERABLE_IF(allocationData.type == GraphicsAllocation::AllocationType::IMAGE || allocationData.type == GraphicsAllocation::AllocationType::SHARED_RESOURCE);
GraphicsAllocation *allocation = nullptr;

8
runtime/memory_manager/memory_manager.h
View File

@@ -93,7 +93,7 @@ struct AllocationData {
GraphicsAllocation::AllocationType type = GraphicsAllocation::AllocationType::UNKNOWN;
const void *hostPtr = nullptr;
size_t size = 0;
DeviceIndex deviceIndex = 0;
DevicesBitfield devicesBitfield = 0;
};
struct AlignedMallocRestrictions {
@@ -156,7 +156,7 @@ class MemoryManager {
virtual GraphicsAllocation *allocateGraphicsMemoryForImage(ImageInfo &imgInfo, Gmm *gmm) = 0;
MOCKABLE_VIRTUAL GraphicsAllocation *allocateGraphicsMemoryInPreferredPool(AllocationFlags flags, DeviceIndex deviceIndex, const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type);
MOCKABLE_VIRTUAL GraphicsAllocation *allocateGraphicsMemoryInPreferredPool(AllocationFlags flags, DevicesBitfield devicesBitfield, const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type);
GraphicsAllocation *allocateGraphicsMemoryForSVM(size_t size, bool coherent);
@@ -169,7 +169,7 @@ class MemoryManager {
if (!allocationData.flags.useSystemMemory && !(allocationData.flags.allow32Bit && this->force32bitAllocations)) {
auto allocation = allocateGraphicsMemory(allocationData);
if (allocation) {
allocation->deviceIndex = allocationData.deviceIndex;
allocation->devicesBitfield = allocationData.devicesBitfield;
allocation->flushL3Required = allocationData.flags.flushL3;
status = AllocationStatus::Success;
}
@@ -268,7 +268,7 @@ class MemoryManager {
size_t getOsContextCount() { return registeredOsContexts.size(); }
protected:
static bool getAllocationData(AllocationData &allocationData, const AllocationFlags &flags, const DeviceIndex deviceIndex,
static bool getAllocationData(AllocationData &allocationData, const AllocationFlags &flags, const DevicesBitfield devicesBitfield,
const void *hostPtr, size_t size, GraphicsAllocation::AllocationType type);
GraphicsAllocation *allocateGraphicsMemory(const AllocationData &allocationData);