Commit e7934db2 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Remove REGION_FULL which is 0 and useless, and arena for now

parent 62c59c76
......@@ -64,8 +64,8 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &M, VALUE,
sizeof(int), &N, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), INOUT,
0);
}
......@@ -59,9 +59,9 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options,
PARSEC_dtd_taskpool, CORE_zaxpy_parsec, options->priority, "axpy",
sizeof(int), &M, VALUE,
sizeof(MORSE_Complex64_t), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &incA, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT,
sizeof(int), &incB, VALUE,
0);
}
......@@ -69,7 +69,7 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
sizeof(int), &row_max, VALUE,
sizeof(int), &col_min, VALUE,
sizeof(int), &col_max, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT,
sizeof(int), &lda, VALUE,
sizeof(void*), &user_data, VALUE,
sizeof(void*), &user_build_callback, VALUE,
......
......@@ -126,10 +126,10 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(MORSE_Complex64_t), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
sizeof(MORSE_Complex64_t), &beta, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT,
sizeof(int), &ldb, VALUE,
0);
}
......@@ -127,9 +127,9 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( T, MORSE_Complex64_t, Tm, Tn ), OUTPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( T, MORSE_Complex64_t, Tm, Tn ), OUTPUT,
sizeof(int), &ldt, VALUE,
sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH,
sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH,
......
......@@ -88,12 +88,12 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options,
sizeof(int), &n, VALUE,
sizeof(int), &k, VALUE,
sizeof(MORSE_Complex64_t), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A),
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | morse_parsec_get_arena_index(B),
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT,
sizeof(int), &ldb, VALUE,
sizeof(MORSE_Complex64_t), &beta, VALUE,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY,
sizeof(int), &ldc, VALUE,
0);
}
......@@ -128,9 +128,9 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( T, MORSE_Complex64_t, Tm, Tn ), OUTPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( T, MORSE_Complex64_t, Tm, Tn ), OUTPUT,
sizeof(int), &ldt, VALUE,
sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH,
sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH,
......
......@@ -119,11 +119,11 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options,
sizeof(int), &k, VALUE,
sizeof(int), &ib, VALUE,
sizeof(int)*nb, IPIV, SCRATCH,
PASSED_BY_REF, RTBLKADDR( L, MORSE_Complex64_t, Lm, Ln ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( L, MORSE_Complex64_t, Lm, Ln ), INPUT,
sizeof(int), &ldl, VALUE,
PASSED_BY_REF, RTBLKADDR( D, MORSE_Complex64_t, Dm, Dn ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( D, MORSE_Complex64_t, Dm, Dn ), INPUT,
sizeof(int), &ldd, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
0);
}
......@@ -57,8 +57,8 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options,
PARSEC_dtd_taskpool, CORE_zgessq_parsec, options->priority, "gessq",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT,
0);
}
......@@ -63,7 +63,7 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options,
PARSEC_dtd_taskpool, CORE_zgetrf_parsec, options->priority, "getrf",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
sizeof(int)*nb, IPIV, SCRATCH,
sizeof(MORSE_bool), &check_info, VALUE,
......
......@@ -122,7 +122,7 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
sizeof(int)*nb, IPIV, SCRATCH,
sizeof(int), &check_info, VALUE,
......
......@@ -108,7 +108,7 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT,
sizeof(int), &lda, VALUE,
sizeof(int), &iinfo, VALUE,
0);
......
......@@ -68,9 +68,9 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INPUT ,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT,
sizeof(int), &ldb, VALUE,
0);
}
......@@ -84,12 +84,12 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(MORSE_Complex64_t), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT,
sizeof(int), &ldb, VALUE,
sizeof(MORSE_Complex64_t), &beta, VALUE,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT,
sizeof(int), &ldc, VALUE,
0);
}
......@@ -84,12 +84,12 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options,
sizeof(int), &n, VALUE,
sizeof(int), &k, VALUE,
sizeof(MORSE_Complex64_t), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A),
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | morse_parsec_get_arena_index(B),
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT,
sizeof(int), &ldb, VALUE,
sizeof(double), &beta, VALUE,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY,
sizeof(int), &ldc, VALUE,
0);
}
......@@ -81,11 +81,11 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options,
sizeof(int), &k, VALUE,
sizeof(int), &ib, VALUE,
sizeof(int), &nb, VALUE,
PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), (uplo == MorseUpper) ? INOUT | REGION_FULL : INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), (uplo == MorseUpper) ? INOUT : INOUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR(T, MORSE_Complex64_t, Tm, Tn), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR(T, MORSE_Complex64_t, Tm, Tn), INPUT,
sizeof(int), &ldt, VALUE,
PASSED_BY_REF, RTBLKADDR(C, MORSE_Complex64_t, Cm, Cn), (uplo == MorseUpper) ? INOUT | REGION_FULL : INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR(C, MORSE_Complex64_t, Cm, Cn), (uplo == MorseUpper) ? INOUT : INOUT,
sizeof(int), &ldc, VALUE,
sizeof(MORSE_Complex64_t)*2*nb*nb, NULL, SCRATCH,
sizeof(int), &nb, VALUE,
......
......@@ -79,10 +79,10 @@ void MORSE_TASK_zherk(const MORSE_option_t *options,
sizeof(int), &n, VALUE,
sizeof(int), &k, VALUE,
sizeof(double), &alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A),
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
sizeof(double), &beta, VALUE,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY,
PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY,
sizeof(int), &ldc, VALUE,
0);
}
......
......@@ -57,8 +57,8 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options,
PARSEC_dtd_taskpool, CORE_zhessq_parsec, options->priority, "hessq",
sizeof(int), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT,
0);
}
......@@ -30,13 +30,15 @@
*
**/
static int
CORE_zlacpy_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task)
CORE_zlacpyx_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task)
{
MORSE_enum *uplo;
int *M;
int *N;
int *displA;
MORSE_Complex64_t *A;
int *LDA;
int *displB;
MORSE_Complex64_t *B;
int *LDB;
......@@ -45,32 +47,46 @@ CORE_zlacpy_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task
UNPACK_VALUE, &uplo,
UNPACK_VALUE, &M,
UNPACK_VALUE, &N,
UNPACK_VALUE, &displA,
UNPACK_DATA, &A,
UNPACK_VALUE, &LDA,
UNPACK_VALUE, &displB,
UNPACK_DATA, &B,
UNPACK_VALUE, &LDB );
CORE_zlacpy(*uplo, *M, *N, A, *LDA, B, *LDB);
CORE_zlacpy(*uplo, *M, *N, A + (*displA), *LDA, B + (*displB), *LDB);
return 0;
}
void MORSE_TASK_zlacpy(const MORSE_option_t *options,
MORSE_enum uplo, int m, int n, int nb,
const MORSE_desc_t *A, int Am, int An, int lda,
const MORSE_desc_t *B, int Bm, int Bn, int ldb)
void MORSE_TASK_zlacpyx( const MORSE_option_t *options,
MORSE_enum uplo, int m, int n, int nb,
int displA, const MORSE_desc_t *A, int Am, int An, int lda,
int displB, const MORSE_desc_t *B, int Bm, int Bn, int ldb )
{
parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt);
parsec_dtd_taskpool_insert_task(
PARSEC_dtd_taskpool, CORE_zlacpy_parsec, options->priority, "lacpy",
PARSEC_dtd_taskpool, CORE_zlacpyx_parsec, options->priority, "lacpy",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
sizeof(int), &displA, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), OUTPUT | REGION_FULL,
sizeof(int), &displB, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), OUTPUT,
sizeof(int), &ldb, VALUE,
0);
}
void MORSE_TASK_zlacpy(const MORSE_option_t *options,
MORSE_enum uplo, int m, int n, int nb,
const MORSE_desc_t *A, int Am, int An, int lda,
const MORSE_desc_t *B, int Bm, int Bn, int ldb)
{
MORSE_TASK_zlacpyx( options, uplo, m, n, nb,
0, A, Am, An, lda,
0, B, Bm, Bn, ldb );
}
......@@ -64,9 +64,9 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options,
parsec_dtd_taskpool_insert_task(PARSEC_dtd_taskpool, 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,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex32_t, Bm, Bn ), OUTPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex32_t, Bm, Bn ), OUTPUT,
sizeof(int), &ldb, VALUE,
0);
}
......@@ -111,9 +111,9 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options,
PARSEC_dtd_taskpool, CORE_clag2z_parsec, options->priority, "lag2z",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex32_t, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex32_t, Am, An ), INPUT,
sizeof(int), &lda, VALUE,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT,
sizeof(int), &ldb, VALUE,
0);
}
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