cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All fields are now packed to simplify communication

Browse Source
This commit is contained in:
jpekkila
2020-01-07 21:01:22 +02:00
parent 5d60791f13
commit 299ff5cb67
2 changed files with 102 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/core/kernels/packing.cu
View File

@@ -26,9 +26,9 @@
*/
#include "packing.cuh"
#include "common.cuh"
#include "src/core/errchk.h"
/*
__global__ void
kernel_pack_data(const AcReal* unpacked, const int3 unpacked_start, const int3 packed_dimensions,
AcReal* packed)
@@ -113,6 +113,93 @@ acKernelUnpackData(const cudaStream_t stream, const AcReal* packed, const int3 p
unpacked);
ERRCHK_CUDA_KERNEL_ALWAYS(); // TODO SET W/ DEBUG ONLY
return AC_SUCCESS;
}*/
__global__ void
kernel_pack_data(const VertexBufferArray vba, const int3 vba_start, PackedData packed)
{
const int i_packed = threadIdx.x + blockIdx.x * blockDim.x;
const int j_packed = threadIdx.y + blockIdx.y * blockDim.y;
const int k_packed = threadIdx.z + blockIdx.z * blockDim.z;
// If within the start-end range (this allows threadblock dims that are not
// divisible by end - start)
if (i_packed >= packed.dims.x || //
j_packed >= packed.dims.y || //
k_packed >= packed.dims.z) {
return;
}
const int i_unpacked = i_packed + vba_start.x;
const int j_unpacked = j_packed + vba_start.y;
const int k_unpacked = k_packed + vba_start.z;
const int unpacked_idx = DEVICE_VTXBUF_IDX(i_unpacked, j_unpacked, k_unpacked);
const int packed_idx = i_packed + //
j_packed * packed.dims.x + //
k_packed * packed.dims.x * packed.dims.y;
const size_t vtxbuf_offset = packed.dims.x * packed.dims.y * packed.dims.z;
for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i)
packed.data[packed_idx + i * vtxbuf_offset] = vba.in[i][unpacked_idx];
}
__global__ void
kernel_unpack_data(const PackedData packed, const int3 vba_start, VertexBufferArray vba)
{
const int i_packed = threadIdx.x + blockIdx.x * blockDim.x;
const int j_packed = threadIdx.y + blockIdx.y * blockDim.y;
const int k_packed = threadIdx.z + blockIdx.z * blockDim.z;
// If within the start-end range (this allows threadblock dims that are not
// divisible by end - start)
if (i_packed >= packed.dims.x || //
j_packed >= packed.dims.y || //
k_packed >= packed.dims.z) {
return;
}
const int i_unpacked = i_packed + vba_start.x;
const int j_unpacked = j_packed + vba_start.y;
const int k_unpacked = k_packed + vba_start.z;
const int unpacked_idx = DEVICE_VTXBUF_IDX(i_unpacked, j_unpacked, k_unpacked);
const int packed_idx = i_packed + //
j_packed * packed.dims.x + //
k_packed * packed.dims.x * packed.dims.y;
const size_t vtxbuf_offset = packed.dims.x * packed.dims.y * packed.dims.z;
for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i)
vba.in[i][unpacked_idx] = packed.data[packed_idx + i * vtxbuf_offset];
}
AcResult
acKernelPackData(const cudaStream_t stream, const VertexBufferArray vba, const int3 vba_start,
PackedData packed)
{
const dim3 tpb(32, 8, 1);
const dim3 bpg((unsigned int)ceil(packed.dims.x / (float)tpb.x),
(unsigned int)ceil(packed.dims.y / (float)tpb.y),
(unsigned int)ceil(packed.dims.z / (float)tpb.z));
kernel_pack_data<<<bpg, tpb, 0, stream>>>(vba, vba_start, packed);
ERRCHK_CUDA_KERNEL_ALWAYS(); // TODO SET W/ DEBUG ONLY
return AC_SUCCESS;
}
AcResult
acKernelUnpackData(const cudaStream_t stream, const PackedData packed, const int3 vba_start,
VertexBufferArray vba)
{
const dim3 tpb(32, 8, 1);
const dim3 bpg((unsigned int)ceil(packed.dims.x / (float)tpb.x),
(unsigned int)ceil(packed.dims.y / (float)tpb.y),
(unsigned int)ceil(packed.dims.z / (float)tpb.z));
kernel_unpack_data<<<bpg, tpb, 0, stream>>>(packed, vba_start, vba);
ERRCHK_CUDA_KERNEL_ALWAYS(); // TODO SET W/ DEBUG ONLY
return AC_SUCCESS;
}
AcResult

14
src/core/kernels/packing.cuh
View File

@@ -26,13 +26,27 @@
*/
#pragma once
#include "astaroth.h"
#include "common.cuh"
/*
AcResult acKernelPackData(const cudaStream_t stream, const AcReal* unpacked,
const int3 unpacked_start, const int3 packed_dimensions, AcReal* packed);
AcResult acKernelUnpackData(const cudaStream_t stream, const AcReal* packed,
const int3 packed_dimensions, const int3 unpacked_start,
AcReal* unpacked);
*/
typedef struct {
int3 dims;
AcReal* data;
} PackedData;
AcResult acKernelPackData(const cudaStream_t stream, const VertexBufferArray vba,
const int3 vba_start, PackedData packed);
AcResult acKernelUnpackData(const cudaStream_t stream, const PackedData packed,
const int3 vba_start, VertexBufferArray vba);
AcResult acKernelPackCorner(void);
AcResult acKernelUnpackCorner(void);