Commit 487d31b2 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

wip

parent d7cae178
...@@ -152,9 +152,6 @@ public: ...@@ -152,9 +152,6 @@ public:
} }
static void transferInoutPassCallback(void *buffers[], void *cl_arg){ static void transferInoutPassCallback(void *buffers[], void *cl_arg){
FAssertLF(STARPU_VARIABLE_GET_PTR(buffers[0]) == STARPU_VARIABLE_GET_PTR(buffers[2]));
FAssertLF(STARPU_VARIABLE_GET_PTR(buffers[1]) == STARPU_VARIABLE_GET_PTR(buffers[3]));
cl_mem currentCellsPtr = ((cl_mem)STARPU_VARIABLE_GET_PTR(buffers[0])); cl_mem currentCellsPtr = ((cl_mem)STARPU_VARIABLE_GET_PTR(buffers[0]));
size_t currentCellsSize = STARPU_VARIABLE_GET_ELEMSIZE(buffers[0]); size_t currentCellsSize = STARPU_VARIABLE_GET_ELEMSIZE(buffers[0]);
cl_mem externalCellsPtr = ((cl_mem)STARPU_VARIABLE_GET_PTR(buffers[1])); cl_mem externalCellsPtr = ((cl_mem)STARPU_VARIABLE_GET_PTR(buffers[1]));
......
...@@ -62,7 +62,7 @@ __kernel void FOpenCL__upwardPassPerform(__global unsigned char* currentCellsPtr ...@@ -62,7 +62,7 @@ __kernel void FOpenCL__upwardPassPerform(__global unsigned char* currentCellsPtr
__kernel void FOpenCL__transferInoutPassPerformMpi(__global unsigned char* currentCellsPtr, size_t currentCellsSize, __kernel void FOpenCL__transferInoutPassPerformMpi(__global unsigned char* currentCellsPtr, size_t currentCellsSize,
__global unsigned char* externalCellsPtr, size_t externalCellsSize, __global unsigned char* externalCellsPtr, size_t externalCellsSize,
int idxLevel, const __global OutOfBlockInteraction* outsideInteractions, int idxLevel, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, __global void* userkernel){ size_t nbOutsideInteractions, __global void* userkernel){
} }
...@@ -77,7 +77,7 @@ __kernel void FOpenCL__transferInPassPerform(__global unsigned char* currentCel ...@@ -77,7 +77,7 @@ __kernel void FOpenCL__transferInPassPerform(__global unsigned char* currentCel
__kernel void FOpenCL__transferInoutPassPerform(__global unsigned char* currentCellsPtr, size_t currentCellsSize, __kernel void FOpenCL__transferInoutPassPerform(__global unsigned char* currentCellsPtr, size_t currentCellsSize,
__global unsigned char* externalCellsPtr, size_t externalCellsSize, __global unsigned char* externalCellsPtr, size_t externalCellsSize,
int idxLevel, const __global OutOfBlockInteraction* outsideInteractions, int idxLevel, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, __global void* userkernel){ size_t nbOutsideInteractions, __global void* userkernel){
} }
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
...@@ -98,7 +98,7 @@ __kernel void FOpenCL__downardPassPerform(__global unsigned char* currentCellsPt ...@@ -98,7 +98,7 @@ __kernel void FOpenCL__downardPassPerform(__global unsigned char* currentCellsPt
__kernel void FOpenCL__directInoutPassPerformMpi(__global unsigned char* containersPtr, size_t containersSize, __kernel void FOpenCL__directInoutPassPerformMpi(__global unsigned char* containersPtr, size_t containersSize,
__global unsigned char* externalContainersPtr, size_t externalContainersSize, __global unsigned char* externalContainersPtr, size_t externalContainersSize,
const __global OutOfBlockInteraction* outsideInteractions, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, const int treeHeight, __global void* userkernel){ size_t nbOutsideInteractions, const int treeHeight, __global void* userkernel){
} }
...@@ -113,7 +113,7 @@ __kernel void FOpenCL__directInPassPerform(__global unsigned char* containersPtr ...@@ -113,7 +113,7 @@ __kernel void FOpenCL__directInPassPerform(__global unsigned char* containersPtr
__kernel void FOpenCL__directInoutPassPerform(__global unsigned char* containersPtr, size_t containersSize, __kernel void FOpenCL__directInoutPassPerform(__global unsigned char* containersPtr, size_t containersSize,
__global unsigned char* externalContainersPtr, size_t externalContainersSize, __global unsigned char* externalContainersPtr, size_t externalContainersSize,
const __global OutOfBlockInteraction* outsideInteractions, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, const int treeHeight, __global void* userkernel){ size_t nbOutsideInteractions, const int treeHeight, __global void* userkernel){
} }
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
......
...@@ -138,6 +138,7 @@ public: ...@@ -138,6 +138,7 @@ public:
void upwardPassPerform(cl_mem currentCellsPtr, size_t currentCellsSize, cl_mem subCellGroupsPtr[9], size_t subCellGroupsSize[9], int nbSubCellGroups, int idxLevel){ void upwardPassPerform(cl_mem currentCellsPtr, size_t currentCellsSize, cl_mem subCellGroupsPtr[9], size_t subCellGroupsSize[9], int nbSubCellGroups, int idxLevel){
return;
Uptr9 ptrs; Uptr9 ptrs;
memcpy(ptrs.ptrs, subCellGroupsPtr, sizeof(cl_mem)*9); memcpy(ptrs.ptrs, subCellGroupsPtr, sizeof(cl_mem)*9);
size_t9 sizes; size_t9 sizes;
......
...@@ -522,7 +522,7 @@ __kernel void FOpenCL__upwardPassPerform(__global unsigned char* currentCellsPtr ...@@ -522,7 +522,7 @@ __kernel void FOpenCL__upwardPassPerform(__global unsigned char* currentCellsPtr
__kernel void FOpenCL__transferInoutPassPerformMpi(__global unsigned char* currentCellsPtr, size_t currentCellsSize, __kernel void FOpenCL__transferInoutPassPerformMpi(__global unsigned char* currentCellsPtr, size_t currentCellsSize,
__global unsigned char* externalCellsPtr, size_t externalCellsSize, __global unsigned char* externalCellsPtr, size_t externalCellsSize,
int idxLevel, const __global OutOfBlockInteraction* outsideInteractions, int idxLevel, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, __global void* userkernel){ size_t nbOutsideInteractions, __global void* userkernel){
struct FOpenCLGroupOfCells currentCells = BuildFOpenCLGroupOfCells(currentCellsPtr, currentCellsSize); struct FOpenCLGroupOfCells currentCells = BuildFOpenCLGroupOfCells(currentCellsPtr, currentCellsSize);
struct FOpenCLGroupOfCells cellsOther = BuildFOpenCLGroupOfCells(externalCellsPtr, externalCellsSize); struct FOpenCLGroupOfCells cellsOther = BuildFOpenCLGroupOfCells(externalCellsPtr, externalCellsSize);
...@@ -592,7 +592,7 @@ __kernel void FOpenCL__transferInPassPerform(__global unsigned char* currentCel ...@@ -592,7 +592,7 @@ __kernel void FOpenCL__transferInPassPerform(__global unsigned char* currentCel
__kernel void FOpenCL__transferInoutPassPerform(__global unsigned char* currentCellsPtr, size_t currentCellsSize, __kernel void FOpenCL__transferInoutPassPerform(__global unsigned char* currentCellsPtr, size_t currentCellsSize,
__global unsigned char* externalCellsPtr, size_t externalCellsSize, __global unsigned char* externalCellsPtr, size_t externalCellsSize,
int idxLevel, const __global OutOfBlockInteraction* outsideInteractions, int idxLevel, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, __global void* userkernel){ size_t nbOutsideInteractions, __global void* userkernel){
struct FOpenCLGroupOfCells currentCells = BuildFOpenCLGroupOfCells(currentCellsPtr, currentCellsSize); struct FOpenCLGroupOfCells currentCells = BuildFOpenCLGroupOfCells(currentCellsPtr, currentCellsSize);
struct FOpenCLGroupOfCells cellsOther = BuildFOpenCLGroupOfCells(externalCellsPtr, externalCellsSize); struct FOpenCLGroupOfCells cellsOther = BuildFOpenCLGroupOfCells(externalCellsPtr, externalCellsSize);
...@@ -673,7 +673,7 @@ __kernel void FOpenCL__downardPassPerform(__global unsigned char* currentCellsPt ...@@ -673,7 +673,7 @@ __kernel void FOpenCL__downardPassPerform(__global unsigned char* currentCellsPt
__kernel void FOpenCL__directInoutPassPerformMpi(__global unsigned char* containersPtr, size_t containersSize, __kernel void FOpenCL__directInoutPassPerformMpi(__global unsigned char* containersPtr, size_t containersSize,
__global unsigned char* externalContainersPtr, size_t externalContainersSize, __global unsigned char* externalContainersPtr, size_t externalContainersSize,
const __global OutOfBlockInteraction* outsideInteractions, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, const int treeHeight, __global void* userkernel){ size_t nbOutsideInteractions, const int treeHeight, __global void* userkernel){
struct FOpenCLGroupOfParticles containers = BuildFOpenCLGroupOfParticles(containersPtr, containersSize); struct FOpenCLGroupOfParticles containers = BuildFOpenCLGroupOfParticles(containersPtr, containersSize);
struct FOpenCLGroupOfParticles containersOther = BuildFOpenCLGroupOfParticles(externalContainersPtr, externalContainersSize); struct FOpenCLGroupOfParticles containersOther = BuildFOpenCLGroupOfParticles(externalContainersPtr, externalContainersSize);
...@@ -734,7 +734,7 @@ __kernel void FOpenCL__directInPassPerform(__global unsigned char* containersPtr ...@@ -734,7 +734,7 @@ __kernel void FOpenCL__directInPassPerform(__global unsigned char* containersPtr
__kernel void FOpenCL__directInoutPassPerform(__global unsigned char* containersPtr, size_t containersSize, __kernel void FOpenCL__directInoutPassPerform(__global unsigned char* containersPtr, size_t containersSize,
__global unsigned char* externalContainersPtr, size_t externalContainersSize, __global unsigned char* externalContainersPtr, size_t externalContainersSize,
const __global OutOfBlockInteraction* outsideInteractions, const __global OutOfBlockInteraction* outsideInteractions,
int nbOutsideInteractions, const int treeHeight, __global void* userkernel){ size_t nbOutsideInteractions, const int treeHeight, __global void* userkernel){
struct FOpenCLGroupOfParticles containers = BuildFOpenCLGroupOfParticles(containersPtr, containersSize); struct FOpenCLGroupOfParticles containers = BuildFOpenCLGroupOfParticles(containersPtr, containersSize);
struct FOpenCLGroupOfParticles containersOther = BuildFOpenCLGroupOfParticles(externalContainersPtr, externalContainersSize); struct FOpenCLGroupOfParticles containersOther = BuildFOpenCLGroupOfParticles(externalContainersPtr, externalContainersSize);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment