From 1b7263f16b42852644ddf0649c88f9887c64946c Mon Sep 17 00:00:00 2001
From: Alycia Lisito <alycia.lisito@inria.fr>
Date: Tue, 4 Mar 2025 17:59:09 +0100
Subject: [PATCH] starpu/codelet: Add new task submit to
codelet_zipiv_allreduce.c
---
.../starpu/codelets/codelet_zipiv_allreduce.c | 89 +++++++++++++++++--
1 file changed, 84 insertions(+), 5 deletions(-)
diff --git a/runtime/starpu/codelets/codelet_zipiv_allreduce.c b/runtime/starpu/codelets/codelet_zipiv_allreduce.c
index a3d4d2144..eeb42f772 100644
--- a/runtime/starpu/codelets/codelet_zipiv_allreduce.c
+++ b/runtime/starpu/codelets/codelet_zipiv_allreduce.c
@@ -20,7 +20,7 @@
#include "runtime_codelet_z.h"
#if defined(CHAMELEON_USE_MPI)
-struct cl_redux_args_t {
+struct cl_redux_args_s {
int h;
int n;
};
@@ -65,7 +65,7 @@ zipiv_allreduce_cpu_func( cppi_interface_t *cppi_me,
static void
cl_zipiv_allreduce_cpu_func( void *descr[], void *cl_arg )
{
- struct cl_redux_args_t *clargs = (struct cl_redux_args_t *) cl_arg;
+ struct cl_redux_args_s *clargs = (struct cl_redux_args_s *) cl_arg;
cppi_interface_t *cppi_me = ((cppi_interface_t *) descr[0]);
cppi_interface_t *cppi_src = ((cppi_interface_t *) descr[1]);
zipiv_allreduce_cpu_func( cppi_me, cppi_src, clargs->h, clargs->n );
@@ -73,6 +73,8 @@ cl_zipiv_allreduce_cpu_func( void *descr[], void *cl_arg )
CODELETS_CPU( zipiv_allreduce, cl_zipiv_allreduce_cpu_func )
+#if defined(CHAMELEON_STARPU_USE_INSERT) /* defined(CHAMELEON_STARPU_USE_INSERT) */
+
static void
INSERT_TASK_zipiv_allreduce_send( const RUNTIME_option_t *options,
CHAM_ipiv_t *ipiv,
@@ -98,14 +100,14 @@ INSERT_TASK_zipiv_allreduce_recv( const RUNTIME_option_t *options,
int h,
int n )
{
- struct cl_redux_args_t *clargs;
- clargs = malloc( sizeof( struct cl_redux_args_t ) );
+ struct cl_redux_args_s *clargs;
+ clargs = malloc( sizeof( struct cl_redux_args_s ) );
clargs->h = h;
clargs->n = n;
rt_starpu_insert_task(
&cl_zipiv_allreduce,
- STARPU_CL_ARGS, clargs, sizeof(struct cl_redux_args_t),
+ STARPU_CL_ARGS, clargs, sizeof(struct cl_redux_args_s),
STARPU_RW, RUNTIME_pivot_getaddr( ipiv, me, k, h ),
STARPU_R, RUNTIME_pivot_getaddr( ipiv, src, k, h ),
STARPU_EXECUTE_ON_NODE, me,
@@ -115,6 +117,83 @@ INSERT_TASK_zipiv_allreduce_recv( const RUNTIME_option_t *options,
starpu_mpi_cache_flush( options->sequence->comm, RUNTIME_pivot_getaddr( ipiv, src, k, h ) );
}
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
+
+static void
+INSERT_TASK_zipiv_allreduce_send( const RUNTIME_option_t *options,
+ CHAM_ipiv_t *ipiv,
+ int me,
+ int dst,
+ int k,
+ int h )
+{
+ INSERT_TASK_COMMON_PARAMETERS_CLNULL( zipiv_allreduce_send, 1 )
+
+ starpu_cham_exchange_init_params( options, ¶ms, dst );
+ starpu_cham_exchange_handle_before_execution( options, ¶ms, &nbdata, descrs,
+ RUNTIME_pivot_getaddr( ipiv, me, k, h ),
+ STARPU_R );
+ starpu_cham_task_exchange_data_after_execution( options, params, nbdata, descrs );
+ (void)cl;
+ (void)cl_name;
+}
+
+static void
+INSERT_TASK_zipiv_allreduce_recv( const RUNTIME_option_t *options,
+ CHAM_ipiv_t *ipiv,
+ int me,
+ int src,
+ int k,
+ int h,
+ int n )
+{
+ int ret;
+ struct starpu_task *task;
+ INSERT_TASK_COMMON_PARAMETERS_EXTENDED( zipiv_allreduce_recv, zipiv_allreduce, redux, 2 )
+
+ starpu_cham_exchange_init_params( options, ¶ms, me );
+ starpu_cham_exchange_handle_before_execution( options, ¶ms, &nbdata, descrs,
+ RUNTIME_pivot_getaddr( ipiv, me, k, h ),
+ STARPU_RW );
+ starpu_cham_exchange_handle_before_execution( options, ¶ms, &nbdata, descrs,
+ RUNTIME_pivot_getaddr( ipiv, src, k, h ),
+ STARPU_R );
+
+ task = starpu_task_create();
+ task->cl = cl;
+
+ /* Set codelet parameters */
+ clargs = malloc( sizeof( struct cl_redux_args_s ) );
+ clargs->h = h;
+ clargs->n = n;
+
+ task->cl_arg = clargs;
+ task->cl_arg_size = sizeof( struct cl_redux_args_s );
+ task->cl_arg_free = 1;
+
+ /* Set common parameters */
+ starpu_cham_task_set_options( options, task, nbdata, descrs, NULL );
+
+ /* Flops */
+ task->flops = 0.;
+
+ /* Refine name */
+ task->name = cl_name;
+
+ ret = starpu_task_submit( task );
+ if ( ret == -ENODEV ) {
+ task->destroy = 0;
+ starpu_task_destroy( task );
+ chameleon_error( "INSERT_TASK_zipiv_allreduce", "Failed to submit the task to StarPU" );
+ return;
+ }
+
+ starpu_cham_task_exchange_data_after_execution( options, params, nbdata, descrs );
+ starpu_mpi_cache_flush( options->sequence->comm, RUNTIME_pivot_getaddr( ipiv, src, k, h ) );
+}
+
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
+
static void
zipiv_allreduce_chameleon_starpu_task( const RUNTIME_option_t *options,
CHAM_desc_t *A,
--
GitLab