AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1537347 by gandryey@gera-w8 on 2018/04/05 17:42:56

Browse Source 
SWDEV-79445 - OCL generic changes and code clean-up
	- Remove obsolete code in the interop logic

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#81 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#86 edit
This commit is contained in:
foreman
2018-04-05 17:51:37 -04:00
parent e658a8fe6f
commit b139d3ab1f
4 changed files with 20 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/pal/palmemory.cpp
+17 -37
View File
@@ -23,22 +23,26 @@
namespace pal {
Memory::Memory(const Device& gpuDev, amd::Memory& owner, size_t size)
: device::Memory(owner), Resource(gpuDev, size) {
init();
: device::Memory(owner), Resource(gpuDev, size)
, pinnedMemory_(nullptr)
, parent_(nullptr) {
if (owner.parent() != nullptr) {
flags_ |= SubMemoryObject;
}
}
Memory::Memory(const Device& gpuDev, size_t size) : device::Memory(size), Resource(gpuDev, size) {
init();
Memory::Memory(const Device& gpuDev, size_t size)
: device::Memory(size), Resource(gpuDev, size)
, pinnedMemory_(nullptr)
, parent_(nullptr) {
}
Memory::Memory(const Device& gpuDev, amd::Memory& owner, size_t width, size_t height, size_t depth,
cl_image_format format, cl_mem_object_type imageType, uint mipLevels)
: device::Memory(owner), Resource(gpuDev, width, height, depth, format, imageType, mipLevels) {
init();
: device::Memory(owner), Resource(gpuDev, width, height, depth, format, imageType, mipLevels)
, pinnedMemory_(nullptr)
, parent_(nullptr) {
if (owner.parent() != nullptr) {
flags_ |= SubMemoryObject;
@@ -47,16 +51,9 @@ Memory::Memory(const Device& gpuDev, amd::Memory& owner, size_t width, size_t he
Memory::Memory(const Device& gpuDev, size_t size, size_t width, size_t height, size_t depth,
cl_image_format format, cl_mem_object_type imageType, uint mipLevels)
: device::Memory(size), Resource(gpuDev, width, height, depth, format, imageType, mipLevels) {
init();
}
void Memory::init() {
indirectMapCount_ = 0;
interopType_ = InteropNone;
interopMemory_ = nullptr;
pinnedMemory_ = nullptr;
parent_ = nullptr;
: device::Memory(size), Resource(gpuDev, width, height, depth, format, imageType, mipLevels)
, pinnedMemory_(nullptr)
, parent_(nullptr) {
}
#ifdef _WIN32
@@ -194,7 +191,7 @@ bool Memory::processGLResource(GLResourceOP operation) {
return retVal;
}
bool Memory::createInterop(InteropType type) {
bool Memory::createInterop() {
Resource::MemoryType memType = Resource::Empty;
Resource::OGLInteropParams oglRes;
#ifdef _WIN32
@@ -374,26 +371,11 @@ bool Memory::createInterop(InteropType type) {
return false;
}
// Get the interop settings
if (type == InteropDirectAccess) {
// Create memory object
if (!create(memType, createParams)) {
return false;
}
} else {
// Allocate Resource object for interop as buffer
interopMemory_ = new Memory(dev(), size());
// Create the interop object in CAL
if (nullptr == interopMemory_ || !interopMemory_->create(memType, createParams)) {
delete interopMemory_;
interopMemory_ = nullptr;
return false;
}
// Create memory object
if (!create(memType, createParams)) {
return false;
}
setInteropType(type);
return true;
}
@@ -401,8 +383,6 @@ Memory::~Memory() {
// Clean VA cache
dev().removeVACache(this);
delete interopMemory_;
// Release associated map target, if any
if (nullptr != mapMemory_) {
mapMemory()->unmap(nullptr);