P4 to Git Change 1562960 by skudchad@skudchad_test2_win_opencl on 2018/06/01 14:46:26

SWDEV-145570 - [HIP] - Rename SVManager to be more genric. The same functionality can be used for HIP without needing additonal map

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/15054/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_memobj.cpp#83 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#220 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#306 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#591 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#419 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#92 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#104 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#87 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#53 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#29 edit

rocclr/runtime/device/device.cpp

@@ -58,29 +58,29 @@ namespace amd {
 std::vector<Device*>* Device::devices_ = NULL;
 AppProfile Device::appProfile_;
 
-amd::Monitor SvmManager::AllocatedLock_("Guards SVM allocation list");
-std::map<uintptr_t, amd::Memory*> SvmManager::svmBufferMap_;
+amd::Monitor MemObjMap::AllocatedLock_("Guards SVM allocation list");
+std::map<uintptr_t, amd::Memory*> MemObjMap::MemObjMap_;
 
-size_t SvmManager::size() {
+size_t MemObjMap::size() {
   amd::ScopedLock lock(AllocatedLock_);
-  return svmBufferMap_.size();
+  return MemObjMap_.size();
 }
 
-void SvmManager::AddSvmBuffer(const void* k, amd::Memory* v) {
+void MemObjMap::AddMemObj(const void* k, amd::Memory* v) {
   amd::ScopedLock lock(AllocatedLock_);
-  svmBufferMap_.insert({reinterpret_cast<uintptr_t>(k), v});
+  MemObjMap_.insert({reinterpret_cast<uintptr_t>(k), v});
 }
 
-void SvmManager::RemoveSvmBuffer(const void* k) {
+void MemObjMap::RemoveMemObj(const void* k) {
   amd::ScopedLock lock(AllocatedLock_);
-  svmBufferMap_.erase(reinterpret_cast<uintptr_t>(k));
+  MemObjMap_.erase(reinterpret_cast<uintptr_t>(k));
 }
 
-amd::Memory* SvmManager::FindSvmBuffer(const void* k) {
+amd::Memory* MemObjMap::FindMemObj(const void* k) {
   amd::ScopedLock lock(AllocatedLock_);
   uintptr_t key = reinterpret_cast<uintptr_t>(k);
-  auto it = svmBufferMap_.upper_bound(key);
-  if (it == svmBufferMap_.begin()) {
+  auto it = MemObjMap_.upper_bound(key);
+  if (it == MemObjMap_.begin()) {
     return NULL;
   }