GPU:Remove OpenCL 1.2, now that OpenCL 2 supports all its functionality

Author: davidrohr

GPU/Common/GPUCommonConstants.h

@@ -17,11 +17,9 @@
 
 #include "GPUCommonDef.h"
 
-#if !defined(__OPENCL1__)
 namespace GPUCA_NAMESPACE::gpu::gpu_common_constants
 {
-static CONSTEXPR const float kCLight = 0.000299792458f; // TODO: Duplicate of MathConstants, fix this when OpenCL1 is removed
+static CONSTEXPR const float kCLight = 0.000299792458f; // TODO: Duplicate of MathConstants, fix this now that we use only OpenCL CPP
 }
-#endif
 
 #endif

GPU/Common/GPUCommonDef.h

@@ -30,7 +30,7 @@
 //Some GPU configuration settings, must be included first
 #include "GPUCommonDefSettings.h"
 
-#if !defined(__OPENCL1__) && (!(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__)) && defined(__cplusplus) && __cplusplus >= 201103L
+#if (!(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__)) && defined(__cplusplus) && __cplusplus >= 201103L
   #define GPUCA_NOCOMPAT // C++11 + No old ROOT5 + No old OpenCL
   #ifndef __OPENCL__
     #define GPUCA_NOCOMPAT_ALLOPENCL // + No OpenCL at all
@@ -82,7 +82,7 @@
   #define GPUCA_NAMESPACE o2
 #endif
 
-#if (defined(__CUDACC__) && defined(GPUCA_CUDA_NO_CONSTANT_MEMORY)) || (defined(__HIPCC__) && defined(GPUCA_HIP_NO_CONSTANT_MEMORY)) || (defined(__OPENCL1__) && defined(GPUCA_OPENCL_NO_CONSTANT_MEMORY)) || (defined(__OPENCLCPP__) && defined(GPUCA_OPENCLCPP_NO_CONSTANT_MEMORY))
+#if (defined(__CUDACC__) && defined(GPUCA_CUDA_NO_CONSTANT_MEMORY)) || (defined(__HIPCC__) && defined(GPUCA_HIP_NO_CONSTANT_MEMORY)) || (defined(__OPENCLCPP__) && defined(GPUCA_OPENCLCPP_NO_CONSTANT_MEMORY))
   #define GPUCA_NO_CONSTANT_MEMORY
 #elif defined(__CUDACC__) || defined(__HIPCC__)
   #define GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM

GPU/Common/GPUCommonDefSettings.h

@@ -26,7 +26,6 @@
 
 //#define GPUCA_CUDA_NO_CONSTANT_MEMORY          // Do not use constant memory for CUDA
 //#define GPUCA_HIP_NO_CONSTANT_MEMORY           // Do not use constant memory for HIP
-//#define GPUCA_OPENCL_NO_CONSTANT_MEMORY        // Do not use constant memory for OpenCL 1.2
 #define GPUCA_OPENCLCPP_NO_CONSTANT_MEMORY       // Do not use constant memory for OpenCL C++ - MANDATORY as OpenCL cannot cast between __constant and __generic yet!
 
 // clang-format on

GPU/Common/GPUCommonMath.h

@@ -31,12 +31,10 @@
 #include <cstdint>
 #endif
 
-#if !defined(__OPENCL1__)
 namespace GPUCA_NAMESPACE
 {
 namespace gpu
 {
-#endif
 
 class GPUCommonMath
 {
@@ -289,7 +287,7 @@ GPUhdi() void GPUCommonMath::SinCosd(double x, double& s, double& c)
 
 GPUdi() uint32_t GPUCommonMath::Clz(uint32_t x)
 {
-#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && !defined(__OPENCL1__)
+#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__))
   return x == 0 ? 32 : CHOICE(__builtin_clz(x), __clz(x), __builtin_clz(x)); // use builtin if available
 #else
   for (int32_t i = 31; i >= 0; i--) {
@@ -303,7 +301,7 @@ GPUdi() uint32_t GPUCommonMath::Clz(uint32_t x)
 
 GPUdi() uint32_t GPUCommonMath::Popcount(uint32_t x)
 {
-#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && (!defined(__OPENCL__) /* !defined(__OPENCL1__)*/) // TODO: exclude only OPENCLC (not CPP) when reported SPIR-V bug is fixed
+#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && !defined(__OPENCL__) // TODO: remove OPENCL when reported SPIR-V bug is fixed
   // use builtin if available
   return CHOICE(__builtin_popcount(x), __popc(x), __builtin_popcount(x));
 #else
@@ -563,9 +561,7 @@ GPUdii() void GPUCommonMath::AtomicMinInternal(GPUglobalref() GPUgeneric() GPUAt
 
 #undef CHOICE
 
-#if !defined(__OPENCL1__)
-}
-}
-#endif
+} // namespace gpu
+} // namespace GPUCA_NAMESPACE
 
 #endif // GPUCOMMONMATH_H

GPU/Common/GPUCommonTypeTraits.h

@@ -21,7 +21,7 @@
 #ifndef GPUCA_GPUCODE_COMPILEKERNELS
 #include <type_traits>
 #endif
-#elif !defined(__OPENCL1__)
+#else
 // We just reimplement some type traits in std for the GPU
 namespace std
 {

GPU/GPUTracking/Base/GPUConstantMem.h

@@ -20,7 +20,7 @@
 #include "GPUDataTypes.h"
 #include "GPUErrors.h"
 
-// Dummies for stuff not supported in legacy code (ROOT 5 / OPENCL1.2)
+// Dummies for stuff not supported in legacy code (ROOT 5)
 #if defined(GPUCA_NOCOMPAT_ALLCINT)
 #include "GPUTPCGMMerger.h"
 #else

GPU/GPUTracking/Base/GPUParam.inc

@@ -17,9 +17,7 @@
 
 #include "GPUParam.h"
 #include "GPUTPCGMMergedTrackHit.h"
-#if !defined(__OPENCL1__)
 #include "GPUTPCClusterOccupancyMap.h"
-#endif
 
 namespace GPUCA_NAMESPACE
 {
@@ -228,15 +226,11 @@ GPUdi() void MEM_LG(GPUParam)::UpdateClusterError2ByState(int16_t clusterState,
 MEM_CLASS_PRE()
 GPUdi() float MEM_LG(GPUParam)::GetUnscaledMult(float time) const
 {
-#if !defined(__OPENCL1__)
   if (!occupancyMap) {
     return 0.f;
   }
   const uint32_t bin = CAMath::Max(0.f, time / rec.tpc.occupancyMapTimeBins);
   return occupancyMap[bin];
-#else
-  return 0.f;
-#endif
 }
 
 MEM_CLASS_PRE()

GPU/GPUTracking/Base/GPUReconstructionAvailableBackends.template.h

@@ -14,5 +14,4 @@
 
 #cmakedefine CUDA_ENABLED
 #cmakedefine HIP_ENABLED
-#cmakedefine OPENCL1_ENABLED
 #cmakedefine OPENCL2_ENABLED

GPU/GPUTracking/Base/GPUReconstructionKernelList.template.h

@@ -15,14 +15,14 @@
 // No header protection, this may be used multiple times
 #include "GPUReconstructionKernelMacros.h"
 
-#if !defined(GPUCA_OPENCL1) && (!defined(GPUCA_ALIROOT_LIB) || !defined(GPUCA_GPUCODE))
-#define GPUCA_KRNL_NOOCL1
+#if !defined(GPUCA_ALIROOT_LIB) || !defined(GPUCA_GPUCODE)
+#define GPUCA_KRNL_NOALIROOT
 #endif
 
 // clang-format off
 $<JOIN:$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNELS>,>
 // clang-format on
 
-#ifdef GPUCA_KRNL_NOOCL1
-#undef GPUCA_KRNL_NOOCL1
+#ifdef GPUCA_KRNL_NOALIROOT
+#undef GPUCA_KRNL_NOALIROOT
 #endif

GPU/GPUTracking/Base/GPUReconstructionLibrary.cxx

@@ -101,10 +101,6 @@ std::shared_ptr<GPUReconstruction::LibraryLoader>* GPUReconstruction::GetLibrary
   } else if (type == DeviceType::HIP) {
 #ifdef HIP_ENABLED
     return &sLibHIP;
-#endif
-  } else if (type == DeviceType::OCL) {
-#ifdef OPENCL1_ENABLED
-    return &sLibOCL;
 #endif
   } else if (type == DeviceType::OCL2) {
 #ifdef OPENCL2_ENABLED