Commit 839bc76d authored by Mathieu Faverge's avatar Mathieu Faverge

Fix rebase and add flush in RH functions

parent f5186bd6
......@@ -127,7 +127,6 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
T(k, k), T->mb,
A(m, k), ldam);
}
MORSE_TASK_dataflush( &options, D(k) );
MORSE_TASK_dataflush( &options, T(k, k) );
......@@ -160,7 +159,6 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
A(m, k), ldam,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
......
......@@ -135,10 +135,9 @@ void morse_pzgelqf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
T(k, p), T->mb,
A(m, p), ldam);
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
/* Setting the order of the tiles */
libhqr_walk_stepk( qrtree, k, tiles + (k+1) );
......
......@@ -127,6 +127,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
T(k, N), T->mb,
A(m, N), ldam);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
for (n = N+1; n < chameleon_min(N+BS, A->nt); n++) {
tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
......@@ -158,6 +160,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
A(m, N), ldam,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
}
for (RD = BS; RD < A->nt-k; RD *= 2) {
......@@ -195,6 +199,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
A (m, N ), ldam,
A (m, N+RD), ldam);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
......
......@@ -155,7 +155,6 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
A(k, n), ldak,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
......
......@@ -132,9 +132,9 @@ void morse_pzgeqrf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
T(m, k), T->mb,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, D(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
MORSE_TASK_dataflush( &options, D(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
/* Setting the order of the tiles */
libhqr_walk_stepk( qrtree, k, tiles + (k+1) );
......@@ -187,7 +187,6 @@ void morse_pzgeqrf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
A(p, n), ldap,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
......
......@@ -125,6 +125,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
T(M, k), T->mb,
A(M, n), ldaM);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
for (m = M+1; m < chameleon_min(M+BS, A->mt); m++) {
tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
......@@ -156,6 +158,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
A(M, n), ldaM,
A(m, n), ldam);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
}
for (RD = BS; RD < A->mt-k; RD *= 2) {
......@@ -194,6 +198,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
A (M, n), ldaM,
A (M+RD, n), ldaMRD);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
......
......@@ -148,7 +148,6 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
T(k, k), T->mb,
Q(m, k), ldqm);
}
MORSE_TASK_dataflush( &options, D(k) );
MORSE_TASK_dataflush( &options, T(k, k) );
......
......@@ -113,6 +113,9 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
Q (m, N ), ldqm,
Q (m, N+RD), ldqm);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
for (N = k; N < A->nt; N += BS) {
......@@ -140,6 +143,9 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
Q(m, N), ldqm,
Q(m, n), ldqm);
}
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
......@@ -171,6 +177,8 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
T(k, N), T->mb,
Q(m, N), ldqm);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
}
RUNTIME_iteration_pop(morse);
}
......
......@@ -118,6 +118,8 @@ void morse_pzungqr(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
Q(k, n), ldqk,
Q(m, n), ldqm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
#if defined(CHAMELEON_COPY_DIAG)
......@@ -149,6 +151,9 @@ void morse_pzungqr(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
T(k, k), T->mb,
Q(k, n), ldqk);
}
MORSE_TASK_dataflush( &options, D(k) );
MORSE_TASK_dataflush( &options, T(k, k) );
RUNTIME_iteration_pop(morse);
}
......
......@@ -176,7 +176,7 @@ void morse_pzungqr_param(const libhqr_tree_t *qrtree,
T(m, k), T->mb,
Q(m, n), ldqm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, D(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
......
......@@ -116,6 +116,9 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
Q (M, n), ldqM,
Q (M+RD, n), ldqMRD);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
for (M = k; M < A->mt; M += BS) {
......@@ -146,6 +149,8 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
Q(M, n), ldqM,
Q(m, n), ldqm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
#if defined(CHAMELEON_COPY_DIAG)
......@@ -178,6 +183,8 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
T(M, k), T->mb,
Q(M, n), ldqM);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
}
RUNTIME_iteration_pop(morse);
}
......
......@@ -130,7 +130,7 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
MORSE_TASK_dataflush( &options, D(k) );
MORSE_TASK_dataflush( &options, T(k, k) );
for (m = k+1; m < B->mt; m++) {
tempmm = m == B->mt-1 ? B->m-m*B->mb : B->mb;
ldbm = BLKLDD(B, m);
......
......@@ -127,10 +127,11 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
T(k, p), T->mb,
B(p, n), ldbp);
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
/* Setting the order of the tiles*/
libhqr_walk_stepk(qrtree, k, tiles + (k+1));
......@@ -270,10 +271,10 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
T(k, p), T->mb,
B(p, n), ldbp);
}
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
}
RUNTIME_iteration_pop(morse);
}
......@@ -368,10 +369,10 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
T(k, p), T->mb,
B(m, p), ldbm);
}
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
}
RUNTIME_iteration_pop(morse);
}
......@@ -419,10 +420,11 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
T(k, p), TS->mb,
B(m, p), ldbm);
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
}
MORSE_TASK_dataflush( &options, D(k, p) );
MORSE_TASK_dataflush( &options, T(k, p) );
/* Setting the order of tiles */
libhqr_walk_stepk(qrtree, k, tiles + (k+1));
......@@ -462,8 +464,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
B(m, p), ldbm,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A( k, n) );
MORSE_TASK_dataflush( &options, TT(k, n) );
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
RUNTIME_iteration_pop(morse);
......
......@@ -123,6 +123,9 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
T(k, N), T->mb,
B(N, n), ldbN);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
for (m = N+1; m < chameleon_min(N+BS, A->nt); m++) {
tempmm = m == B->mt-1 ? B->m-m*B->mb : B->mb;
ldbm = BLKLDD(B, m);
......@@ -143,6 +146,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B(N, n), ldbN,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(k, m) );
MORSE_TASK_dataflush( &options, T(k, m) );
}
}
for (RD = BS; RD < A->nt-k; RD *= 2) {
......@@ -168,6 +173,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B (N, n), ldbN,
B (N+RD, n), ldbNRD);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
......@@ -214,6 +221,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B (N, n), ldbN,
B (N+RD, n), ldbNRD);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
for (N = k; N < A->nt; N += BS) {
......@@ -241,6 +250,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B(N, n), ldbN,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(k, m) );
MORSE_TASK_dataflush( &options, T(k, m) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
......@@ -271,6 +282,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
T(k, N), T->mb,
B(N, n), ldbN);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
}
RUNTIME_iteration_pop(morse);
}
......@@ -311,6 +324,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B (m, N ), ldbm,
B (m, N+RD), ldbm);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
for (N = k; N < A->nt; N += BS) {
......@@ -337,6 +352,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B(m, N), ldbm,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
......@@ -368,6 +385,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
T(k, N), T->mb,
B(m, N), ldbm);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
}
RUNTIME_iteration_pop(morse);
......@@ -410,6 +429,9 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
T(k, N), T->mb,
B(m, N), ldbm);
}
MORSE_TASK_dataflush( &options, D(k, N) );
MORSE_TASK_dataflush( &options, T(k, N) );
for (n = N+1; n < chameleon_min(N+BS, A->nt); n++) {
tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
for (m = 0; m < B->mt; m++) {
......@@ -431,6 +453,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B(m, N), ldbm,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(k, n) );
MORSE_TASK_dataflush( &options, T(k, n) );
}
}
for (RD = BS; RD < A->nt-k; RD *= 2) {
......@@ -455,6 +479,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
B (m, N ), ldbm,
B (m, N+RD), ldbm);
}
MORSE_TASK_dataflush( &options, A (k, N+RD) );
MORSE_TASK_dataflush( &options, T2(k, N+RD) );
}
}
......
......@@ -196,10 +196,10 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
B(k, n), ldbk,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
&options,
......
......@@ -272,10 +272,10 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
T(m, k), T->mb,
B(m, n), ldbm);
}
}
MORSE_TASK_dataflush( &options, D(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
MORSE_TASK_dataflush( &options, D(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
RUNTIME_iteration_pop(morse);
}
......
......@@ -123,6 +123,9 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
T(M, k), T->mb,
B(M, n), ldbM);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
for (m = M+1; m < chameleon_min(M+BS, A->mt); m++) {
tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
ldbm = BLKLDD(B, m);
......@@ -144,6 +147,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B(M, n), ldbM,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
}
for (RD = BS; RD < A->mt-k; RD *= 2) {
......@@ -169,6 +174,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B (M, n), ldbM,
B (M+RD, n), ldbMRD);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
......@@ -214,6 +221,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B (M, n), ldbM,
B (M+RD, n), ldbMRD);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
for (M = k; M < A->mt; M += BS) {
......@@ -242,6 +251,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B(M, n), ldbM,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(m, k) );
MORSE_TASK_dataflush( &options, T(m, k) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
......@@ -270,6 +281,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
T(M, k), T->mb,
B(M, n), ldbM);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
}
RUNTIME_iteration_pop(morse);
}
......@@ -309,6 +322,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B (m, M), ldbm,
B (m, M+RD), ldbm);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
for (M = k; M < A->mt; M += BS) {
......@@ -337,6 +352,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B(m, M), ldbm,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(n, k) );
MORSE_TASK_dataflush( &options, T(n, k) );
}
#if defined(CHAMELEON_COPY_DIAG)
MORSE_TASK_zlacpy(
......@@ -367,6 +384,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
T(M, k), T->mb,
B(m, M), ldbm);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
}
RUNTIME_iteration_pop(morse);
......@@ -408,6 +427,9 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
T(M, k), T->mb,
B(m, M), ldbm);
}
MORSE_TASK_dataflush( &options, D(M, k) );
MORSE_TASK_dataflush( &options, T(M, k) );
for (n = M+1; n < chameleon_min(M+BS, A->mt); n++) {
tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
ldan = BLKLDD(A, n);
......@@ -429,6 +451,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B(m, M), ldbm,
B(m, n), ldbm);
}
MORSE_TASK_dataflush( &options, A(n, k) );
MORSE_TASK_dataflush( &options, T(n, k) );
}
}
for (RD = BS; RD < A->mt-k; RD *= 2) {
......@@ -453,6 +477,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
B (m, M ), ldbm,
B (m, M+RD), ldbm);
}
MORSE_TASK_dataflush( &options, A (M+RD, k) );
MORSE_TASK_dataflush( &options, T2(M+RD, k) );
}
}
......
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