GPU: Remove C++ <17 protections from GPU code

AliceO2Group · Jan 22, 2025 · 47eb04f · 47eb04f
1 parent 89fbec2
commit 47eb04f
Show file tree

Hide file tree

Showing 54 changed files with 82 additions and 109 deletions.
diff --git a/GPU/Common/GPUCommonAlgorithm.h b/GPU/Common/GPUCommonAlgorithm.h
@@ -17,8 +17,7 @@
 
 #include "GPUCommonDef.h"
 
-#if !defined(GPUCA_GPUCODE)
-//&& (!defined __cplusplus || __cplusplus < 201402L) // This would enable to custom search also on the CPU if available by the compiler, but it is not always faster, so we stick to std::sort
+#if !defined(GPUCA_GPUCODE) // Could also enable custom search on the CPU, but it is not always faster, so we stick to std::sort
 #include <algorithm>
 #define GPUCA_ALGORITHM_STD
 #endif

diff --git a/GPU/Common/GPUCommonConstants.h b/GPU/Common/GPUCommonConstants.h
@@ -19,7 +19,7 @@
 
 namespace GPUCA_NAMESPACE::gpu::gpu_common_constants
 {
-static CONSTEXPR const float kCLight = 0.000299792458f; // TODO: Duplicate of MathConstants, fix this now that we use only OpenCL CPP
+static constexpr const float kCLight = 0.000299792458f; // TODO: Duplicate of MathConstants, fix this now that we use only OpenCL CPP
 }
 
 #endif
diff --git a/GPU/Common/GPUCommonDef.h b/GPU/Common/GPUCommonDef.h
@@ -40,13 +40,6 @@
   #endif
 #endif
 
-// Definitions for C++11 features
-#if defined(__cplusplus) && __cplusplus >= 201703L
-  #define CONSTEXPR constexpr
-#else
-  #define CONSTEXPR
-#endif
-
 // Set AliRoot / O2 namespace
 #if defined(GPUCA_STANDALONE) || (defined(GPUCA_O2_LIB) && !defined(GPUCA_O2_INTERFACE)) || defined(GPUCA_ALIROOT_LIB) || defined (GPUCA_GPUCODE)
   #define GPUCA_ALIGPUCODE

diff --git a/GPU/Common/GPUCommonLogger.h b/GPU/Common/GPUCommonLogger.h
@@ -45,7 +45,7 @@ struct DummyLogger {
 #define LOGP(...)
 // #define LOGP(...) static_assert(false, "LOGP(...) unsupported in GPU code");
 
-#elif defined(GPUCA_STANDALONE) || defined(GPUCA_ALIROOT_LIB) || (!defined(__cplusplus) || __cplusplus < 201703L)
+#elif defined(GPUCA_STANDALONE) || defined(GPUCA_ALIROOT_LIB)
 #include <iostream>
 #include <cstdio>
 #define LOG(type) std::cout

diff --git a/GPU/Common/GPUCommonMath.h b/GPU/Common/GPUCommonMath.h
@@ -73,8 +73,8 @@ class GPUCommonMath
   GPUd() static float Log(float x);
   GPUd() static float Exp(float x);
   GPUhdni() static float Copysign(float x, float y);
-  GPUd() static CONSTEXPR float TwoPi() { return 6.2831853f; }
-  GPUd() static CONSTEXPR float Pi() { return 3.1415927f; }
+  GPUd() static constexpr float TwoPi() { return 6.2831853f; }
+  GPUd() static constexpr float Pi() { return 3.1415927f; }
   GPUd() static float Round(float x);
   GPUd() static float Floor(float x);
   GPUd() static uint32_t Float2UIntReint(const float& x);
@@ -143,12 +143,12 @@ class GPUCommonMath
   GPUd() static float FMulRZ(float a, float b);
 
   template <int32_t I, class T>
-  GPUd() CONSTEXPR static T nextMultipleOf(T val);
+  GPUd() constexpr static T nextMultipleOf(T val);
 
   template <typename... Args>
   GPUdi() static float Sum2(float w, Args... args)
   {
-    if CONSTEXPR (sizeof...(Args) == 0) {
+    if constexpr (sizeof...(Args) == 0) {
       return w * w;
     } else {
       return w * w + Sum2(args...);
@@ -181,9 +181,9 @@ typedef GPUCommonMath CAMath;
 #endif // clang-format on
 
 template <int32_t I, class T>
-GPUdi() CONSTEXPR T GPUCommonMath::nextMultipleOf(T val)
+GPUdi() constexpr T GPUCommonMath::nextMultipleOf(T val)
 {
-  if CONSTEXPR (I & (I - 1)) {
+  if constexpr (I & (I - 1)) {
     T tmp = val % I;
     if (tmp) {
       val += I - tmp;

diff --git a/GPU/GPUTracking/Base/GPUGeneralKernels.h b/GPU/GPUTracking/Base/GPUGeneralKernels.h
@@ -81,7 +81,7 @@ class GPUKernelTemplate
   };
 
   typedef GPUconstantref() GPUConstantMem processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return &processors;
@@ -96,7 +96,7 @@ class GPUKernelTemplate
 class GPUMemClean16 : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
   template <int32_t iKernel = defaultKernel>
   GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors, GPUglobalref() void* ptr, uint64_t size);
 };
@@ -105,7 +105,7 @@ class GPUMemClean16 : public GPUKernelTemplate
 class GPUitoa : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::NoRecoStep; }
   template <int32_t iKernel = defaultKernel>
   GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors, GPUglobalref() int32_t* ptr, uint64_t size);
 };

diff --git a/GPU/GPUTracking/Base/GPUParam.inc b/GPU/GPUTracking/Base/GPUParam.inc
@@ -116,7 +116,7 @@ GPUdi() float GPUParam::GetSystematicClusterErrorC122(float x, float y, uint8_t
   if (dx > occupancyTotal * rec.tpc.sysClusErrorC12Box) {
     return 0.f;
   }
-  CONSTEXPR float dEdgeInv = 18.f / CAMath::Pi();
+  constexpr float dEdgeInv = 18.f / CAMath::Pi();
   const float dy = (sector == (GPUCA_NSLICES / 2 + 1) ? 0.5f : -0.5f) * (y / x) * dEdgeInv + 0.5f;
   const float errC12 = rec.tpc.sysClusErrorC12Norm * occupancyTotal * dy;
   return errC12 * errC12;

diff --git a/GPU/GPUTracking/Base/GPUProcessor.h b/GPU/GPUTracking/Base/GPUProcessor.h
@@ -108,7 +108,7 @@ class GPUProcessor
     if (basePtr == 0) {
       basePtr = 1;
     }
-    CONSTEXPR const size_t maxAlign = (alignof(S) > alignment) ? alignof(S) : alignment;
+    constexpr const size_t maxAlign = (alignof(S) > alignment) ? alignof(S) : alignment;
     basePtr += getAlignment<maxAlign>(basePtr);
     S* retVal = (S*)(basePtr);
     basePtr += nEntries * sizeof(S);

diff --git a/GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cl b/GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cl
@@ -14,9 +14,6 @@
 
 // clang-format off
 #define __OPENCL__
-#if defined(__cplusplus) && __cplusplus >= 201703L
-  #define __OPENCL__
-#endif
 #define GPUCA_GPUTYPE_OPENCL
 
 #ifdef __OPENCL__

diff --git a/GPU/GPUTracking/DataCompression/GPUTPCCompressionKernels.cxx b/GPU/GPUTracking/DataCompression/GPUTPCCompressionKernels.cxx
@@ -332,7 +332,7 @@ GPUdi() GPUTPCCompressionGatherKernels::Vec128* GPUTPCCompressionGatherKernels::
 template <typename T, typename S>
 GPUdi() bool GPUTPCCompressionGatherKernels::isAlignedTo(const S* ptr)
 {
-  if CONSTEXPR (alignof(S) >= alignof(T)) {
+  if constexpr (alignof(S) >= alignof(T)) {
     static_cast<void>(ptr);
     return true;
   } else {
@@ -343,10 +343,10 @@ GPUdi() bool GPUTPCCompressionGatherKernels::isAlignedTo(const S* ptr)
 template <>
 GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpy<uint8_t>(uint8_t* GPUrestrict() dst, const uint8_t* GPUrestrict() src, uint32_t size, int32_t nThreads, int32_t iThread)
 {
-  CONSTEXPR const int32_t vec128Elems = CpyVector<uint8_t, Vec128>::Size;
-  CONSTEXPR const int32_t vec64Elems = CpyVector<uint8_t, Vec64>::Size;
-  CONSTEXPR const int32_t vec32Elems = CpyVector<uint8_t, Vec32>::Size;
-  CONSTEXPR const int32_t vec16Elems = CpyVector<uint8_t, Vec16>::Size;
+  constexpr const int32_t vec128Elems = CpyVector<uint8_t, Vec128>::Size;
+  constexpr const int32_t vec64Elems = CpyVector<uint8_t, Vec64>::Size;
+  constexpr const int32_t vec32Elems = CpyVector<uint8_t, Vec32>::Size;
+  constexpr const int32_t vec16Elems = CpyVector<uint8_t, Vec16>::Size;
 
   if (size >= uint32_t(nThreads * vec128Elems)) {
     compressorMemcpyVectorised<uint8_t, Vec128>(dst, src, size, nThreads, iThread);
@@ -364,9 +364,9 @@ GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpy<uint8_t>(uint8_t*
 template <>
 GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpy<uint16_t>(uint16_t* GPUrestrict() dst, const uint16_t* GPUrestrict() src, uint32_t size, int32_t nThreads, int32_t iThread)
 {
-  CONSTEXPR const int32_t vec128Elems = CpyVector<uint16_t, Vec128>::Size;
-  CONSTEXPR const int32_t vec64Elems = CpyVector<uint16_t, Vec64>::Size;
-  CONSTEXPR const int32_t vec32Elems = CpyVector<uint16_t, Vec32>::Size;
+  constexpr const int32_t vec128Elems = CpyVector<uint16_t, Vec128>::Size;
+  constexpr const int32_t vec64Elems = CpyVector<uint16_t, Vec64>::Size;
+  constexpr const int32_t vec32Elems = CpyVector<uint16_t, Vec32>::Size;
 
   if (size >= uint32_t(nThreads * vec128Elems)) {
     compressorMemcpyVectorised<uint16_t, Vec128>(dst, src, size, nThreads, iThread);
@@ -382,8 +382,8 @@ GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpy<uint16_t>(uint16_t
 template <>
 GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpy<uint32_t>(uint32_t* GPUrestrict() dst, const uint32_t* GPUrestrict() src, uint32_t size, int32_t nThreads, int32_t iThread)
 {
-  CONSTEXPR const int32_t vec128Elems = CpyVector<uint32_t, Vec128>::Size;
-  CONSTEXPR const int32_t vec64Elems = CpyVector<uint32_t, Vec64>::Size;
+  constexpr const int32_t vec128Elems = CpyVector<uint32_t, Vec128>::Size;
+  constexpr const int32_t vec64Elems = CpyVector<uint32_t, Vec64>::Size;
 
   if (size >= uint32_t(nThreads * vec128Elems)) {
     compressorMemcpyVectorised<uint32_t, Vec128>(dst, src, size, nThreads, iThread);
@@ -446,8 +446,8 @@ GPUdi() void GPUTPCCompressionGatherKernels::compressorMemcpyBuffered(V* buf, T*
   V* GPUrestrict() dstAligned = nullptr;
 
   T* bufT = reinterpret_cast<T*>(buf);
-  CONSTEXPR const int32_t bufSize = GPUCA_WARP_SIZE;
-  CONSTEXPR const int32_t bufTSize = bufSize * sizeof(V) / sizeof(T);
+  constexpr const int32_t bufSize = GPUCA_WARP_SIZE;
+  constexpr const int32_t bufTSize = bufSize * sizeof(V) / sizeof(T);
 
   for (uint32_t i = 0; i < nEntries; i++) {
     uint32_t srcPos = 0;

diff --git a/GPU/GPUTracking/DataCompression/GPUTPCCompressionKernels.h b/GPU/GPUTracking/DataCompression/GPUTPCCompressionKernels.h
@@ -27,7 +27,7 @@ namespace GPUCA_NAMESPACE::gpu
 class GPUTPCCompressionKernels : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCCompression; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCCompression; }
 
   enum K : int32_t {
     step0attached = 0,

diff --git a/GPU/GPUTracking/DataTypes/GPUSettings.h b/GPU/GPUTracking/DataTypes/GPUSettings.h
@@ -45,7 +45,7 @@ class GPUSettings
                               RejectionStrategyA = 1,
                               RejectionStrategyB = 2 };
 
-  static CONSTEXPR const uint32_t TPC_MAX_TF_TIME_BIN = ((256 * 3564 + 2 * 8 - 2) / 8);
+  static constexpr const uint32_t TPC_MAX_TF_TIME_BIN = ((256 * 3564 + 2 * 8 - 2) / 8);
 };
 
 // Settings describing the global run parameters

diff --git a/GPU/GPUTracking/DataTypes/GPUTPCGMPolynomialField.h b/GPU/GPUTracking/DataTypes/GPUTPCGMPolynomialField.h
@@ -55,9 +55,9 @@ class GPUTPCGMPolynomialField
 
   void Print() const;
 
-  static CONSTEXPR const int32_t NTPCM = 10; // number of coefficients
-  static CONSTEXPR const int32_t NTRDM = 20; // number of coefficients for the TRD field
-  static CONSTEXPR const int32_t NITSM = 10; // number of coefficients for the ITS field
+  static constexpr const int32_t NTPCM = 10; // number of coefficients
+  static constexpr const int32_t NTRDM = 20; // number of coefficients for the TRD field
+  static constexpr const int32_t NITSM = 10; // number of coefficients for the ITS field
 
   GPUd() static void GetPolynomsTpc(float x, float y, float z, float f[NTPCM]);
   GPUd() static void GetPolynomsTrd(float x, float y, float z, float f[NTRDM]);

diff --git a/GPU/GPUTracking/DataTypes/GPUTPCGeometry.h b/GPU/GPUTracking/DataTypes/GPUTPCGeometry.h
@@ -60,7 +60,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   const float mPadHeight[10] = {.75f, .75f, .75f, .75f, 1.f, 1.f, 1.2f, 1.2f, 1.5f, 1.5f};
   const float mPadWidth[10] = {.416f, .420f, .420f, .436f, .6f, .6f, .608f, .588f, .604f, .607f};
 
-  static CONSTEXPR float FACTOR_T2Z = 250.f / 512.f; // Used in compression, must remain constant at 250cm, 512 time bins!
+  static constexpr float FACTOR_T2Z = 250.f / 512.f; // Used in compression, must remain constant at 250cm, 512 time bins!
 
  public:
   GPUd() int32_t GetRegion(int32_t row) const { return mRegion[row]; }
@@ -90,7 +90,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
   const float mPadHeight[3] = {.75f, 1.f, 1.5f};
   const float mPadWidth[3] = {.4f, .6f, .6f};
 
-  static CONSTEXPR float FACTOR_T2Z = 250.f / 1024.f; // Used in compression, must remain constant at 250cm, 1024 time bins!
+  static constexpr float FACTOR_T2Z = 250.f / 1024.f; // Used in compression, must remain constant at 250cm, 1024 time bins!
 
  public:
   GPUd() int32_t GetRegion(int32_t row) const { return (row < 63 ? 0 : row < 63 + 64 ? 1 : 2); }
@@ -102,10 +102,10 @@ class GPUTPCGeometry // TODO: Make values constexpr
   GPUd() int32_t EndOROC2() const { return GPUCA_ROW_COUNT; }
 #endif
  private:
-  static CONSTEXPR float FACTOR_Z2T = 1.f / FACTOR_T2Z;
+  static constexpr float FACTOR_Z2T = 1.f / FACTOR_T2Z;
 
  public:
-  GPUd() static CONSTEXPR float TPCLength() { return 250.f - 0.275f; }
+  GPUd() static constexpr float TPCLength() { return 250.f - 0.275f; }
   GPUd() float Row2X(int32_t row) const { return (mX[row]); }
   GPUd() float PadHeight(int32_t row) const { return (mPadHeight[GetRegion(row)]); }
   GPUd() float PadHeightByRegion(int32_t region) const { return (mPadHeight[region]); }

diff --git a/GPU/GPUTracking/Definitions/GPUDefGPUParameters.h b/GPU/GPUTracking/Definitions/GPUDefGPUParameters.h
@@ -632,13 +632,8 @@
   #define GPUCA_SORT_STARTHITS
 #endif
 
-#if defined(__cplusplus) && __cplusplus >= 201703L
 #define GPUCA_NEW_ALIGNMENT (std::align_val_t{GPUCA_BUFFER_ALIGNMENT})
 #define GPUCA_OPERATOR_NEW_ALIGNMENT ,GPUCA_NEW_ALIGNMENT
-#else
-#define GPUCA_NEW_ALIGNMENT
-#define GPUCA_OPERATOR_NEW_ALIGNMENT
-#endif
 
-// clang-format on
+    // clang-format on
 #endif
diff --git a/GPU/GPUTracking/Definitions/GPULogging.h b/GPU/GPUTracking/Definitions/GPULogging.h
@@ -44,7 +44,7 @@
       fmt::fprintf(stderr, string "\n", ##__VA_ARGS__); \
       throw std::exception();                           \
     }
-#elif defined(GPUCA_STANDALONE) || defined(GPUCA_GPUCODE_DEVICE) || (defined(GPUCA_ALIROOT_LIB) && defined(GPUCA_GPUCODE) && defined(__cplusplus) && __cplusplus < 201703L)
+#elif defined(GPUCA_STANDALONE) || defined(GPUCA_GPUCODE_DEVICE) || (defined(GPUCA_ALIROOT_LIB) && defined(GPUCA_GPUCODE))
   // For standalone / CUDA / HIP, we just use printf, which should be available
   // Temporarily, we also have to handle CUDA on AliRoot with O2 defaults due to ROOT / CUDA incompatibilities
   #include <cstdio>

diff --git a/GPU/GPUTracking/ITS/GPUITSFitterKernels.h b/GPU/GPUTracking/ITS/GPUITSFitterKernels.h
@@ -30,7 +30,7 @@ class GPUITSTrack;
 class GPUITSFitterKernels : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::ITSTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::ITSTracking; }
   template <int32_t iKernel = defaultKernel>
   GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors);
 

diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMerger.h b/GPU/GPUTracking/Merger/GPUTPCGMMerger.h
@@ -66,7 +66,7 @@ class GPUTPCGMMerger : public GPUProcessor
   ~GPUTPCGMMerger() = default;
   GPUTPCGMMerger(const GPUTPCGMMerger&) = delete;
   const GPUTPCGMMerger& operator=(const GPUTPCGMMerger&) const = delete;
-  static CONSTEXPR const int32_t NSLICES = GPUCA_NSLICES; //* N slices
+  static constexpr const int32_t NSLICES = GPUCA_NSLICES; //* N slices
 
   struct memory {
     GPUAtomic(uint32_t) nRetryRefit;

diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMergerGPU.h b/GPU/GPUTracking/Merger/GPUTPCGMMergerGPU.h
@@ -26,7 +26,7 @@ namespace gpu
 class GPUTPCGMMergerGeneral : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCMerging; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCMerging; }
 #if !defined(GPUCA_ALIROOT_LIB) || !defined(GPUCA_GPUCODE)
   typedef GPUTPCGMMerger processorType;
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)

diff --git a/GPU/GPUTracking/Merger/GPUTPCGlobalDebugSortKernels.h b/GPU/GPUTracking/Merger/GPUTPCGlobalDebugSortKernels.h
@@ -32,7 +32,7 @@ class GPUTPCGlobalDebugSortKernels : public GPUKernelTemplate
            globalTracks1 = 2,
            globalTracks2 = 3,
            borderTracks = 4 };
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCMerging; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCMerging; }
   typedef GPUTPCGMMerger processorType;
   GPUhdi() static processorType* Processor(GPUConstantMem& processors) { return &processors.tpcMerger; }
 

diff --git a/GPU/GPUTracking/Refit/GPUTrackingRefitKernel.h b/GPU/GPUTracking/Refit/GPUTrackingRefitKernel.h
@@ -24,7 +24,7 @@ namespace o2::gpu
 class GPUTrackingRefitKernel : public GPUKernelTemplate
 {
  public:
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCCompression; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCCompression; }
 
   enum K : int32_t {
     mode0asGPU = 0,

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCCreateOccupancyMap.h b/GPU/GPUTracking/SliceTracker/GPUTPCCreateOccupancyMap.h
@@ -29,7 +29,7 @@ class GPUTPCCreateOccupancyMap : public GPUKernelTemplate
   enum K { defaultKernel = 0,
            fill = 0,
            fold = 1 };
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCSliceTracking; }
   template <int32_t iKernel = defaultKernel, typename... Args>
   GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors, Args... args);
 };

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCCreateSliceData.h b/GPU/GPUTracking/SliceTracker/GPUTPCCreateSliceData.h
@@ -34,7 +34,7 @@ class GPUTPCCreateSliceData : public GPUKernelTemplate
   };
 
   typedef GPUconstantref() GPUTPCTracker processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return processors.tpcTrackers;

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.h b/GPU/GPUTracking/SliceTracker/GPUTPCGlobalTracking.h
@@ -32,7 +32,7 @@ class GPUTPCGlobalTracking : public GPUKernelTemplate
   };
 
   typedef GPUconstantref() GPUTPCTracker processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return processors.tpcTrackers;
@@ -52,7 +52,7 @@ class GPUTPCGlobalTrackingCopyNumbers : public GPUKernelTemplate
 {
  public:
   typedef GPUconstantref() GPUTPCTracker processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return processors.tpcTrackers;

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursCleaner.h b/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursCleaner.h
@@ -40,7 +40,7 @@ class GPUTPCNeighboursCleaner : public GPUKernelTemplate
   };
 
   typedef GPUconstantref() GPUTPCTracker processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return processors.tpcTrackers;

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h b/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h
@@ -51,7 +51,7 @@ class GPUTPCNeighboursFinder : public GPUKernelTemplate
   };
 
   typedef GPUconstantref() GPUTPCTracker processorType;
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TPCSliceTracking; }
   GPUhdi() static processorType* Processor(GPUConstantMem& processors)
   {
     return processors.tpcTrackers;

diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCSectorDebugSortKernels.h b/GPU/GPUTracking/SliceTracker/GPUTPCSectorDebugSortKernels.h
@@ -30,7 +30,7 @@ class GPUTPCSectorDebugSortKernels : public GPUKernelTemplate
            hitData = 0,
            startHits = 1,
            sliceTracks = 2 };
-  GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCSliceTracking; }
+  GPUhdi() constexpr static GPUDataTypes::RecoStep GetRecoStep() { return GPUDataTypes::RecoStep::TPCSliceTracking; }
   typedef GPUTPCTracker processorType;
   GPUhdi() static processorType* Processor(GPUConstantMem& processors) { return processors.tpcTrackers; }