GPU: Simplify __OPENCL__ macros using __OPENCL1__

davidrohr · davidrohr · commit 8aeaa54fc122 · 2024-11-14T12:07:02.000+01:00
diff --git a/GPU/Common/GPUCommonConstants.h b/GPU/Common/GPUCommonConstants.h
@@ -17,7 +17,7 @@
 
 #include "GPUCommonDef.h"
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 namespace GPUCA_NAMESPACE::gpu::gpu_common_constants
 {
 static CONSTEXPR const float kCLight = 0.000299792458f;
diff --git a/GPU/Common/GPUCommonDef.h b/GPU/Common/GPUCommonDef.h
@@ -30,7 +30,7 @@
 //Some GPU configuration settings, must be included first
 #include "GPUCommonDefSettings.h"
 
-#if (!defined(__OPENCL__) || defined(__OPENCLCPP__)) && (!(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__)) && defined(__cplusplus) && __cplusplus >= 201103L
+#if !defined(__OPENCL1__) && (!(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(__OPENCL__) && !defined(__OPENCLCPP__) && 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(__OPENCL1__) && defined(GPUCA_OPENCL_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
diff --git a/GPU/Common/GPUCommonMath.h b/GPU/Common/GPUCommonMath.h
@@ -31,7 +31,7 @@
 #include <cstdint>
 #endif
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 namespace GPUCA_NAMESPACE
 {
 namespace gpu
@@ -220,7 +220,7 @@ GPUdi() uint32_t GPUCommonMath::Float2UIntReint(const float& x)
 {
 #if defined(GPUCA_GPUCODE_DEVICE) && (defined(__CUDACC__) || defined(__HIPCC__))
   return __float_as_uint(x);
-#elif defined(GPUCA_GPUCODE_DEVICE) && (defined(__OPENCL__) || defined(__OPENCLCPP__))
+#elif defined(GPUCA_GPUCODE_DEVICE) && defined(__OPENCL__)
   return as_uint(x);
 #else
   return reinterpret_cast<const uint32_t&>(x);
@@ -289,7 +289,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(__OPENCL__) || defined(__OPENCLCPP__))
+#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && !defined(__OPENCL1__)
   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 +303,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(__OPENCLCPP__)*/) // TODO: remove OPENCLCPP workaround when reported SPIR-V bug is fixed
+#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
   // use builtin if available
   return CHOICE(__builtin_popcount(x), __popc(x), __builtin_popcount(x));
 #else
@@ -563,7 +563,7 @@ GPUdii() void GPUCommonMath::AtomicMinInternal(GPUglobalref() GPUgeneric() GPUAt
 
 #undef CHOICE
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 }
 }
 #endif
diff --git a/GPU/Common/GPUCommonTypeTraits.h b/GPU/Common/GPUCommonTypeTraits.h
@@ -21,7 +21,7 @@
 #ifndef GPUCA_GPUCODE_COMPILEKERNELS
 #include <type_traits>
 #endif
-#elif !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#elif !defined(__OPENCL1__)
 // We just reimplement some type traits in std for the GPU
 namespace std
 {
diff --git a/GPU/GPUTracking/Base/GPUParam.inc b/GPU/GPUTracking/Base/GPUParam.inc
@@ -17,7 +17,7 @@
 
 #include "GPUParam.h"
 #include "GPUTPCGMMergedTrackHit.h"
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 #include "GPUTPCClusterOccupancyMap.h"
 #endif
 
@@ -228,7 +228,7 @@ GPUdi() void MEM_LG(GPUParam)::UpdateClusterError2ByState(int16_t clusterState,
 MEM_CLASS_PRE()
 GPUdi() float MEM_LG(GPUParam)::GetUnscaledMult(float time) const
 {
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   if (!occupancyMap) {
     return 0.f;
   }
diff --git a/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl b/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl
@@ -14,6 +14,11 @@
 
 // clang-format off
 #define __OPENCL__
+#if defined(__cplusplus) && __cplusplus >= 201703L
+  #define __OPENCLCPP__
+#else
+  #define __OPENCL1__
+#endif
 #define GPUCA_GPUTYPE_OPENCL
 
 #ifdef __OPENCLCPP__
diff --git a/GPU/GPUTracking/Base/opencl2/CMakeLists.txt b/GPU/GPUTracking/Base/opencl2/CMakeLists.txt
@@ -32,8 +32,6 @@ set(OCL_DEFINECL "-D$<JOIN:$<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS
             -I${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
             -I${CMAKE_SOURCE_DIR}/Detectors/Base/src
             -I${CMAKE_SOURCE_DIR}/DataFormats/Reconstruction/src
-            -I${CMAKE_SOURCE_DIR}/Detectors/ITSMFT/ITS/tracking/cuda/include
-            -D__OPENCLCPP__
 )
 
 set(SRCS GPUReconstructionOCL2.cxx)
diff --git a/GPU/GPUTracking/DataTypes/GPUDataTypes.h b/GPU/GPUTracking/DataTypes/GPUDataTypes.h
@@ -125,7 +125,7 @@ namespace gpu
 #define GPUCA_RECO_STEP GPUDataTypes
 #endif
 
-#if defined(__OPENCL__) && !defined(__OPENCLCPP__)
+#if defined(__OPENCL1__)
 MEM_CLASS_PRE() // Macro with some template magic for OpenCL 1.2
 #endif
 class GPUTPCTrack;
diff --git a/GPU/GPUTracking/DataTypes/GPUO2DataTypes.h b/GPU/GPUTracking/DataTypes/GPUO2DataTypes.h
@@ -17,7 +17,7 @@
 
 // Pull in several O2 headers with basic data types, or load a header with empty fake classes if O2 headers not available
 
-#if defined(GPUCA_HAVE_O2HEADERS) && (!defined(__OPENCL__) || defined(__OPENCLCPP__))
+#if defined(GPUCA_HAVE_O2HEADERS) && !defined(__OPENCL1__)
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/Digit.h"
 #include "DetectorsBase/MatLayerCylSet.h"
@@ -27,7 +27,7 @@
 #include "GPUO2FakeClasses.h"
 #endif
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 #include "GPUdEdxInfo.h"
 #endif
 
diff --git a/GPU/GPUTracking/DataTypes/GPUSettings.h b/GPU/GPUTracking/DataTypes/GPUSettings.h
@@ -45,7 +45,7 @@ class GPUSettings
                               RejectionStrategyA = 1,
                               RejectionStrategyB = 2 };
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   static CONSTEXPR const uint32_t TPC_MAX_TF_TIME_BIN = ((256 * 3564 + 2 * 8 - 2) / 8);
 #endif
 };
diff --git a/GPU/GPUTracking/DataTypes/GPUTPCGMPolynomialField.h b/GPU/GPUTracking/DataTypes/GPUTPCGMPolynomialField.h
@@ -29,7 +29,7 @@ namespace gpu
 class GPUTPCGMPolynomialField
 {
  public:
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   GPUTPCGMPolynomialField() : mNominalBz(0.f)
   {
     Reset();
@@ -94,7 +94,7 @@ class GPUTPCGMPolynomialField
   float mItsBz[NITSM];
 };
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 
 inline void GPUTPCGMPolynomialField::Reset()
 {
diff --git a/GPU/GPUTracking/DataTypes/GPUTPCGeometry.h b/GPU/GPUTracking/DataTypes/GPUTPCGeometry.h
@@ -34,7 +34,7 @@ namespace gpu
 // Should be unified, but cannot take the contants from the official headers for now, since we want it to be constexpr
 class GPUTPCGeometry // TODO: Make values constexpr
 {
-#if defined(__OPENCL__) && !defined(__OPENCLCPP__)
+#if defined(__OPENCL1__)
   GPUTPCGeometry(); // Fake constructor declaration for OpenCL due to static members, does not exist!
 #endif
 #ifdef GPUCA_TPC_GEOMETRY_O2
@@ -63,7 +63,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   const float mPadHeight[10] GPUCA_CPP11_INIT(= {.75f, .75f, .75f, .75f, 1.f, 1.f, 1.2f, 1.2f, 1.5f, 1.5f});
   const float mPadWidth[10] GPUCA_CPP11_INIT(= {.416f, .420f, .420f, .436f, .6f, .6f, .608f, .588f, .604f, .607f});
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   static CONSTEXPR float FACTOR_T2Z GPUCA_CPP11_INIT(= 250.f / 512.f); // Used in compression, must remain constant at 250cm, 512 time bins!
 #endif
 
@@ -95,7 +95,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   const float mPadHeight[3] GPUCA_CPP11_INIT(= {.75f, 1.f, 1.5f});
   const float mPadWidth[3] GPUCA_CPP11_INIT(= {.4f, .6f, .6f});
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   static CONSTEXPR float FACTOR_T2Z GPUCA_CPP11_INIT(= 250.f / 1024.f); // Used in compression, must remain constant at 250cm, 1024 time bins!
 #endif
 
@@ -109,7 +109,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   GPUd() int32_t EndOROC2() const { return GPUCA_ROW_COUNT; }
 #endif
  private:
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   static CONSTEXPR float FACTOR_Z2T GPUCA_CPP11_INIT(= 1.f / FACTOR_T2Z);
 #endif
  public:
@@ -120,7 +120,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   GPUd() float PadWidth(int32_t row) const { return (mPadWidth[GetRegion(row)]); }
   GPUd() uint8_t NPads(int32_t row) const { return mNPads[row]; }
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   GPUd() float LinearPad2Y(int32_t slice, int32_t row, float pad) const
   {
     const float u = (pad - 0.5f * mNPads[row]) * PadWidth(row);
diff --git a/GPU/GPUTracking/Definitions/GPUDefConstantsAndSettings.h b/GPU/GPUTracking/Definitions/GPUDefConstantsAndSettings.h
@@ -51,7 +51,7 @@
 #if defined(GPUCA_NSLICES) || defined(GPUCA_ROW_COUNT)
   #error GPUCA_NSLICES or GPUCA_ROW_COUNT already defined, do not include GPUTPCGeometry.h before!
 #endif
-#if defined(GPUCA_HAVE_O2HEADERS) && defined(GPUCA_TPC_GEOMETRY_O2) && (!defined(__OPENCL__) || defined(__OPENCLCPP__)) && !(defined(ROOT_VERSION_CODE) && ROOT_VERSION_CODE < 393216)
+#if defined(GPUCA_HAVE_O2HEADERS) && defined(GPUCA_TPC_GEOMETRY_O2) && !defined(__OPENCL1__) && !(defined(ROOT_VERSION_CODE) && ROOT_VERSION_CODE < 393216)
   //Use definitions from the O2 headers if available for nicer code and type safety
   #include "DataFormatsTPC/Constants.h"
   #define GPUCA_NSLICES o2::tpc::constants::MAXSECTOR
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.cxx b/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.cxx
@@ -22,7 +22,7 @@
 
 using namespace GPUCA_NAMESPACE::gpu;
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 
 GPUd() int32_t GPUTPCGlobalTracking::PerformGlobalTrackingRun(GPUTPCTracker& tracker, GPUsharedref() MEM_LOCAL(GPUSharedMemory) & smem, const GPUTPCTracker& GPUrestrict() sliceSource, int32_t iTrack, int32_t rowIndex, float angle, int32_t direction)
 {
@@ -200,7 +200,7 @@ GPUd() void GPUTPCGlobalTracking::GlobalTrackingSliceLeftRight(uint32_t iSlice,
     right += GPUDataTypes::NSLICES / 2;
   }
 }
-#endif // !__OPENCL__ || __OPENCLCPP__
+#endif // !__OPENCL1__
 
 template <>
 GPUdii() void GPUTPCGlobalTrackingCopyNumbers::Thread<0>(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() MEM_LOCAL(GPUSharedMemory) & smem, processorType& GPUrestrict() tracker, int32_t n)
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.h b/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.h
@@ -25,7 +25,7 @@ namespace gpu
 MEM_CLASS_PRE()
 class GPUTPCTracker;
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 class GPUTPCGlobalTracking : public GPUKernelTemplate
 {
  public:
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCSliceOutput.h b/GPU/GPUTracking/SliceTracker/GPUTPCSliceOutput.h
@@ -44,7 +44,7 @@ class GPUTPCSliceOutput
   }
   GPUhd() uint32_t NLocalTracks() const { return mNLocalTracks; }
   GPUhd() uint32_t NTrackClusters() const { return mNTrackClusters; }
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   GPUhd() const GPUTPCTrack* GetFirstTrack() const
   {
     return (const GPUTPCTrack*)((const char*)this + sizeof(*this));
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTracker.cxx b/GPU/GPUTracking/SliceTracker/GPUTPCTracker.cxx
@@ -22,7 +22,7 @@
 #include "GPUO2DataTypes.h"
 #include "GPUTPCTrackParam.h"
 #include "GPUParam.inc"
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 #include "GPUTPCConvertImpl.h"
 #endif
 
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h b/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h
@@ -94,7 +94,7 @@ class GPUTPCTracker : public GPUProcessor
     StructGPUParameters gpuParameters;  // GPU parameters
   };
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   GPUhdi() GPUglobalref() const GPUTPCClusterData* ClusterData() const
   {
     return mData.ClusterData();
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.cxx b/GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.cxx
@@ -21,7 +21,7 @@
 #include "GPUTPCTracker.h"
 #include "GPUTPCTracklet.h"
 #include "GPUTPCTrackletConstructor.h"
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 #include "GPUTPCGlobalTracking.h"
 #include "CorrectionMapsHelper.h"
 #ifdef GPUCA_HAVE_O2HEADERS
@@ -140,14 +140,14 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int32_t /*nBlocks*/,
       float z = z0 + hh.y * stepZ;
       if (iRow != r.mStartRow || !tracker.Param().par.continuousTracking) {
         tParam.ConstrainZ(z, tracker.ISlice(), z0, r.mLastZ);
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
         tracker.GetConstantMem()->calibObjects.fastTransformHelper->TransformXYZ(tracker.ISlice(), iRow, x, y, z);
 #endif
       }
       if (iRow == r.mStartRow) {
         if (tracker.Param().par.continuousTracking) {
           float refZ = ((z > 0) ? tracker.Param().rec.tpc.defaultZOffsetOverR : -tracker.Param().rec.tpc.defaultZOffsetOverR) * x;
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
           float zTmp = refZ;
           tracker.GetConstantMem()->calibObjects.fastTransformHelper->TransformXYZ(tracker.ISlice(), iRow, x, y, zTmp);
           z += zTmp - refZ; // Add zCorrection (=zTmp - refZ) to z, such that zOffset is set such, that transformed (z - zOffset) becomes refZ
@@ -266,7 +266,7 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int32_t /*nBlocks*/,
       r.mNMissed++;
 
       float x = row.X();
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
       {
         float tmpY, tmpZ;
         if (!tParam.GetPropagatedYZ(tracker.Param().bzCLight, x, tmpY, tmpZ)) {
@@ -299,7 +299,7 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int32_t /*nBlocks*/,
         GPUglobalref() const cahit2* hits = tracker.HitData(row);
         GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
 #endif //! GPUCA_TEXTURE_FETCH_CONSTRUCTOR
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
         tracker.GetConstantMem()->calibObjects.fastTransformHelper->InverseTransformYZtoNominalYZ(tracker.ISlice(), iRow, yUncorrected, zUncorrected, yUncorrected, zUncorrected);
 #endif
 
@@ -391,7 +391,7 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int32_t /*nBlocks*/,
         }
       } while (false);
       (void)found;
-#if defined(GPUCA_HAVE_O2HEADERS) && (!defined(__OPENCL__) || defined(__OPENCLCPP__))
+#if defined(GPUCA_HAVE_O2HEADERS) && !defined(__OPENCL1__)
       if (!found && tracker.GetConstantMem()->calibObjects.dEdxCalibContainer) {
         uint32_t pad = CAMath::Float2UIntRn(tracker.Param().tpcGeometry.LinearY2Pad(tracker.ISlice(), iRow, yUncorrected));
         if (pad < tracker.Param().tpcGeometry.NPads(iRow) && tracker.GetConstantMem()->calibObjects.dEdxCalibContainer->isDead(tracker.ISlice(), iRow, pad)) {
@@ -461,7 +461,7 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::DoTracklet(GPUconstantref() MEM_GLO
       iRow = r.mEndRow;
       iRowEnd = -1;
       float x = tracker.Row(r.mEndRow).X();
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
       {
         float tmpY, tmpZ;
         if (tParam.GetPropagatedYZ(tracker.Param().bzCLight, x, tmpY, tmpZ)) {
@@ -584,7 +584,7 @@ GPUd() int32_t GPUTPCTrackletConstructor::FetchTracklet(GPUconstantref() MEM_GLO
 
 #endif // GPUCA_GPUCODE
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
 template <>
 GPUd() int32_t GPUTPCTrackletConstructor::GPUTPCTrackletConstructorGlobalTracking<GPUTPCGlobalTracking::GPUSharedMemory>(GPUconstantref() MEM_GLOBAL(GPUTPCTracker) & GPUrestrict() tracker, GPUsharedref() GPUTPCGlobalTracking::GPUSharedMemory& sMem, MEM_LG(GPUTPCTrackParam) & GPUrestrict() tParam, int32_t row, int32_t increment, int32_t iTracklet, calink* rowHits)
 {
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.h b/GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.h
@@ -100,7 +100,7 @@ class GPUTPCTrackletConstructor
   GPUd() static int32_t FetchTracklet(GPUconstantref() MEM_GLOBAL(GPUTPCTracker) & tracker, GPUsharedref() MEM_LOCAL(GPUSharedMemory) & sMem);
 #endif // GPUCA_GPUCODE
 
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if !defined(__OPENCL1__)
   template <class T>
   GPUd() static int32_t GPUTPCTrackletConstructorGlobalTracking(GPUconstantref() MEM_GLOBAL(GPUTPCTracker) & tracker, GPUsharedref() T& sMem, GPUTPCTrackParam& tParam, int32_t startrow, int32_t increment, int32_t iTracklet, calink* rowHits);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`#include "GPUCommonDef.h"`
`19`	`19`
`20`		`-#if !defined(__OPENCL__) \|\| defined(__OPENCLCPP__)`
	`20`	`+#if !defined(__OPENCL1__)`
`21`	`21`	`namespace GPUCA_NAMESPACE::gpu::gpu_common_constants`
`22`	`22`	`{`
`23`	`23`	`static CONSTEXPR const float kCLight = 0.000299792458f;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#ifndef GPUCA_GPUCODE_COMPILEKERNELS`
`22`	`22`	`#include <type_traits>`
`23`	`23`	`#endif`
`24`		`-#elif !defined(__OPENCL__) \|\| defined(__OPENCLCPP__)`
	`24`	`+#elif !defined(__OPENCL1__)`
`25`	`25`	`// We just reimplement some type traits in std for the GPU`
`26`	`26`	`namespace std`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ set(OCL_DEFINECL "-D$<JOIN:$<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS`
`32`	`32`	`-I${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src`
`33`	`33`	`-I${CMAKE_SOURCE_DIR}/Detectors/Base/src`
`34`	`34`	`-I${CMAKE_SOURCE_DIR}/DataFormats/Reconstruction/src`
`35`		`- -I${CMAKE_SOURCE_DIR}/Detectors/ITSMFT/ITS/tracking/cuda/include`
`36`		`- -D__OPENCLCPP__`
`37`	`35`	`)`
`38`	`36`
`39`	`37`	`set(SRCS GPUReconstructionOCL2.cxx)`