Accéder au contenu.
Menu Sympa

starpu-devel - Re: [Starpu-devel] [Starpu-commits] r8507 - in trunk/src: datawizard/interfaces drivers/opencl

Objet : Developers list for StarPU

Archives de la liste

Re: [Starpu-devel] [Starpu-commits] r8507 - in trunk/src: datawizard/interfaces drivers/opencl


Chronologique Discussions 
    < Chronologique >      < Discussions >
  • From: Nathalie Furmento <nathalie.furmento@labri.fr>
  • To: "starpu-devel@lists.gforge.inria.fr" <starpu-devel@lists.gforge.inria.fr>
  • Subject: Re: [Starpu-devel] [Starpu-commits] r8507 - in trunk/src: datawizard/interfaces drivers/opencl
  • Date: Wed, 30 Jan 2013 17:03:35 +0100
  • List-archive: <http://lists.gforge.inria.fr/pipermail/starpu-devel>
  • List-id: "Developers list. For discussion of new features, code changes, etc." <starpu-devel.lists.gforge.inria.fr>
Sylvain,

Why don't you modify directly the functions "starpu_opencl_copy_ram_to_opencl" and "starpu_opencl_copy_opencl_to_ram" ? Then, the modification will be valid for all interfaces and not only for the variable one?

Cheers,

Nathalie

On 30/01/2013 16:48, shenry@users.gforge.inria.fr wrote:
Author: shenry
Date: 2013-01-30 16:48:38 +0100 (Wed, 30 Jan 2013)
New Revision: 8507

Log:
OpenCL on CPU hack for SOCL

Modified:
trunk/src/datawizard/interfaces/variable_interface.c
trunk/src/drivers/opencl/driver_opencl.c
Modified: trunk/src/datawizard/interfaces/variable_interface.c
===================================================================
--- trunk/src/datawizard/interfaces/variable_interface.c 2013-01-30
15:39:31 UTC (rev 8506)
+++ trunk/src/datawizard/interfaces/variable_interface.c 2013-01-30
15:48:38 UTC (rev 8507)
@@ -326,36 +326,78 @@

#ifdef STARPU_USE_OPENCL
static int copy_ram_to_opencl_async(void *src_interface, unsigned src_node
STARPU_ATTRIBUTE_UNUSED, void *dst_interface,
- unsigned dst_node
STARPU_ATTRIBUTE_UNUSED, cl_event *event)
+ unsigned dst_node, cl_event *event)
{
struct starpu_variable_interface *src_variable = src_interface;
struct starpu_variable_interface *dst_variable = dst_interface;
- int err,ret;
+ int err,ret;

- err = starpu_opencl_copy_ram_to_opencl((void*)src_variable->ptr, src_node,
(cl_mem)dst_variable->ptr, dst_node, src_variable->elemsize,
- 0, event,&ret);
- if (STARPU_UNLIKELY(err))
- STARPU_OPENCL_REPORT_ERROR(err);
+ int devid = _starpu_memory_node_to_devid(dst_node);
+ cl_device_type dt = _starpu_opencl_get_device_type(devid);

- _STARPU_TRACE_DATA_COPY(src_node, dst_node, src_variable->elemsize);
+ if (starpu_cpu_worker_get_count() == 0&& dt == CL_DEVICE_TYPE_CPU) {
+ cl_mem dst = (cl_mem)dst_variable->ptr;
+ cl_context ctx;
+ starpu_opencl_get_context(devid,&ctx);;

+ err = clGetMemObjectInfo(dst, CL_MEM_CONTEXT, sizeof(ctx),&ctx, NULL);
+ if (STARPU_UNLIKELY(err))
+ STARPU_OPENCL_REPORT_ERROR(err);
+
+ clReleaseMemObject(dst);
+ dst_variable->ptr = (uintptr_t)clCreateBuffer(ctx, CL_MEM_READ_WRITE |
CL_MEM_USE_HOST_PTR, src_variable->elemsize, (void*)src_variable->ptr,&err);
+
+ if (event != NULL)
+ *event = NULL;
+ }
+ else {
+ assert(src_variable->ptr != NULL);
+
+ err = starpu_opencl_copy_ram_to_opencl((void*)src_variable->ptr,
src_node, (cl_mem)dst_variable->ptr, dst_node, src_variable->elemsize,
+ 0, event,&ret);
+
+ if (STARPU_UNLIKELY(err))
+ STARPU_OPENCL_REPORT_ERROR(err);
+
+ _STARPU_TRACE_DATA_COPY(src_node, dst_node, src_variable->elemsize);
+ }
+
return ret;
}

-static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node
STARPU_ATTRIBUTE_UNUSED, void *dst_interface, unsigned dst_node
STARPU_ATTRIBUTE_UNUSED, cl_event *event)
+static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node,
void *dst_interface, unsigned dst_node STARPU_ATTRIBUTE_UNUSED, cl_event
*event)
{
struct starpu_variable_interface *src_variable = src_interface;
struct starpu_variable_interface *dst_variable = dst_interface;
int err, ret;

- err = starpu_opencl_copy_opencl_to_ram((cl_mem)src_variable->ptr, src_node,
(void*)dst_variable->ptr, dst_node, src_variable->elemsize,
- 0, event,&ret);
+ int devid = _starpu_memory_node_to_devid(src_node);
+ cl_device_type dt = _starpu_opencl_get_device_type(devid);

- if (STARPU_UNLIKELY(err))
- STARPU_OPENCL_REPORT_ERROR(err);
+ if (starpu_cpu_worker_get_count() == 0&& dt == CL_DEVICE_TYPE_CPU) {
+ cl_mem dst = (cl_mem)src_variable->ptr;
+ void * ptr;

- _STARPU_TRACE_DATA_COPY(src_node, dst_node, src_variable->elemsize);
+ err = clGetMemObjectInfo(dst, CL_MEM_HOST_PTR, sizeof(ptr),&ptr, NULL);
+ if (STARPU_UNLIKELY(err))
+ STARPU_OPENCL_REPORT_ERROR(err);

+ dst_variable->ptr = (uintptr_t)ptr;
+
+ if (event != NULL)
+ *event = NULL;
+
+ }
+ else {
+ err = starpu_opencl_copy_opencl_to_ram((cl_mem)src_variable->ptr, src_node,
(void*)dst_variable->ptr, dst_node, src_variable->elemsize,
+ 0, event,&ret);
+
+ if (STARPU_UNLIKELY(err))
+ STARPU_OPENCL_REPORT_ERROR(err);
+
+ _STARPU_TRACE_DATA_COPY(src_node, dst_node, src_variable->elemsize);
+ }
+
return ret;
}


Modified: trunk/src/drivers/opencl/driver_opencl.c
===================================================================
--- trunk/src/drivers/opencl/driver_opencl.c 2013-01-30 15:39:31 UTC (rev
8506)
+++ trunk/src/drivers/opencl/driver_opencl.c 2013-01-30 15:48:38 UTC (rev
8507)
@@ -249,38 +249,38 @@

cl_int starpu_opencl_copy_ram_to_opencl(void *ptr, unsigned src_node
STARPU_ATTRIBUTE_UNUSED, cl_mem buffer, unsigned dst_node
STARPU_ATTRIBUTE_UNUSED, size_t size, size_t offset, cl_event *event, int
*ret)
{
- cl_int err;
- struct _starpu_worker *worker = _starpu_get_local_worker_key();
+ cl_int err;
+ struct _starpu_worker *worker = _starpu_get_local_worker_key();


- if (event)
- _STARPU_TRACE_START_DRIVER_COPY_ASYNC(src_node, dst_node);
+ if (event)
+ _STARPU_TRACE_START_DRIVER_COPY_ASYNC(src_node, dst_node);

- cl_event ev;
- err = clEnqueueWriteBuffer(transfer_queues[worker->devid], buffer, CL_FALSE,
offset, size, ptr, 0, NULL,&ev);
+ cl_event ev;
+ err = clEnqueueWriteBuffer(transfer_queues[worker->devid], buffer,
CL_FALSE, offset, size, ptr, 0, NULL,&ev);

- if (event)
- _STARPU_TRACE_END_DRIVER_COPY_ASYNC(src_node, dst_node);
+ if (event)
+ _STARPU_TRACE_END_DRIVER_COPY_ASYNC(src_node, dst_node);


- if (STARPU_LIKELY(err == CL_SUCCESS))
- {
- if (event == NULL)
- {
- /* We want a synchronous copy, let's synchronise the queue */
- clWaitForEvents(1,&ev);
- clReleaseEvent(ev);
- }
- else {
- *event = ev;
- }
+ if (STARPU_LIKELY(err == CL_SUCCESS))
+ {
+ if (event == NULL)
+ {
+ /* We want a synchronous copy, let's synchronise the queue */
+ clWaitForEvents(1,&ev);
+ clReleaseEvent(ev);
+ }
+ else {
+ *event = ev;
+ }

- if (ret)
- {
- *ret = (event == NULL) ? 0 : -EAGAIN;
- }
- }
- return err;
+ if (ret)
+ {
+ *ret = (event == NULL) ? 0 : -EAGAIN;
+ }
+ }
+ return err;
}

cl_int starpu_opencl_copy_opencl_to_ram(cl_mem buffer, unsigned src_node
STARPU_ATTRIBUTE_UNUSED, void *ptr, unsigned dst_node
STARPU_ATTRIBUTE_UNUSED, size_t size, size_t offset, cl_event *event, int
*ret)


_______________________________________________
Starpu-commits mailing list
Starpu-commits@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/starpu-commits




Archives gérées par MHonArc 2.6.19+.

Haut de le page