From 3fd5e79f06ca4199849370fb039ee6bea2de2021 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Thu, 15 Dec 2016 15:09:21 +0100 Subject: [PATCH] Replace insert_task_generic_fptr by dague_insert_task --- runtime/parsec/codelets/codelet_zasum.c | 2 +- runtime/parsec/codelets/codelet_zaxpy.c | 2 +- runtime/parsec/codelets/codelet_zbuild.c | 22 +++++++++---------- runtime/parsec/codelets/codelet_zgeadd.c | 2 +- runtime/parsec/codelets/codelet_zgelqt.c | 2 +- runtime/parsec/codelets/codelet_zgemm.c | 2 +- runtime/parsec/codelets/codelet_zgeqrt.c | 2 +- runtime/parsec/codelets/codelet_zgessm.c | 2 +- runtime/parsec/codelets/codelet_zgessq.c | 2 +- runtime/parsec/codelets/codelet_zgetrf.c | 2 +- .../parsec/codelets/codelet_zgetrf_incpiv.c | 2 +- .../parsec/codelets/codelet_zgetrf_nopiv.c | 2 +- runtime/parsec/codelets/codelet_zhe2ge.c | 8 +++---- runtime/parsec/codelets/codelet_zhemm.c | 2 +- runtime/parsec/codelets/codelet_zher2k.c | 2 +- runtime/parsec/codelets/codelet_zherfb.c | 12 +++++----- runtime/parsec/codelets/codelet_zherk.c | 2 +- runtime/parsec/codelets/codelet_zhessq.c | 2 +- runtime/parsec/codelets/codelet_zlacpy.c | 2 +- runtime/parsec/codelets/codelet_zlag2c.c | 4 ++-- runtime/parsec/codelets/codelet_zlange.c | 4 ++-- runtime/parsec/codelets/codelet_zlanhe.c | 2 +- runtime/parsec/codelets/codelet_zlansy.c | 2 +- runtime/parsec/codelets/codelet_zlantr.c | 2 +- runtime/parsec/codelets/codelet_zlascal.c | 6 ++--- runtime/parsec/codelets/codelet_zlaset.c | 2 +- runtime/parsec/codelets/codelet_zlaset2.c | 2 +- runtime/parsec/codelets/codelet_zlatro.c | 9 ++++---- runtime/parsec/codelets/codelet_zlauum.c | 2 +- runtime/parsec/codelets/codelet_zpamm.c | 2 +- runtime/parsec/codelets/codelet_zplghe.c | 2 +- runtime/parsec/codelets/codelet_zplgsy.c | 2 +- runtime/parsec/codelets/codelet_zplrnt.c | 2 +- runtime/parsec/codelets/codelet_zplssq.c | 4 ++-- runtime/parsec/codelets/codelet_zpotrf.c | 2 +- runtime/parsec/codelets/codelet_zssssm.c | 2 +- runtime/parsec/codelets/codelet_zsymm.c | 2 +- runtime/parsec/codelets/codelet_zsyr2k.c | 2 +- runtime/parsec/codelets/codelet_zsyrk.c | 2 +- runtime/parsec/codelets/codelet_zsyssq.c | 2 +- .../parsec/codelets/codelet_zsytrf_nopiv.c | 2 +- runtime/parsec/codelets/codelet_ztile_zero.c | 2 +- runtime/parsec/codelets/codelet_ztradd.c | 2 +- runtime/parsec/codelets/codelet_ztrasm.c | 2 +- runtime/parsec/codelets/codelet_ztrmm.c | 2 +- runtime/parsec/codelets/codelet_ztrsm.c | 2 +- runtime/parsec/codelets/codelet_ztrssq.c | 2 +- runtime/parsec/codelets/codelet_ztrtri.c | 2 +- runtime/parsec/codelets/codelet_ztslqt.c | 2 +- runtime/parsec/codelets/codelet_ztsmlq.c | 2 +- .../parsec/codelets/codelet_ztsmlq_hetra1.c | 15 +++++++------ runtime/parsec/codelets/codelet_ztsmqr.c | 2 +- .../parsec/codelets/codelet_ztsmqr_hetra1.c | 15 +++++++------ runtime/parsec/codelets/codelet_ztsqrt.c | 2 +- runtime/parsec/codelets/codelet_ztstrf.c | 2 +- runtime/parsec/codelets/codelet_zttlqt.c | 2 +- runtime/parsec/codelets/codelet_zttmlq.c | 2 +- runtime/parsec/codelets/codelet_zttmqr.c | 2 +- runtime/parsec/codelets/codelet_zttqrt.c | 2 +- runtime/parsec/codelets/codelet_zunmlq.c | 2 +- runtime/parsec/codelets/codelet_zunmqr.c | 2 +- 61 files changed, 101 insertions(+), 100 deletions(-) diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c index 848b9bcd1..86e48d822 100644 --- a/runtime/parsec/codelets/codelet_zasum.c +++ b/runtime/parsec/codelets/codelet_zasum.c @@ -56,7 +56,7 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_dzasum_parsec, "zasum", + dague_insert_task(DAGUE_dtd_handle, CORE_dzasum_parsec, "zasum", sizeof(MORSE_enum), &storev, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &M, VALUE, diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c index 96f804858..b54ad014d 100644 --- a/runtime/parsec/codelets/codelet_zaxpy.c +++ b/runtime/parsec/codelets/codelet_zaxpy.c @@ -54,7 +54,7 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zaxpy_parsec, "axpy", + dague_insert_task(DAGUE_dtd_handle, CORE_zaxpy_parsec, "axpy", sizeof(int), &M, VALUE, sizeof(MORSE_Complex64_t), alpha, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c index d058dcafc..806433bd9 100644 --- a/runtime/parsec/codelets/codelet_zbuild.c +++ b/runtime/parsec/codelets/codelet_zbuild.c @@ -24,14 +24,15 @@ **/ #include "runtime/parsec/include/morse_parsec.h" -static int -CORE_zbuild_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) +static inline int +CORE_zbuild_parsec(dague_execution_unit_t *context, + dague_execution_context_t *this_task) { MORSE_Complex64_t *A; - int *lda; - void *user_data; - void (*user_build_callback)(int row_min, int row_max, int col_min, int col_max, void *buffer, int ld, void *user_data) ; - int row_min, row_max, col_min, col_max; + int lda; + void *user_data; + void (*user_build_callback)(int row_min, int row_max, int col_min, int col_max, void *buffer, int ld, void *user_data) ; + int row_min, row_max, col_min, col_max; dague_dtd_unpack_args(this_task, UNPACK_VALUE, &row_min, @@ -41,11 +42,10 @@ CORE_zbuild_parsec(dague_execution_unit_t *context, dague_execution_context_t *t UNPACK_DATA, &A, UNPACK_VALUE, &lda, UNPACK_VALUE, &user_data, - UNPACK_VALUE, &user_build_callback - ); + UNPACK_VALUE, &user_build_callback ); - user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data); + user_build_callback(row_min, row_max, col_min, col_max, A, lda, user_data); return 0; } @@ -61,7 +61,7 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options, col_min = An*A->nb ; col_max = An == A->nt-1 ? A->n-1 : col_min+A->nb-1 ; - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zbuild_parsec, "zbuild", + dague_insert_task(DAGUE_dtd_handle, CORE_zbuild_parsec, "zbuild", sizeof(int), &row_min, VALUE, sizeof(int), &row_max, VALUE, sizeof(int), &col_min, VALUE, @@ -69,6 +69,6 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | REGION_FULL, sizeof(int), &lda, VALUE, sizeof(void*), &user_data, VALUE, - sizeof(void*), &user_build_callback, VALUE + sizeof(void*), &user_build_callback, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c index 440898f4f..962eb5ef8 100644 --- a/runtime/parsec/codelets/codelet_zgeadd.c +++ b/runtime/parsec/codelets/codelet_zgeadd.c @@ -118,7 +118,7 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_zgeadd_parsec, "geadd", sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c index 6c71adc85..62787e093 100644 --- a/runtime/parsec/codelets/codelet_zgelqt.c +++ b/runtime/parsec/codelets/codelet_zgelqt.c @@ -121,7 +121,7 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgelqt_parsec, "gelqt", + dague_insert_task(DAGUE_dtd_handle, CORE_zgelqt_parsec, "gelqt", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index 18f07d9ee..ae5fe1745 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -78,7 +78,7 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgemm_parsec, "Gemm", + dague_insert_task(DAGUE_dtd_handle, CORE_zgemm_parsec, "Gemm", sizeof(MORSE_enum), &transA, VALUE, sizeof(MORSE_enum), &transB, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c index 7a5a6724a..347d89730 100644 --- a/runtime/parsec/codelets/codelet_zgeqrt.c +++ b/runtime/parsec/codelets/codelet_zgeqrt.c @@ -122,7 +122,7 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgeqrt_parsec, "geqrt", + dague_insert_task(DAGUE_dtd_handle, CORE_zgeqrt_parsec, "geqrt", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c index d5a5368b7..36605cafd 100644 --- a/runtime/parsec/codelets/codelet_zgessm.c +++ b/runtime/parsec/codelets/codelet_zgessm.c @@ -111,7 +111,7 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgessm_parsec, "gessm", + dague_insert_task(DAGUE_dtd_handle, CORE_zgessm_parsec, "gessm", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c index 0f3c41e8b..a61a5ac40 100644 --- a/runtime/parsec/codelets/codelet_zgessq.c +++ b/runtime/parsec/codelets/codelet_zgessq.c @@ -51,7 +51,7 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgessq_parsec, "gessq", + dague_insert_task(DAGUE_dtd_handle, CORE_zgessq_parsec, "gessq", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c index 47bcdee98..bcdf6f71a 100644 --- a/runtime/parsec/codelets/codelet_zgetrf.c +++ b/runtime/parsec/codelets/codelet_zgetrf.c @@ -58,7 +58,7 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_parsec, "getrf", + dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_parsec, "getrf", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c index 44d5f0c9b..afd98b69e 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c @@ -117,7 +117,7 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_incpiv_parsec, "getrf_inc", + dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_incpiv_parsec, "getrf_inc", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c index 5f101c60d..08b6a07b4 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c @@ -102,7 +102,7 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_nopiv_parsec, "getrf_nopiv", + dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_nopiv_parsec, "getrf_nopiv", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c index a60718e02..600f75d55 100644 --- a/runtime/parsec/codelets/codelet_zhe2ge.c +++ b/runtime/parsec/codelets/codelet_zhe2ge.c @@ -20,14 +20,14 @@ * **/ -#include "runtime/quark/include/morse_parsec.h" +#include "runtime/parsec/include/morse_parsec.h" /** * * @ingroup CORE_MORSE_Complex64_t * **/ -static inline static int +static inline int CORE_zhe2ge_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) { @@ -48,7 +48,7 @@ CORE_zhe2ge_parsec(dague_execution_unit_t *context, UNPACK_DATA, &B, UNPACK_VALUE, &LDB); - CORE_zhe2ge(uplo, M, N, A, LDA, B, LDB); + CORE_zhe2ge(*uplo, *M, *N, A, *LDA, B, *LDB); } @@ -60,7 +60,7 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_zhe2ge_parsec, "he2ge", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c index 5659b5a8b..2b2a4bed4 100644 --- a/runtime/parsec/codelets/codelet_zhemm.c +++ b/runtime/parsec/codelets/codelet_zhemm.c @@ -76,7 +76,7 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zhemm_parsec, "hemm", + dague_insert_task(DAGUE_dtd_handle, CORE_zhemm_parsec, "hemm", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c index 3209869df..a2fd88ef4 100644 --- a/runtime/parsec/codelets/codelet_zher2k.c +++ b/runtime/parsec/codelets/codelet_zher2k.c @@ -76,7 +76,7 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zher2k_parsec, "her2k", + dague_insert_task(DAGUE_dtd_handle, CORE_zher2k_parsec, "her2k", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c index ab6c58eab..0af3cbb08 100644 --- a/runtime/parsec/codelets/codelet_zherfb.c +++ b/runtime/parsec/codelets/codelet_zherfb.c @@ -22,9 +22,9 @@ * @precisions normal z -> c d s * **/ -#include "runtime/quark/include/morse_parsec.h" +#include "runtime/parsec/include/morse_parsec.h" -static int +static inline int CORE_zherfb_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) { @@ -57,9 +57,9 @@ CORE_zherfb_parsec(dague_execution_unit_t *context, UNPACK_SCRATCH, &WORK, UNPACK_VALUE, &ldwork); - CORE_zherfb(uplo, n, k, ib, nb, - A, lda, T, ldt, - C, ldc, WORK, ldwork); + CORE_zherfb(*uplo, *n, *k, *ib, *nb, + A, *lda, T, *ldt, + C, *ldc, WORK, *ldwork); } void MORSE_TASK_zherfb(const MORSE_option_t *options, @@ -71,7 +71,7 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_zherfb_parsec, "herfb", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c index 8630b0eb4..5c220476c 100644 --- a/runtime/parsec/codelets/codelet_zherk.c +++ b/runtime/parsec/codelets/codelet_zherk.c @@ -71,7 +71,7 @@ void MORSE_TASK_zherk(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zherk_parsec, "herk", + dague_insert_task(DAGUE_dtd_handle, CORE_zherk_parsec, "herk", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c index f88d0638e..71a449910 100644 --- a/runtime/parsec/codelets/codelet_zhessq.c +++ b/runtime/parsec/codelets/codelet_zhessq.c @@ -51,7 +51,7 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zhessq_parsec, "hessq", + dague_insert_task(DAGUE_dtd_handle, CORE_zhessq_parsec, "hessq", sizeof(int), &uplo, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c index bde5319f7..abf5c8391 100644 --- a/runtime/parsec/codelets/codelet_zlacpy.c +++ b/runtime/parsec/codelets/codelet_zlacpy.c @@ -62,7 +62,7 @@ void MORSE_TASK_zlacpy(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlacpy_parsec, "lacpy", + dague_insert_task(DAGUE_dtd_handle, CORE_zlacpy_parsec, "lacpy", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c index cd7f2f8da..3a2e79059 100644 --- a/runtime/parsec/codelets/codelet_zlag2c.c +++ b/runtime/parsec/codelets/codelet_zlag2c.c @@ -59,7 +59,7 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlag2c_parsec, "lag2c", + dague_insert_task(DAGUE_dtd_handle, CORE_zlag2c_parsec, "lag2c", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL, @@ -106,7 +106,7 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_clag2z_parsec, "lag2z", + dague_insert_task(DAGUE_dtd_handle, CORE_clag2z_parsec, "lag2z", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex32_t, Am, An ), INPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c index 031c9d189..3467d9f7c 100644 --- a/runtime/parsec/codelets/codelet_zlange.c +++ b/runtime/parsec/codelets/codelet_zlange.c @@ -58,7 +58,7 @@ void MORSE_TASK_zlange(const MORSE_option_t *options, int szeW = max( M, N ); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlange_parsec, "lange", + dague_insert_task(DAGUE_dtd_handle, CORE_zlange_parsec, "lange", sizeof(MORSE_enum), &norm, VALUE, sizeof(int), &M, VALUE, sizeof(int), &N, VALUE, @@ -94,7 +94,7 @@ void MORSE_TASK_zlange_max(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlange_max_parsec, "lange_max", + dague_insert_task(DAGUE_dtd_handle, CORE_zlange_max_parsec, "lange_max", PASSED_BY_REF, RTBLKADDR( A, double, Am, An ), INPUT | REGION_FULL, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT | REGION_FULL, 0); diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c index 78540b6e1..4f958cff5 100644 --- a/runtime/parsec/codelets/codelet_zlanhe.c +++ b/runtime/parsec/codelets/codelet_zlanhe.c @@ -57,7 +57,7 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options, int szeW = max( 1, N ); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlanhe_parsec, "LANHE", + dague_insert_task(DAGUE_dtd_handle, CORE_zlanhe_parsec, "LANHE", sizeof(MORSE_enum), &norm, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &N, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c index fde4b15a6..fd4617288 100644 --- a/runtime/parsec/codelets/codelet_zlansy.c +++ b/runtime/parsec/codelets/codelet_zlansy.c @@ -58,7 +58,7 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options, int szeW = max( 1, N ); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlansy_parsec, "lansy", + dague_insert_task(DAGUE_dtd_handle, CORE_zlansy_parsec, "lansy", sizeof(MORSE_enum), &norm, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &N, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c index 8e4e22c94..1b08e0582 100644 --- a/runtime/parsec/codelets/codelet_zlantr.c +++ b/runtime/parsec/codelets/codelet_zlantr.c @@ -60,7 +60,7 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options, int szeW = max( 1, N ); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlantr_parsec, "lantr", + dague_insert_task(DAGUE_dtd_handle, CORE_zlantr_parsec, "lantr", sizeof(MORSE_enum), &norm, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &diag, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c index 3cea2ba8b..11afa143e 100644 --- a/runtime/parsec/codelets/codelet_zlascal.c +++ b/runtime/parsec/codelets/codelet_zlascal.c @@ -29,7 +29,7 @@ * **/ -#include "runtime/quark/include/morse_parsec.h" +#include "runtime/parsec/include/morse_parsec.h" /***************************************************************************//** * @@ -55,7 +55,7 @@ CORE_zlascal_parsec(dague_execution_unit_t *context, UNPACK_DATA, &A, UNPACK_VALUE, &LDA); - CORE_zlascal(uplo, M, N, alpha, A, LDA); + CORE_zlascal(*uplo, *M, *N, *alpha, A, *LDA); } void MORSE_TASK_zlascal(const MORSE_option_t *options, @@ -66,7 +66,7 @@ void MORSE_TASK_zlascal(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_zlascal_parsec, "lascal", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c index 66f540db4..d8fb1673a 100644 --- a/runtime/parsec/codelets/codelet_zlaset.c +++ b/runtime/parsec/codelets/codelet_zlaset.c @@ -92,7 +92,7 @@ void MORSE_TASK_zlaset(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlaset_parsec, "laset", + dague_insert_task(DAGUE_dtd_handle, CORE_zlaset_parsec, "laset", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &M, VALUE, sizeof(int), &N, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c index 7ff90dc92..01eeacd59 100644 --- a/runtime/parsec/codelets/codelet_zlaset2.c +++ b/runtime/parsec/codelets/codelet_zlaset2.c @@ -85,7 +85,7 @@ void MORSE_TASK_zlaset2(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlaset2_parsec, "laset2", + dague_insert_task(DAGUE_dtd_handle, CORE_zlaset2_parsec, "laset2", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &M, VALUE, sizeof(int), &N, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c index 6cf3e6297..e67e808d0 100644 --- a/runtime/parsec/codelets/codelet_zlatro.c +++ b/runtime/parsec/codelets/codelet_zlatro.c @@ -23,8 +23,7 @@ **/ #include "runtime/parsec/include/morse_parsec.h" - -static int +static inline int CORE_zlatro_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) { @@ -47,8 +46,8 @@ CORE_zlatro_parsec(dague_execution_unit_t *context, UNPACK_DATA, &B, UNPACK_VALUE, &LDB); - CORE_zlatro(uplo, trans, M, N, - A, LDA, B, LDB); + CORE_zlatro(*uplo, *trans, *M, *N, + A, *LDA, B, *LDB); } /***************************************************************************//** @@ -62,7 +61,7 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_zlatro_parsec, "latro", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c index 6c936cc8b..0e1c974d0 100644 --- a/runtime/parsec/codelets/codelet_zlauum.c +++ b/runtime/parsec/codelets/codelet_zlauum.c @@ -54,7 +54,7 @@ void MORSE_TASK_zlauum(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlauum_parsec, "lauum", + dague_insert_task(DAGUE_dtd_handle, CORE_zlauum_parsec, "lauum", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c index b15f9eb68..f0520af59 100644 --- a/runtime/parsec/codelets/codelet_zpamm.c +++ b/runtime/parsec/codelets/codelet_zpamm.c @@ -219,7 +219,7 @@ MORSE_TASK_zpamm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zpamm_parsec, "pamm", + dague_insert_task(DAGUE_dtd_handle, CORE_zpamm_parsec, "pamm", sizeof(int), &op, VALUE, sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &storev, VALUE, diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c index 58485eba4..561daa7fb 100644 --- a/runtime/parsec/codelets/codelet_zplghe.c +++ b/runtime/parsec/codelets/codelet_zplghe.c @@ -59,7 +59,7 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zplghe_parsec, "zplghe", + dague_insert_task(DAGUE_dtd_handle, CORE_zplghe_parsec, "zplghe", sizeof(double), &bump, VALUE, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c index d3a11a4bc..d70286146 100644 --- a/runtime/parsec/codelets/codelet_zplgsy.c +++ b/runtime/parsec/codelets/codelet_zplgsy.c @@ -58,7 +58,7 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zplgsy_parsec, "zplgsy", + dague_insert_task(DAGUE_dtd_handle, CORE_zplgsy_parsec, "zplgsy", sizeof(MORSE_Complex64_t), &bump, VALUE, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c index 7f0231912..1cfc25b1a 100644 --- a/runtime/parsec/codelets/codelet_zplrnt.c +++ b/runtime/parsec/codelets/codelet_zplrnt.c @@ -57,7 +57,7 @@ void MORSE_TASK_zplrnt( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zplrnt_parsec, "zplrnt", + dague_insert_task(DAGUE_dtd_handle, CORE_zplrnt_parsec, "zplrnt", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c index 662e9b775..3c570c4bb 100644 --- a/runtime/parsec/codelets/codelet_zplssq.c +++ b/runtime/parsec/codelets/codelet_zplssq.c @@ -81,7 +81,7 @@ void MORSE_TASK_zplssq( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zplssq_parsec, "plssq", + dague_insert_task(DAGUE_dtd_handle, CORE_zplssq_parsec, "plssq", PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INPUT | REGION_FULL, PASSED_BY_REF, RTBLKADDR( SCLSSQ, double, SCLSSQm, SCLSSQn ), INOUT | REGION_FULL, 0); @@ -107,7 +107,7 @@ void MORSE_TASK_zplssq2( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zplssq2_parsec, "plssq2", + dague_insert_task(DAGUE_dtd_handle, CORE_zplssq2_parsec, "plssq2", PASSED_BY_REF, RTBLKADDR( RESULT, double, RESULTm, RESULTn ), INOUT | REGION_FULL, 0); } diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c index 050b194c0..9befe17ed 100644 --- a/runtime/parsec/codelets/codelet_zpotrf.c +++ b/runtime/parsec/codelets/codelet_zpotrf.c @@ -55,7 +55,7 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zpotrf_parsec, "potrf", + dague_insert_task(DAGUE_dtd_handle, CORE_zpotrf_parsec, "potrf", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c index 3ef486664..8a71222cf 100644 --- a/runtime/parsec/codelets/codelet_zssssm.c +++ b/runtime/parsec/codelets/codelet_zssssm.c @@ -75,7 +75,7 @@ void MORSE_TASK_zssssm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zssssm_parsec, "ssssm", + dague_insert_task(DAGUE_dtd_handle, CORE_zssssm_parsec, "ssssm", sizeof(int), &m1, VALUE, sizeof(int), &n1, VALUE, sizeof(int), &m2, VALUE, diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c index 70bef988d..9d9659d19 100644 --- a/runtime/parsec/codelets/codelet_zsymm.c +++ b/runtime/parsec/codelets/codelet_zsymm.c @@ -73,7 +73,7 @@ void MORSE_TASK_zsymm(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zsymm_parsec, "symm", + dague_insert_task(DAGUE_dtd_handle, CORE_zsymm_parsec, "symm", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c index 3cae995d2..95cc655d7 100644 --- a/runtime/parsec/codelets/codelet_zsyr2k.c +++ b/runtime/parsec/codelets/codelet_zsyr2k.c @@ -71,7 +71,7 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zsyr2k_parsec, "syr2k", + dague_insert_task(DAGUE_dtd_handle, CORE_zsyr2k_parsec, "syr2k", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c index 123925f38..3161bd1c3 100644 --- a/runtime/parsec/codelets/codelet_zsyrk.c +++ b/runtime/parsec/codelets/codelet_zsyrk.c @@ -65,7 +65,7 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zsyrk_parsec, "syrk", + dague_insert_task(DAGUE_dtd_handle, CORE_zsyrk_parsec, "syrk", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c index d0bf4b4f1..0fac3cddc 100644 --- a/runtime/parsec/codelets/codelet_zsyssq.c +++ b/runtime/parsec/codelets/codelet_zsyssq.c @@ -52,7 +52,7 @@ void MORSE_TASK_zsyssq( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zsyssq_parsec, "syssq", + dague_insert_task(DAGUE_dtd_handle, CORE_zsyssq_parsec, "syssq", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c index 17f1a26a3..4ab23fb22 100644 --- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c @@ -53,7 +53,7 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zsytrf_nopiv_parsec, "sytrf_nopiv", + dague_insert_task(DAGUE_dtd_handle, CORE_zsytrf_nopiv_parsec, "sytrf_nopiv", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL, diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c index 4503ccff4..f3b65ca9e 100644 --- a/runtime/parsec/codelets/codelet_ztile_zero.c +++ b/runtime/parsec/codelets/codelet_ztile_zero.c @@ -55,7 +55,7 @@ void MORSE_TASK_ztile_zero(const const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztile_zero_parsec, "tile zero", + dague_insert_task(DAGUE_dtd_handle, CORE_ztile_zero_parsec, "tile zero", sizeof(int), &X1, VALUE, sizeof(int), &X2, VALUE, sizeof(int), &Y1, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c index 93634fc90..7ab8db5c7 100644 --- a/runtime/parsec/codelets/codelet_ztradd.c +++ b/runtime/parsec/codelets/codelet_ztradd.c @@ -127,7 +127,7 @@ void MORSE_TASK_ztradd(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_ztradd_parsec, "tradd", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &trans, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c index 31990e484..4e3d74c2b 100644 --- a/runtime/parsec/codelets/codelet_ztrasm.c +++ b/runtime/parsec/codelets/codelet_ztrasm.c @@ -57,7 +57,7 @@ void MORSE_TASK_ztrasm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztrasm_parsec, "trasm", + dague_insert_task(DAGUE_dtd_handle, CORE_ztrasm_parsec, "trasm", sizeof(MORSE_enum), &storev, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &diag, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c index 4061d0e59..436ad1ce9 100644 --- a/runtime/parsec/codelets/codelet_ztrmm.c +++ b/runtime/parsec/codelets/codelet_ztrmm.c @@ -69,7 +69,7 @@ void MORSE_TASK_ztrmm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztrmm_parsec, "trmm", + dague_insert_task(DAGUE_dtd_handle, CORE_ztrmm_parsec, "trmm", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &transA, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c index d970d1065..835714813 100644 --- a/runtime/parsec/codelets/codelet_ztrsm.c +++ b/runtime/parsec/codelets/codelet_ztrsm.c @@ -60,7 +60,7 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztrsm_parsec, "Trsm", + dague_insert_task(DAGUE_dtd_handle, CORE_ztrsm_parsec, "Trsm", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &transA, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c index ee721b674..b1917044b 100644 --- a/runtime/parsec/codelets/codelet_ztrssq.c +++ b/runtime/parsec/codelets/codelet_ztrssq.c @@ -57,7 +57,7 @@ void MORSE_TASK_ztrssq( const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztrssq_parsec, "trssq", + dague_insert_task(DAGUE_dtd_handle, CORE_ztrssq_parsec, "trssq", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &diag, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c index 0fdc442d2..c1a424cc3 100644 --- a/runtime/parsec/codelets/codelet_ztrtri.c +++ b/runtime/parsec/codelets/codelet_ztrtri.c @@ -56,7 +56,7 @@ void MORSE_TASK_ztrtri(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztrtri_parsec, "trtri", + dague_insert_task(DAGUE_dtd_handle, CORE_ztrtri_parsec, "trtri", sizeof(MORSE_enum), &uplo, VALUE, sizeof(MORSE_enum), &diag, VALUE, sizeof(int), &n, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c index bea32cbaf..3d8ae0723 100644 --- a/runtime/parsec/codelets/codelet_ztslqt.c +++ b/runtime/parsec/codelets/codelet_ztslqt.c @@ -66,7 +66,7 @@ void MORSE_TASK_ztslqt(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztslqt_parsec, "tslqt", + dague_insert_task(DAGUE_dtd_handle, CORE_ztslqt_parsec, "tslqt", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c index 85de91aa0..000442c2a 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq.c +++ b/runtime/parsec/codelets/codelet_ztsmlq.c @@ -86,7 +86,7 @@ void MORSE_TASK_ztsmlq(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztsmlq_parsec, "tsmlq", + dague_insert_task(DAGUE_dtd_handle, CORE_ztsmlq_parsec, "tsmlq", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m1, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c index ff3d2ce6f..b25f919c7 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c @@ -25,9 +25,9 @@ * @precisions normal z -> c d s * **/ -#include "runtime/quark/include/morse_parsec.h" +#include "runtime/parsec/include/morse_parsec.h" -static int +static inline int CORE_ztsmlq_hetra1_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) { @@ -70,10 +70,10 @@ CORE_ztsmlq_hetra1_parsec(dague_execution_unit_t *context, UNPACK_SCRATCH, &WORK, UNPACK_VALUE, &ldwork); - CORE_ztsmlq_hetra1(side, trans, m1, n1, m2, n2, k, ib, - A1, lda1, A2, lda2, - V, ldv, T, ldt, - WORK, ldwork); + CORE_ztsmlq_hetra1(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, + A1, *lda1, A2, *lda2, + V, *ldv, T, *ldt, + WORK, *ldwork); } void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options, @@ -85,8 +85,9 @@ void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options, const MORSE_desc_t *T, int Tm, int Tn, int ldt) { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); + int ldwork = side == MorseLeft ? ib : nb; - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_ztsmlq_hetra1_parsec, "tsmlq_hetra1", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c index 4f3e4f6ae..0f8f3c5d0 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr.c +++ b/runtime/parsec/codelets/codelet_ztsmqr.c @@ -85,7 +85,7 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztsmqr_parsec, "tsmqr", + dague_insert_task(DAGUE_dtd_handle, CORE_ztsmqr_parsec, "tsmqr", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m1, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c index ce428c0f0..7c022007d 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c @@ -25,9 +25,9 @@ * @precisions normal z -> c d s * **/ -#include "runtime/quark/include/morse_parsec.h" +#include "runtime/parsec/include/morse_parsec.h" -static int +static inline int CORE_ztsmqr_hetra1_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task) { @@ -70,10 +70,10 @@ CORE_ztsmqr_hetra1_parsec(dague_execution_unit_t *context, UNPACK_SCRATCH, &WORK, UNPACK_VALUE, &ldwork); - CORE_ztsmqr_hetra1(side, trans, m1, n1, m2, n2, k, ib, - A1, lda1, A2, lda2, - V, ldv, T, ldt, - WORK, ldwork); + CORE_ztsmqr_hetra1(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, + A1, *lda1, A2, *lda2, + V, *ldv, T, *ldt, + WORK, *ldwork); } void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options, @@ -85,8 +85,9 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options, const MORSE_desc_t *T, int Tm, int Tn, int ldt) { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); + int ldwork = side == MorseLeft ? ib : nb; - insert_task_generic_fptr( + dague_insert_task( DAGUE_dtd_handle, CORE_ztsmqr_hetra1_parsec, "tsmqr_hetra1", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c index 9729db91c..e209718ad 100644 --- a/runtime/parsec/codelets/codelet_ztsqrt.c +++ b/runtime/parsec/codelets/codelet_ztsqrt.c @@ -66,7 +66,7 @@ void MORSE_TASK_ztsqrt(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztsqrt_parsec, "tsqrt", + dague_insert_task(DAGUE_dtd_handle, CORE_ztsqrt_parsec, "tsqrt", sizeof(MORSE_enum), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c index 2e4dcccd0..9f1e6c159 100644 --- a/runtime/parsec/codelets/codelet_ztstrf.c +++ b/runtime/parsec/codelets/codelet_ztstrf.c @@ -77,7 +77,7 @@ void MORSE_TASK_ztstrf(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_ztstrf_parsec, "tstrf", + dague_insert_task(DAGUE_dtd_handle, CORE_ztstrf_parsec, "tstrf", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c index bc44ec18c..97e02753f 100644 --- a/runtime/parsec/codelets/codelet_zttlqt.c +++ b/runtime/parsec/codelets/codelet_zttlqt.c @@ -66,7 +66,7 @@ void MORSE_TASK_zttlqt(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zttlqt_parsec, "ttlqt", + dague_insert_task(DAGUE_dtd_handle, CORE_zttlqt_parsec, "ttlqt", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c index 140891b18..8a8d03545 100644 --- a/runtime/parsec/codelets/codelet_zttmlq.c +++ b/runtime/parsec/codelets/codelet_zttmlq.c @@ -83,7 +83,7 @@ void MORSE_TASK_zttmlq(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zttmlq_parsec, "ttmlq", + dague_insert_task(DAGUE_dtd_handle, CORE_zttmlq_parsec, "ttmlq", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m1, VALUE, diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c index 8de4e5ca3..75863f9a1 100644 --- a/runtime/parsec/codelets/codelet_zttmqr.c +++ b/runtime/parsec/codelets/codelet_zttmqr.c @@ -86,7 +86,7 @@ void MORSE_TASK_zttmqr(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zttmqr_parsec, "ttmqr", + dague_insert_task(DAGUE_dtd_handle, CORE_zttmqr_parsec, "ttmqr", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m1, VALUE, diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c index ef2dd5c67..5b831bf19 100644 --- a/runtime/parsec/codelets/codelet_zttqrt.c +++ b/runtime/parsec/codelets/codelet_zttqrt.c @@ -66,7 +66,7 @@ void MORSE_TASK_zttqrt(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zttqrt_parsec, "ttqrt", + dague_insert_task(DAGUE_dtd_handle, CORE_zttqrt_parsec, "ttqrt", sizeof(MORSE_enum), &m, VALUE, sizeof(int), &n, VALUE, sizeof(int), &ib, VALUE, diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c index a12338513..b30ccbdbb 100644 --- a/runtime/parsec/codelets/codelet_zunmlq.c +++ b/runtime/parsec/codelets/codelet_zunmlq.c @@ -74,7 +74,7 @@ void MORSE_TASK_zunmlq(const MORSE_option_t *options, dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zunmlq_parsec, "unmlq", + dague_insert_task(DAGUE_dtd_handle, CORE_zunmlq_parsec, "unmlq", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m, VALUE, diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c index 9bac6d0e7..5c08e10fd 100644 --- a/runtime/parsec/codelets/codelet_zunmqr.c +++ b/runtime/parsec/codelets/codelet_zunmqr.c @@ -73,7 +73,7 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options, { dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt); - insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zunmqr_parsec, "unmqr", + dague_insert_task(DAGUE_dtd_handle, CORE_zunmqr_parsec, "unmqr", sizeof(MORSE_enum), &side, VALUE, sizeof(MORSE_enum), &trans, VALUE, sizeof(int), &m, VALUE, -- GitLab