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

P4 to Git Change 1119795 by xcui@merged_opencl_jxcwin on 2015/02/06 20:33:37

Browse Source 
EPR #413091 - Back out changelist 1119692

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#117 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#206 edit


[ROCm/clr commit: a1fb1864da]
This commit is contained in:
foreman
2015-02-06 20:44:19 -05:00
parent ca9d490be8
commit 193a70577a
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/runtime/device/gpu/gpumemory.cpp
+1 -17
View File
@@ -923,22 +923,6 @@ Memory::allocMapTarget(
size_t offset = origin[0];
incIndMapCount();
void *initHostPtr = NULL;
bool failed = false;
if (!owner()->getSvmPtr()) {
initHostPtr = owner()->getHostMem();
static const bool forceAllocHostMem = true;
if (NULL == initHostPtr) {
if (!owner()->allocHostMemory(NULL, forceAllocHostMem)) {
failed = true;
}
}
}
else {
owner()->commitSvmMemory();
initHostPtr = owner()->getSvmPtr();
}
// If host memory exists, use it
if ((owner()->getHostMem() != NULL) && isDirectMap()) {
@@ -970,7 +954,7 @@ Memory::allocMapTarget(
amd::Memory* memory = NULL;
// Search for a possible indirect resource
//For SVM implementation, we cannot use cached map. if svm space, use the svm host pointer
void *initHostPtr = owner()->getSvmPtr();
cl_mem_flags flag = 0;
bool canBeCached = true;
if (NULL != initHostPtr) {
projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
desc.vaBase = 0;
desc.minAlignment = 0;
desc.section = GSL_SECTION_REGULAR;
if (NULL != params && NULL != params->owner_ && memType != Pinned) { //make sure params not NULL
if (NULL != params && NULL != params->owner_) { //make sure params not NULL
mcaddr svmPtr = reinterpret_cast<mcaddr>(params->owner_->getSvmPtr());
desc.vaBase = (svmPtr == 1)? 0:svmPtr;
cal_.SVMRes_ = (svmPtr != 0);