GPU: Use GPUdi() macro instead of inline keyword

davidrohr · davidrohr · commit 3f23f529eee1 · 2024-09-07T10:23:46.000+02:00
diff --git a/Common/DCAFitter/include/DCAFitter/DCAFitterN.h b/Common/DCAFitter/include/DCAFitter/DCAFitterN.h
@@ -753,7 +753,7 @@ GPUd() void DCAFitterN<N, Args...>::calcTrackResiduals()
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline void DCAFitterN<N, Args...>::calcTrackDerivatives()
+GPUdi() void DCAFitterN<N, Args...>::calcTrackDerivatives()
 {
   // calculate track derivatives over X param
   for (int i = N; i--;) {
@@ -763,7 +763,7 @@ GPUd() inline void DCAFitterN<N, Args...>::calcTrackDerivatives()
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline double DCAFitterN<N, Args...>::calcChi2() const
+GPUdi() double DCAFitterN<N, Args...>::calcChi2() const
 {
   // calculate current chi2
   double chi2 = 0;
@@ -777,7 +777,7 @@ GPUd() inline double DCAFitterN<N, Args...>::calcChi2() const
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline double DCAFitterN<N, Args...>::calcChi2NoErr() const
+GPUdi() double DCAFitterN<N, Args...>::calcChi2NoErr() const
 {
   // calculate current chi2 of abs. distance minimization
   double chi2 = 0;
@@ -842,7 +842,7 @@ GPUd() bool DCAFitterN<N, Args...>::propagateTracksToVertex(int icand)
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline o2::track::TrackPar DCAFitterN<N, Args...>::getTrackParamAtPCA(int i, int icand)
+GPUdi() o2::track::TrackPar DCAFitterN<N, Args...>::getTrackParamAtPCA(int i, int icand)
 {
   // propagate tracks param only to current vertex (if not already done)
   int ord = mOrder[icand];
@@ -858,7 +858,7 @@ GPUd() inline o2::track::TrackPar DCAFitterN<N, Args...>::getTrackParamAtPCA(int
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline double DCAFitterN<N, Args...>::getAbsMax(const VecND& v)
+GPUdi() double DCAFitterN<N, Args...>::getAbsMax(const VecND& v)
 {
   double mx = -1;
   for (int i = N; i--;) {
@@ -1075,7 +1075,7 @@ GPUd() o2::track::TrackPar DCAFitterN<N, Args...>::createParentTrackPar(int cand
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline bool DCAFitterN<N, Args...>::propagateParamToX(o2::track::TrackPar& t, float x)
+GPUdi() bool DCAFitterN<N, Args...>::propagateParamToX(o2::track::TrackPar& t, float x)
 {
   bool res = true;
   if (mUsePropagator || mMatCorr != o2::base::Propagator::MatCorrType::USEMatCorrNONE) {
@@ -1091,7 +1091,7 @@ GPUd() inline bool DCAFitterN<N, Args...>::propagateParamToX(o2::track::TrackPar
 
 //___________________________________________________________________
 template <int N, typename... Args>
-GPUd() inline bool DCAFitterN<N, Args...>::propagateToX(o2::track::TrackParCov& t, float x)
+GPUdi() bool DCAFitterN<N, Args...>::propagateToX(o2::track::TrackParCov& t, float x)
 {
   bool res = true;
   if (mUsePropagator || mMatCorr != o2::base::Propagator::MatCorrType::USEMatCorrNONE) {
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/TrackTPC.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/TrackTPC.h
@@ -79,7 +79,7 @@ class TrackTPC : public o2::track::TrackParCov
   GPUd() void setClusterRef(uint32_t entry, uint16_t ncl) { mClustersReference.set(entry, ncl); }
 
   template <class T>
-  GPUd() static inline void getClusterReference(T& clinfo, int nCluster,
+  GPUdi() static void getClusterReference(T& clinfo, int nCluster,
                                                 uint8_t& sectorIndex, uint8_t& rowIndex, uint32_t& clusterIndex, const ClusRef& ref)
   {
     // data for given tracks starts at clinfo[ ref.getFirstEntry() ],
@@ -95,14 +95,14 @@ class TrackTPC : public o2::track::TrackParCov
   }
 
   template <class T>
-  GPUd() inline void getClusterReference(T& clinfo, int nCluster,
+  GPUdi() void getClusterReference(T& clinfo, int nCluster,
                                          uint8_t& sectorIndex, uint8_t& rowIndex, uint32_t& clusterIndex) const
   {
     getClusterReference<T>(clinfo, nCluster, sectorIndex, rowIndex, clusterIndex, mClustersReference);
   }
 
   template <class T>
-  GPUd() static inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
+  GPUdi() static const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
                                                                 const o2::tpc::ClusterNativeAccess& clusters, uint8_t& sectorIndex, uint8_t& rowIndex, const ClusRef& ref)
   {
     uint32_t clusterIndex;
@@ -111,14 +111,14 @@ class TrackTPC : public o2::track::TrackParCov
   }
 
   template <class T>
-  GPUd() inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
+  GPUdi() const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
                                                          const o2::tpc::ClusterNativeAccess& clusters, uint8_t& sectorIndex, uint8_t& rowIndex) const
   {
     return getCluster<T>(clinfo, nCluster, clusters, sectorIndex, rowIndex, mClustersReference);
   }
 
   template <class T>
-  GPUd() inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
+  GPUdi() const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,
                                                          const o2::tpc::ClusterNativeAccess& clusters) const
   {
     uint8_t sectorIndex, rowIndex;
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h
@@ -199,9 +199,9 @@ class TrackParametrization
   GPUd() value_t getPt() const;
   GPUd() value_t getE2() const;
   GPUd() value_t getE() const;
-  GPUd() static inline value_t getdEdxBB(value_t betagamma) { return BetheBlochSolid(betagamma); }
-  GPUd() static inline value_t getdEdxBBOpt(value_t betagamma) { return BetheBlochSolidOpt(betagamma); }
-  GPUd() static inline value_t getBetheBlochSolidDerivativeApprox(value_T dedx, value_T bg) { return BetheBlochSolidDerivative(dedx, bg); }
+  GPUdi() static value_t getdEdxBB(value_t betagamma) { return BetheBlochSolid(betagamma); }
+  GPUdi() static value_t getdEdxBBOpt(value_t betagamma) { return BetheBlochSolidOpt(betagamma); }
+  GPUdi() static value_t getBetheBlochSolidDerivativeApprox(value_T dedx, value_T bg) { return BetheBlochSolidDerivative(dedx, bg); }
 
   GPUd() value_t getTheta() const;
   GPUd() value_t getEta() const;
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackUtils.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackUtils.h
@@ -190,7 +190,7 @@ GPUd() value_T BetheBlochSolidOpt(value_T bg)
 
 //____________________________________________________
 template <typename value_T>
-GPUd() value_T inline BetheBlochSolidDerivative(value_T dedx, value_T bg)
+GPUdi() value_T BetheBlochSolidDerivative(value_T dedx, value_T bg)
 {
   //
   // This is approximate derivative of the BB over betagamm, NO check for the consistency of the provided dedx and bg is done
diff --git a/Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/ClusterLinesGPU.h b/Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/ClusterLinesGPU.h
@@ -57,7 +57,7 @@ class ClusterLinesGPU final
  public:
   GPUd() ClusterLinesGPU(const Line& firstLine, const Line& secondLine); // poor man solution to calculate duplets' centroid
   GPUd() void computeClusterCentroid();
-  GPUd() inline float* getVertex() { return mVertex; }
+  GPUdi() float* getVertex() { return mVertex; }
 
  private:
   float mAMatrix[6];         // AX=B
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTrackLinearisation.h b/GPU/GPUTracking/SliceTracker/GPUTPCTrackLinearisation.h
@@ -67,7 +67,7 @@ class GPUTPCTrackLinearisation
   float mQPt;    // QPt
 };
 
-GPUd() MEM_CLASS_PRE2() inline GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(const MEM_LG2(GPUTPCTrackParam) & GPUrestrict() t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())
+MEM_CLASS_PRE2() GPUdi() GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(const MEM_LG2(GPUTPCTrackParam) & GPUrestrict() t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())
 {
   if (mSinPhi > GPUCA_MAX_SIN_PHI) {
     mSinPhi = GPUCA_MAX_SIN_PHI;
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTrackParam.h b/GPU/GPUTracking/SliceTracker/GPUTPCTrackParam.h
@@ -157,7 +157,7 @@ class GPUTPCTrackParam
   int mNDF;          // the Number of Degrees of Freedom
 };
 
-GPUd() MEM_CLASS_PRE() inline void MEM_LG(GPUTPCTrackParam)::InitParam()
+MEM_CLASS_PRE() GPUdi() void MEM_LG(GPUTPCTrackParam)::InitParam()
 {
   // Initialize Tracklet Parameters using default values
   SetSinPhi(0);

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class TrackTPC : public o2::track::TrackParCov`
`79`	`79`	`GPUd() void setClusterRef(uint32_t entry, uint16_t ncl) { mClustersReference.set(entry, ncl); }`
`80`	`80`
`81`	`81`	`template <class T>`
`82`		`- GPUd() static inline void getClusterReference(T& clinfo, int nCluster,`
	`82`	`+ GPUdi() static void getClusterReference(T& clinfo, int nCluster,`
`83`	`83`	`uint8_t& sectorIndex, uint8_t& rowIndex, uint32_t& clusterIndex, const ClusRef& ref)`
`84`	`84`	`{`
`85`	`85`	`// data for given tracks starts at clinfo[ ref.getFirstEntry() ],`
`@@ -95,14 +95,14 @@ class TrackTPC : public o2::track::TrackParCov`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`template <class T>`
`98`		`- GPUd() inline void getClusterReference(T& clinfo, int nCluster,`
	`98`	`+ GPUdi() void getClusterReference(T& clinfo, int nCluster,`
`99`	`99`	`uint8_t& sectorIndex, uint8_t& rowIndex, uint32_t& clusterIndex) const`
`100`	`100`	`{`
`101`	`101`	`getClusterReference<T>(clinfo, nCluster, sectorIndex, rowIndex, clusterIndex, mClustersReference);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`template <class T>`
`105`		`- GPUd() static inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
	`105`	`+ GPUdi() static const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
`106`	`106`	`const o2::tpc::ClusterNativeAccess& clusters, uint8_t& sectorIndex, uint8_t& rowIndex, const ClusRef& ref)`
`107`	`107`	`{`
`108`	`108`	`uint32_t clusterIndex;`
`@@ -111,14 +111,14 @@ class TrackTPC : public o2::track::TrackParCov`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`template <class T>`
`114`		`- GPUd() inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
	`114`	`+ GPUdi() const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
`115`	`115`	`const o2::tpc::ClusterNativeAccess& clusters, uint8_t& sectorIndex, uint8_t& rowIndex) const`
`116`	`116`	`{`
`117`	`117`	`return getCluster<T>(clinfo, nCluster, clusters, sectorIndex, rowIndex, mClustersReference);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`template <class T>`
`121`		`- GPUd() inline const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
	`121`	`+ GPUdi() const o2::tpc::ClusterNative& getCluster(T& clinfo, int nCluster,`
`122`	`122`	`const o2::tpc::ClusterNativeAccess& clusters) const`
`123`	`123`	`{`
`124`	`124`	`uint8_t sectorIndex, rowIndex;`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ GPUd() value_T BetheBlochSolidOpt(value_T bg)`
`190`	`190`
`191`	`191`	`//____________________________________________________`
`192`	`192`	`template <typename value_T>`
`193`		`-GPUd() value_T inline BetheBlochSolidDerivative(value_T dedx, value_T bg)`
	`193`	`+GPUdi() value_T BetheBlochSolidDerivative(value_T dedx, value_T bg)`
`194`	`194`	`{`
`195`	`195`	`//`
`196`	`196`	`// This is approximate derivative of the BB over betagamm, NO check for the consistency of the provided dedx and bg is done`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class GPUTPCTrackLinearisation`
`67`	`67`	`float mQPt; // QPt`
`68`	`68`	`};`
`69`	`69`
`70`		`-GPUd() MEM_CLASS_PRE2() inline GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(const MEM_LG2(GPUTPCTrackParam) & GPUrestrict() t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())`
	`70`	`+MEM_CLASS_PRE2() GPUdi() GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(const MEM_LG2(GPUTPCTrackParam) & GPUrestrict() t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())`
`71`	`71`	`{`
`72`	`72`	`if (mSinPhi > GPUCA_MAX_SIN_PHI) {`
`73`	`73`	`mSinPhi = GPUCA_MAX_SIN_PHI;`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ class GPUTPCTrackParam`
`157`	`157`	`int mNDF; // the Number of Degrees of Freedom`
`158`	`158`	`};`
`159`	`159`
`160`		`-GPUd() MEM_CLASS_PRE() inline void MEM_LG(GPUTPCTrackParam)::InitParam()`
	`160`	`+MEM_CLASS_PRE() GPUdi() void MEM_LG(GPUTPCTrackParam)::InitParam()`
`161`	`161`	`{`
`162`	`162`	`// Initialize Tracklet Parameters using default values`
`163`	`163`	`SetSinPhi(0);`