GPU: Cleanup, remove obsolete code

Author: davidrohr

GPU/GPUTracking/Base/GPUReconstructionCPU.h

@@ -112,7 +112,6 @@ class GPUReconstructionCPU : public GPUReconstructionKernels<GPUReconstructionCP
   int32_t ExitDevice() override;
   int32_t GetThread();
 
-  virtual int32_t PrepareTextures() { return 0; }
   virtual int32_t DoStuckProtection(int32_t stream, deviceEvent event) { return 0; }
 
   // Pointers to tracker classes

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu

@@ -254,12 +254,6 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
       return (1);
     }
 
-#ifdef GPUCA_USE_TEXTURES
-    if (GPUCA_SECTOR_DATA_MEMORY * NSECTORS > (size_t)deviceProp.maxTexture1DLinear) {
-      GPUError("Invalid maximum texture size of device: %ld < %ld\n", (int64_t)deviceProp.maxTexture1DLinear, (int64_t)(GPUCA_SECTOR_DATA_MEMORY * NSECTORS));
-      return (1);
-    }
-#endif
 #ifndef GPUCA_NO_CONSTANT_MEMORY
     if (gGPUConstantMemBufferSize > deviceProp.totalConstMem) {
       GPUError("Insufficient constant memory available on GPU %d < %d!", (int32_t)deviceProp.totalConstMem, (int32_t)gGPUConstantMemBufferSize);
@@ -627,18 +621,6 @@ void GPUReconstructionCUDA::loadKernelModules(bool perKernel)
 }
 
 #ifndef __HIPCC__ // CUDA
-int32_t GPUReconstructionCUDA::PrepareTextures()
-{
-#ifdef GPUCA_USE_TEXTURES
-  cudaChannelFormatDesc channelDescu2 = cudaCreateChannelDesc<cahit2>();
-  size_t offset;
-  GPUChkErr(cudaBindTexture(&offset, &gAliTexRefu2, mProcessorsShadow->tpcTrackers[0].Data().Memory(), &channelDescu2, NSECTORS * GPUCA_SECTOR_DATA_MEMORY));
-  cudaChannelFormatDesc channelDescu = cudaCreateChannelDesc<calink>();
-  GPUChkErr(cudaBindTexture(&offset, &gAliTexRefu, mProcessorsShadow->tpcTrackers[0].Data().Memory(), &channelDescu, NSECTORS * GPUCA_SECTOR_DATA_MEMORY));
-#endif
-  return (0);
-}
-
 void GPUReconstructionCUDA::startGPUProfiling()
 {
   GPUChkErr(cudaProfilerStart());

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.h

@@ -79,7 +79,6 @@ class GPUReconstructionCUDA : public GPUReconstructionKernels<GPUReconstructionC
 
 #ifndef __HIPCC__ // CUDA
   bool CanQueryMaxMemory() override { return true; }
-  int32_t PrepareTextures() override;
   void startGPUProfiling() override;
   void endGPUProfiling() override;
 #else // HIP

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDAKernels.cu

@@ -20,11 +20,6 @@
 
 using namespace o2::gpu;
 
-#ifdef GPUCA_USE_TEXTURES
-texture<cahit2, cudaTextureType1D, cudaReadModeElementType> gAliTexRefu2;
-texture<calink, cudaTextureType1D, cudaReadModeElementType> gAliTexRefu;
-#endif
-
 #include "GPUReconstructionIncludesDeviceAll.h"
 
 #if defined(__HIPCC__) && defined(GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM)

GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cl

@@ -73,8 +73,6 @@ typedef signed char int8_t;
 #include "GPUConstantMem.h"
 #include "GPUReconstructionIncludesDeviceAll.h"
 
-// if (gpu_mem != pTracker.GPUParametersConst()->gpumem) return; //TODO!
-
 #define GPUCA_KRNL(...) GPUCA_KRNLGPU(__VA_ARGS__)
 #define GPUCA_CONSMEM_PTR GPUglobal() char *gpu_mem, GPUconstant() GPUConstantMem* pConstant,
 #define GPUCA_CONSMEM (*pConstant)

GPU/GPUTracking/Definitions/GPUDef.h

@@ -58,12 +58,6 @@
   #define CA_SHARED_CACHE_REF(target, src, size, reftype, ref) GPUglobalref() const reftype* __restrict__ ref = src
 #endif
 
-#ifdef GPUCA_TEXTURE_FETCH_CONSTRUCTOR
-  #define CA_TEXTURE_FETCH(type, texture, address, entry) tex1Dfetch(texture, ((char*) address - tracker.Data().GPUTextureBase()) / sizeof(type) + entry);
-#else
-  #define CA_TEXTURE_FETCH(type, texture, address, entry) address[entry];
-#endif
-
 #endif //GPUTPCDEF_H
 
 #ifdef GPUCA_CADEBUG

GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h

@@ -267,7 +267,6 @@
     #define GPUCA_PAR_COMP_GATHER_MODE 3
     #define GPUCA_PAR_DEDX_STORAGE_TYPE uint16_t
     #define GPUCA_PAR_MERGER_INTERPOLATION_ERROR_TYPE half
-    // #define GPUCA_USE_TEXTURES
   #elif defined(GPUCA_GPUTYPE_OPENCL)
   #else
     #error GPU TYPE NOT SET

GPU/GPUTracking/Definitions/GPUDefParametersWrapper.h

@@ -43,11 +43,6 @@ namespace o2::gpu
 
 // #define GPUCA_KERNEL_DEBUGGER_OUTPUT
 
-// Derived parameters
-#ifdef GPUCA_USE_TEXTURES
-  #define GPUCA_TEXTURE_FETCH_CONSTRUCTOR                              // Fetch data through texture cache
-#endif
-
 } // namespace o2::gpu
 
 // clang-format on

GPU/GPUTracking/Global/GPUChain.h

@@ -216,7 +216,6 @@ class GPUChain
 
   inline GPUChain* GetNextChainInQueue() { return mRec->GetNextChainInQueue(); }
 
-  virtual int32_t PrepareTextures() { return 0; }
   virtual int32_t DoStuckProtection(int32_t stream, deviceEvent event) { return 0; }
 
   template <class T, class S, typename... Args>

GPU/GPUTracking/Global/GPUChainTrackingSectorTracker.cxx

@@ -103,17 +103,6 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
   int32_t streamInitAndOccMap = mRec->NStreams() - 1;
 
   if (doGPU) {
-    for (uint32_t iSector = 0; iSector < NSECTORS; iSector++) {
-      processorsShadow()->tpcTrackers[iSector].GPUParametersConst()->gpumem = (char*)mRec->DeviceMemoryBase();
-      // Initialize Startup Constants
-      processors()->tpcTrackers[iSector].GPUParameters()->nextStartHit = (((getKernelProperties<GPUTPCTrackletConstructor>().minBlocks * BlockCount()) + NSECTORS - 1 - iSector) / NSECTORS) * getKernelProperties<GPUTPCTrackletConstructor>().nThreads;
-      processorsShadow()->tpcTrackers[iSector].SetGPUTextureBase(mRec->DeviceMemoryBase());
-    }
-
-    if (PrepareTextures()) {
-      return (2);
-    }
-
     // Copy Tracker Object to GPU Memory
     if (GetProcessingSettings().debugLevel >= 3) {
       GPUInfo("Copying Tracker objects to GPU");