Skip to content

Commit a0c6494

Browse files
dberzanodavidrohr
dberzano
authored and
davidrohr
committed
Remove deprecated register keyword (#9)
1 parent 775a570 commit a0c6494

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎GPU/TPCCAGPUTracking/SliceTracker/AliHLTTPCCAHitArea.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AliHLTTPCCAHitArea
3333
* look up the next hit in the requested area.
3434
* Sets h to the coordinates and returns the index for the hit data
3535
*/
36-
MEM_TEMPLATE() GPUd() int GetNext( register GPUconstant() const MEM_CONSTANT(AliHLTTPCCATracker) &tracker, const MEM_TYPE( AliHLTTPCCARow) &row,
36+
MEM_TEMPLATE() GPUd() int GetNext(GPUconstant() const MEM_CONSTANT(AliHLTTPCCATracker) &tracker, const MEM_TYPE( AliHLTTPCCARow) &row,
3737
GPUglobalref() const MEM_GLOBAL(AliHLTTPCCASliceData) &slice, AliHLTTPCCAHit *h );
3838

3939
float Y() const { return fY; }

‎GPU/TPCCAGPUTracking/SliceTracker/AliHLTTPCCAMath.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class AliHLTTPCCAMath
4545
GPUd() static bool Finite( float x );
4646

4747
GPUhd() static float Log(float x);
48-
GPUd() static int AtomicExch( register GPUglobalref() int *addr, int val );
49-
GPUd() static int AtomicAdd (register GPUglobalref() int *addr, int val );
50-
GPUd() static int AtomicMax (register GPUglobalref() int *addr, int val );
51-
GPUd() static int AtomicMin (register GPUglobalref() int *addr, int val );
52-
GPUd() static int AtomicExchShared(register GPUsharedref() int *addr, int val );
53-
GPUd() static int AtomicAddShared (register GPUsharedref() int *addr, int val );
54-
GPUd() static int AtomicMaxShared (register GPUsharedref() int *addr, int val );
55-
GPUd() static int AtomicMinShared (register GPUsharedref() int *addr, int val );
48+
GPUd() static int AtomicExch( GPUglobalref() int *addr, int val );
49+
GPUd() static int AtomicAdd ( GPUglobalref() int *addr, int val );
50+
GPUd() static int AtomicMax ( GPUglobalref() int *addr, int val );
51+
GPUd() static int AtomicMin ( GPUglobalref() int *addr, int val );
52+
GPUd() static int AtomicExchShared( GPUsharedref() int *addr, int val );
53+
GPUd() static int AtomicAddShared ( GPUsharedref() int *addr, int val );
54+
GPUd() static int AtomicMaxShared ( GPUsharedref() int *addr, int val );
55+
GPUd() static int AtomicMinShared ( GPUsharedref() int *addr, int val );
5656
GPUd() static int Mul24( int a, int b );
5757
GPUd() static float FMulRZ( float a, float b );
5858
};
@@ -182,18 +182,18 @@ GPUhd() inline float AliHLTTPCCAMath::Log(float x)
182182
}
183183

184184
#if defined(__OPENCL__)
185-
GPUd() inline int AliHLTTPCCAMath::AtomicExchShared(register GPUsharedref() int *addr, int val ) {return ::atomic_xchg( (volatile __local int*) addr, val );}
186-
GPUd() inline int AliHLTTPCCAMath::AtomicAddShared (register GPUsharedref() int *addr, int val ) {return ::atomic_add( (volatile __local int*) addr, val );}
187-
GPUd() inline int AliHLTTPCCAMath::AtomicMaxShared (register GPUsharedref() int *addr, int val ) {return ::atomic_max( (volatile __local int*) addr, val );}
188-
GPUd() inline int AliHLTTPCCAMath::AtomicMinShared (register GPUsharedref() int *addr, int val ) {return ::atomic_min( (volatile __local int*) addr, val );}
185+
GPUd() inline int AliHLTTPCCAMath::AtomicExchShared( GPUsharedref() int *addr, int val ) {return ::atomic_xchg( (volatile __local int*) addr, val );}
186+
GPUd() inline int AliHLTTPCCAMath::AtomicAddShared ( GPUsharedref() int *addr, int val ) {return ::atomic_add( (volatile __local int*) addr, val );}
187+
GPUd() inline int AliHLTTPCCAMath::AtomicMaxShared ( GPUsharedref() int *addr, int val ) {return ::atomic_max( (volatile __local int*) addr, val );}
188+
GPUd() inline int AliHLTTPCCAMath::AtomicMinShared ( GPUsharedref() int *addr, int val ) {return ::atomic_min( (volatile __local int*) addr, val );}
189189
#else
190190
GPUd() inline int AliHLTTPCCAMath::AtomicExchShared( int *addr, int val ) {return(AliHLTTPCCAMath::AtomicExch(addr, val));}
191191
GPUd() inline int AliHLTTPCCAMath::AtomicAddShared ( int *addr, int val ) {return(AliHLTTPCCAMath::AtomicAdd(addr, val));}
192192
GPUd() inline int AliHLTTPCCAMath::AtomicMaxShared ( int *addr, int val ) {return(AliHLTTPCCAMath::AtomicMax(addr, val));}
193193
GPUd() inline int AliHLTTPCCAMath::AtomicMinShared ( int *addr, int val ) {return(AliHLTTPCCAMath::AtomicMin(addr, val));}
194194
#endif
195195

196-
GPUd() inline int AliHLTTPCCAMath::AtomicExch(register GPUglobalref() int *addr, int val )
196+
GPUd() inline int AliHLTTPCCAMath::AtomicExch( GPUglobalref() int *addr, int val )
197197
{
198198
#if defined(HLTCA_GPUCODE) && defined(__OPENCL__)
199199
return ::atomic_xchg( (volatile __global int*) addr, val );
@@ -206,7 +206,7 @@ GPUd() inline int AliHLTTPCCAMath::AtomicExch(register GPUglobalref() int *addr
206206
#endif //HLTCA_GPUCODE
207207
}
208208

209-
GPUd() inline int AliHLTTPCCAMath::AtomicAdd (register GPUglobalref() int *addr, int val )
209+
GPUd() inline int AliHLTTPCCAMath::AtomicAdd ( GPUglobalref() int *addr, int val )
210210
{
211211
#if defined(HLTCA_GPUCODE) && defined(__OPENCL__)
212212
return ::atomic_add( (volatile __global int*) addr, val );
@@ -219,7 +219,7 @@ GPUd() inline int AliHLTTPCCAMath::AtomicAdd (register GPUglobalref() int *addr
219219
#endif //HLTCA_GPUCODE
220220
}
221221

222-
GPUd() inline int AliHLTTPCCAMath::AtomicMax (register GPUglobalref() int *addr, int val )
222+
GPUd() inline int AliHLTTPCCAMath::AtomicMax ( GPUglobalref() int *addr, int val )
223223
{
224224
#if defined(HLTCA_GPUCODE) && defined(__OPENCL__)
225225
return ::atomic_max( (volatile __global int*) addr, val );
@@ -232,7 +232,7 @@ GPUd() inline int AliHLTTPCCAMath::AtomicMax (register GPUglobalref() int *addr
232232
#endif //HLTCA_GPUCODE
233233
}
234234

235-
GPUd() inline int AliHLTTPCCAMath::AtomicMin (register GPUglobalref() int *addr, int val )
235+
GPUd() inline int AliHLTTPCCAMath::AtomicMin ( GPUglobalref() int *addr, int val )
236236
{
237237
#if defined(HLTCA_GPUCODE) && defined(__OPENCL__)
238238
return ::atomic_min( (volatile __global int*) addr, val );

‎GPU/TPCCAGPUTracking/SliceTracker/AliHLTTPCCATrackletConstructor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class AliHLTTPCCATrackletConstructor
8181
#endif //HLTCA_GPU_TRACKLET_CONSTRUCTOR_DO_PROFILE
8282
};
8383

84-
MEM_CLASS_PRE2() GPUd() static void InitTracklet( register MEM_LG2(AliHLTTPCCATrackParam) &tParam );
84+
MEM_CLASS_PRE2() GPUd() static void InitTracklet( MEM_LG2(AliHLTTPCCATrackParam) &tParam );
8585

8686
MEM_CLASS_PRE2() GPUd() static void UpdateTracklet
8787
( int nBlocks, int nThreads, int iBlock, int iThread,
@@ -91,7 +91,7 @@ class AliHLTTPCCATrackletConstructor
9191
( int nBlocks, int nThreads, int iBlock, int iThread,
9292
MEM_LOCAL(GPUsharedref() AliHLTTPCCASharedMemory) &s, AliHLTTPCCAThreadMemory &r, GPUconstant() MEM_LG2(AliHLTTPCCATracker) &tracker, MEM_LG3(AliHLTTPCCATrackParam) &tParam );
9393

94-
MEM_CLASS_PRE2() GPUd() static bool CheckCov(register MEM_LG2(AliHLTTPCCATrackParam) &tParam);
94+
MEM_CLASS_PRE2() GPUd() static bool CheckCov( MEM_LG2(AliHLTTPCCATrackParam) &tParam );
9595

9696
GPUd() static void DoTracklet(GPUconstant() MEM_CONSTANT(AliHLTTPCCATracker)& tracker, GPUsharedref() AliHLTTPCCATrackletConstructor::MEM_LOCAL(AliHLTTPCCASharedMemory)& sMem, AliHLTTPCCAThreadMemory& rMem);
9797

0 commit comments

Comments
 (0)