GPU: Remove all ROOT5 / CINT based protections

Author: davidrohr

GPU/Common/GPUCommonDef.h

@@ -30,14 +30,11 @@
 //Some GPU configuration settings, must be included first
 #include "GPUCommonDefSettings.h"
 
-#if (!(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__)) && defined(__cplusplus) && __cplusplus >= 201103L
+#if defined(__cplusplus) && __cplusplus >= 201103L
   #define GPUCA_NOCOMPAT // C++11 + No old ROOT5 + No old OpenCL
-  #ifndef __CINT__
-    #define GPUCA_NOCOMPAT_ALLCINT // + No ROOT CINT at all
-  #endif
 #endif
 
-#if !(defined(__CINT__) || defined(__ROOTCINT__) || defined(__CLING__) || defined(__ROOTCLING__) || defined(G__ROOT)) // No GPU code for ROOT
+#if !(defined(__CLING__) || defined(__ROOTCLING__) || defined(G__ROOT)) // No GPU code for ROOT
   #if defined(__CUDACC__) || defined(__OPENCL__) || defined(__HIPCC__) || defined(__OPENCL_HOST__)
     #define GPUCA_GPUCODE // Compiled by GPU compiler
   #endif
@@ -47,7 +44,7 @@
   #endif
 #endif
 
-// Definitions for C++11 features not supported by CINT / OpenCL
+// Definitions for C++11 features
 #ifdef GPUCA_NOCOMPAT
   #define CON_DELETE = delete
   #define CON_DEFAULT = default
@@ -63,11 +60,6 @@
   #define CONSTEXPR
   #define GPUCA_CPP11_INIT(...)
 #endif
-#if defined(__ROOT__) && !defined(GPUCA_NOCOMPAT)
-  #define VOLATILE // ROOT5 has a problem with volatile in CINT
-#else
-  #define VOLATILE volatile
-#endif
 
 // Set AliRoot / O2 namespace
 #if defined(GPUCA_STANDALONE) || (defined(GPUCA_O2_LIB) && !defined(GPUCA_O2_INTERFACE)) || defined(GPUCA_ALIROOT_LIB) || defined (GPUCA_GPUCODE)

GPU/Common/GPUCommonMath.h

@@ -531,7 +531,7 @@ GPUdi() void GPUCommonMath::AtomicMinInternal(S* addr, T val)
 #endif // GPUCA_GPUCODE
 }
 
-#if (defined(__CUDACC__) || defined(__HIPCC__)) && !defined(__ROOTCINT__) && !defined(G__ROOT)
+#if (defined(__CUDACC__) || defined(__HIPCC__)) && !defined(G__ROOT)
 #define GPUCA_HAVE_ATOMIC_MINMAX_FLOAT
 template <>
 GPUdii() void GPUCommonMath::AtomicMaxInternal(GPUglobalref() GPUgeneric() GPUAtomic(float) * addr, float val)

GPU/GPUTracking/Base/GPUConstantMem.h

@@ -20,21 +20,8 @@
 #include "GPUDataTypes.h"
 #include "GPUErrors.h"
 
-// Dummies for stuff not supported in legacy code (ROOT 5)
-#if defined(GPUCA_NOCOMPAT_ALLCINT)
 #include "GPUTPCGMMerger.h"
-#else
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
-{
-class GPUTPCGMMerger
-{
-};
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
-#endif
-#if defined(GPUCA_NOCOMPAT_ALLCINT) && (!defined(GPUCA_GPUCODE) || !defined(GPUCA_ALIROOT_LIB))
+#if (!defined(GPUCA_GPUCODE) || !defined(GPUCA_ALIROOT_LIB))
 #include "GPUTRDTracker.h"
 #else
 #include "GPUTRDDef.h"
@@ -52,7 +39,7 @@ class GPUTRDTracker_t
 #endif
 
 // Dummies for stuff not suppored in legacy code, or for what requires O2 headers while not available
-#if defined(GPUCA_NOCOMPAT_ALLCINT) && (!defined(GPUCA_GPUCODE) || !defined(GPUCA_ALIROOT_LIB)) && defined(GPUCA_HAVE_O2HEADERS)
+#if (!defined(GPUCA_GPUCODE) || !defined(GPUCA_ALIROOT_LIB)) && defined(GPUCA_HAVE_O2HEADERS)
 #include "GPUTPCConvert.h"
 #include "GPUTPCCompression.h"
 #include "GPUTPCDecompression.h"

GPU/GPUTracking/Base/GPUParam.h

@@ -78,7 +78,6 @@ struct GPUParam_t {
 };
 } // namespace internal
 
-#if !(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__) // Hide from ROOT 5 CINT
 struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam> {
 
 #ifndef GPUCA_GPUCODE
@@ -115,7 +114,6 @@ struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam>
 
   GPUd() bool rejectEdgeClusterByY(float uncorrectedY, int32_t iRow, float trackSigmaY) const;
 };
-#endif
 
 } // namespace gpu
 } // namespace GPUCA_NAMESPACE

GPU/GPUTracking/Base/GPUReconstructionDeviceBase.h

@@ -25,7 +25,7 @@ namespace GPUCA_NAMESPACE
 {
 namespace gpu
 {
-#if !(defined(__CINT__) || defined(__ROOTCINT__) || defined(__CLING__) || defined(__ROOTCLING__) || defined(G__ROOT))
+#if !(defined(__CLING__) || defined(__ROOTCLING__) || defined(G__ROOT))
 extern template class GPUReconstructionKernels<GPUReconstructionCPUBackend>;
 #endif
 

GPU/GPUTracking/DataTypes/GPUTRDTrack.h

@@ -36,16 +36,6 @@ class GlobalTrackID;
 } // namespace o2
 
 //_____________________________________________________________________________
-#if (defined(__CINT__) || defined(__ROOTCINT__)) && !defined(__CLING__)
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
-{
-template <typename T>
-class GPUTRDTrack_t;
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
-#else
 #if (!defined(GPUCA_STANDALONE) && !defined(GPUCA_ALIROOT_LIB)) || defined(GPUCA_HAVE_O2HEADERS)
 #include "GPUTRDInterfaceO2Track.h"
 #endif
@@ -150,6 +140,4 @@ class GPUTRDTrack_t : public T
 } // namespace gpu
 } // namespace GPUCA_NAMESPACE
 
-#endif // !((defined(__CINT__) || defined(__ROOTCINT__)) && !defined(__CLING__))
-
 #endif // GPUTRDTRACK_H

GPU/GPUTracking/Definitions/GPULogging.h

@@ -18,7 +18,7 @@
 #include "GPUCommonDef.h"
 // clang-format off
 #if !defined(GPUCA_NOCOMPAT)
-  // Cannot do anything for ROOT5CINT, so just disable
+  // just disable
   #define GPUInfo(...)
   #define GPUImportant(...)
   #define GPUWarning(...)

GPU/GPUTracking/GPUTrackingLinkDef_AliRoot.h

@@ -12,7 +12,7 @@
 /// \file GPUTrackingLinkDef_AliRoot.h
 /// \author David Rohr
 
-#if defined(__CINT__) || defined(__CLING__)
+#if defined(__CLING__)
 
 #pragma link off all globals;
 #pragma link off all classes;

GPU/GPUTracking/Global/GPUChainTracking.h

@@ -293,7 +293,7 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega
 
   // Synchronization and Locks
   eventStruct* mEvents = nullptr;
-  VOLATILE int32_t mSliceSelectorReady = 0;
+  volatile int32_t mSliceSelectorReady = 0;
   std::array<int8_t, NSLICES> mWriteOutputDone;
 
   std::vector<outputQueueEntry> mOutputQueue;

GPU/TPCFastTransformation/Spline2D.h

@@ -22,7 +22,7 @@
 #include "FlatObject.h"
 #include "GPUCommonDef.h"
 
-#if !defined(__CINT__) && !defined(__ROOTCINT__) && !defined(__ROOTCLING__) && !defined(GPUCA_GPUCODE) && !defined(GPUCA_NO_VC) && defined(__cplusplus) && __cplusplus >= 201703L
+#if !defined(__ROOTCLING__) && !defined(GPUCA_GPUCODE) && !defined(GPUCA_NO_VC) && defined(__cplusplus) && __cplusplus >= 201703L
 #include <Vc/Vc>
 #include <Vc/SimdArray>
 #endif