1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00

NVCC compiles happy. Start to develop strategy for writing generic

code for GPU kernels and CPU kernels.
This commit is contained in:
Peter Boyle 2019-06-04 20:46:35 +01:00
parent d92a17f359
commit 6e2e904a0e

View File

@ -35,6 +35,7 @@ NAMESPACE_BEGIN(Grid);
////////////////////////////////////////// //////////////////////////////////////////
// Trivial mapping of vectors on host // Trivial mapping of vectors on host
////////////////////////////////////////// //////////////////////////////////////////
template<class vobj> accelerator_inline template<class vobj> accelerator_inline
vobj coalescedRead(const vobj & __restrict__ vec) vobj coalescedRead(const vobj & __restrict__ vec)
{ {
@ -57,23 +58,23 @@ void coalescedWrite(vobj & __restrict__ vec,const vobj & __restrict__ extracted)
vstream(vec, extracted); vstream(vec, extracted);
} }
#else #else
accelerator_inline int SIMTlane(int Nsimd){ return threadIdx.x % Nsimd; } // CUDA specific
////////////////////////////////////////// //////////////////////////////////////////
// Extract and insert slices on the GPU // Extract and insert slices on the GPU
////////////////////////////////////////// //////////////////////////////////////////
template<class vobj> accelerator_inline template<class vobj> accelerator_inline
typename vobj::scalar_object coalescedRead(const vobj & __restrict__ vec) typename vobj::scalar_object coalescedRead(const vobj & __restrict__ vec)
{ {
typedef typename vobj::scalar_type scalar_type; const int Nsimd = vobj::Nsimd();
typedef typename vobj::vector_type vector_type; int lane = SIMTlane(Nsimd);
constexpr int Nsimd = sizeof(vector_type)/sizeof(scalar_type);
int lane = threadIdx.x % Nsimd;
return extractLane(lane,vec); return extractLane(lane,vec);
} }
template<class vobj> accelerator_inline template<class vobj> accelerator_inline
typename vobj::scalar_object coalescedReadPermute(const vobj & __restrict__ vec,int ptype,int doperm) typename vobj::scalar_object coalescedReadPermute(const vobj & __restrict__ vec,int ptype,int doperm)
{ {
constexpr int Nsimd = vobj::Nsimd(); const int Nsimd = vobj::Nsimd();
int lane = threadIdx.x % Nsimd; int lane = SIMTlane(Nsimd);
int mask = Nsimd >> (ptype + 1); int mask = Nsimd >> (ptype + 1);
int plane= doperm ? lane ^ mask : lane; int plane= doperm ? lane ^ mask : lane;
return extractLane(plane,vec); return extractLane(plane,vec);
@ -81,10 +82,8 @@ typename vobj::scalar_object coalescedReadPermute(const vobj & __restrict__ vec,
template<class vobj> accelerator_inline template<class vobj> accelerator_inline
void coalescedWrite(vobj & __restrict__ vec,const typename vobj::scalar_object & __restrict__ extracted) void coalescedWrite(vobj & __restrict__ vec,const typename vobj::scalar_object & __restrict__ extracted)
{ {
typedef typename vobj::scalar_type scalar_type; const int Nsimd = vobj::Nsimd();
typedef typename vobj::vector_type vector_type; int lane = SIMTlane(Nsimd);
constexpr int Nsimd = sizeof(vector_type)/sizeof(scalar_type);
int lane = threadIdx.x % Nsimd;
insertLane(lane,vec,extracted); insertLane(lane,vec,extracted);
} }
#endif #endif