GPU: Ensure correct alignment of large host scratch buffer

davidrohr · davidrohr · commit 003df86146f5 · 2021-03-30T18:37:34.000+02:00
diff --git a/GPU/GPUTracking/Base/GPUReconstructionCPU.cxx b/GPU/GPUTracking/Base/GPUReconstructionCPU.cxx
@@ -160,7 +160,7 @@ int GPUReconstructionCPU::InitDevice()
       mHostMemorySize = mDeviceMemorySize;
     }
     if (mMaster == nullptr) {
-      mHostMemoryBase = operator new(mHostMemorySize);
+      mHostMemoryBase = operator new(mHostMemorySize GPUCA_OPERATOR_NEW_ALIGNMENT);
     }
     mHostMemoryPermanent = mHostMemoryBase;
     ClearAllocatedMemory();
@@ -177,7 +177,7 @@ int GPUReconstructionCPU::ExitDevice()
 {
   if (mProcessingSettings.memoryAllocationStrategy == GPUMemoryResource::ALLOCATION_GLOBAL) {
     if (mMaster == nullptr) {
-      operator delete(mHostMemoryBase);
+      operator delete(mHostMemoryBase GPUCA_OPERATOR_NEW_ALIGNMENT);
     }
     mHostMemoryPool = mHostMemoryBase = mHostMemoryPoolEnd = mHostMemoryPermanent = nullptr;
     mHostMemorySize = 0;

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ int GPUReconstructionCPU::InitDevice()`
`160`	`160`	`mHostMemorySize = mDeviceMemorySize;`
`161`	`161`	`}`
`162`	`162`	`if (mMaster == nullptr) {`
`163`		`- mHostMemoryBase = operator new(mHostMemorySize);`
	`163`	`+ mHostMemoryBase = operator new(mHostMemorySize GPUCA_OPERATOR_NEW_ALIGNMENT);`
`164`	`164`	`}`
`165`	`165`	`mHostMemoryPermanent = mHostMemoryBase;`
`166`	`166`	`ClearAllocatedMemory();`
`@@ -177,7 +177,7 @@ int GPUReconstructionCPU::ExitDevice()`
`177`	`177`	`{`
`178`	`178`	`if (mProcessingSettings.memoryAllocationStrategy == GPUMemoryResource::ALLOCATION_GLOBAL) {`
`179`	`179`	`if (mMaster == nullptr) {`
`180`		`- operator delete(mHostMemoryBase);`
	`180`	`+ operator delete(mHostMemoryBase GPUCA_OPERATOR_NEW_ALIGNMENT);`
`181`	`181`	`}`
`182`	`182`	`mHostMemoryPool = mHostMemoryBase = mHostMemoryPoolEnd = mHostMemoryPermanent = nullptr;`
`183`	`183`	`mHostMemorySize = 0;`