GPU: Forward-declare GPUProcessor in GPUMemoryResource

Author: davidrohr

GPU/GPUTracking/Base/GPUMemoryResource.cxx

@@ -13,4 +13,15 @@
 /// \author David Rohr
 
 #include "GPUMemoryResource.h"
+#include "GPUProcessor.h"
 using namespace o2::gpu;
+
+void* GPUMemoryResource::SetPointers(void* ptr) const
+{
+  return (mProcessor->*mSetPointers)(ptr);
+}
+
+void* GPUMemoryResource::SetDevicePointers(void* ptr) const
+{
+  return (mProcessor->mLinkedProcessor->*mSetPointers)(ptr);
+}

GPU/GPUTracking/Base/GPUMemoryResource.h

@@ -16,11 +16,14 @@
 #define GPUMEMORYRESOURCE_H
 
 #include "GPUCommonDef.h"
-#include "GPUProcessor.h"
+#ifndef GPUCA_GPUCODE_DEVICE
+#include <cstddef>
+#endif
 
 namespace o2::gpu
 {
 
+class GPUProcessor;
 struct GPUMemoryReuse {
   enum Type : int32_t {
     NONE = 0,
@@ -80,13 +83,10 @@ class GPUMemoryResource
   }
   GPUMemoryResource(const GPUMemoryResource&) = default;
 
-  void* SetPointers(void* ptr)
-  {
-    return (mProcessor->*mSetPointers)(ptr);
-  }
-  void* SetDevicePointers(void* ptr) { return (mProcessor->mLinkedProcessor->*mSetPointers)(ptr); }
-  void* Ptr() { return mPtr; }
-  void* PtrDevice() { return mPtrDevice; }
+  void* SetPointers(void* ptr) const;
+  void* SetDevicePointers(void* ptr) const;
+  void* Ptr() const { return mPtr; }
+  void* PtrDevice() const { return mPtrDevice; }
   size_t Size() const { return mSize; }
   const char* Name() const { return mName; }
   MemoryType Type() const { return mType; }

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -567,7 +567,7 @@ size_t GPUReconstruction::AllocateRegisteredPermanentMemory()
   return total;
 }
 
-size_t GPUReconstruction::AllocateRegisteredMemoryHelper(GPUMemoryResource* res, void*& ptr, void*& memorypool, void* memorybase, size_t memorysize, void* (GPUMemoryResource::*setPtr)(void*), void*& memorypoolend, const char* device)
+size_t GPUReconstruction::AllocateRegisteredMemoryHelper(GPUMemoryResource* res, void*& ptr, void*& memorypool, void* memorybase, size_t memorysize, void* (GPUMemoryResource::*setPtr)(void*) const, void*& memorypoolend, const char* device)
 {
   if (res->mReuse >= 0) {
     ptr = (&ptr == &res->mPtrDevice) ? mMemoryResources[res->mReuse].mPtrDevice : mMemoryResources[res->mReuse].mPtr;

GPU/GPUTracking/Base/GPUReconstruction.h

@@ -30,10 +30,9 @@
 #include "GPUDataTypes.h"
 #include "GPUMemoryResource.h"
 #include "GPUOutputControl.h"
-
-/*#include "GPUParam.h"
-#include "GPUSettings.h"
-#include "GPULogging.h"*/
+#include "GPUParam.h"
+#include "GPUConstantMem.h"
+#include "GPUDef.h"
 
 namespace o2::its
 {
@@ -280,7 +279,7 @@ class GPUReconstruction
   static std::string getBackendVersions();
 
   // Private helper functions for memory management
-  size_t AllocateRegisteredMemoryHelper(GPUMemoryResource* res, void*& ptr, void*& memorypool, void* memorybase, size_t memorysize, void* (GPUMemoryResource::*SetPointers)(void*), void*& memorypoolend, const char* device);
+  size_t AllocateRegisteredMemoryHelper(GPUMemoryResource* res, void*& ptr, void*& memorypool, void* memorybase, size_t memorysize, void* (GPUMemoryResource::*SetPointers)(void*) const, void*& memorypoolend, const char* device);
   size_t AllocateRegisteredPermanentMemory();
 
   // Private helper functions for reading / writing / allocating IO buffer from/to file