Merge branch 'map/add_locality' into 'master'

Add map to the restrict locality functions

See merge request !485

include/chameleon/tasks.h

@@ -35,6 +35,10 @@ BEGIN_C_DECLS
  */
 typedef enum chameleon_tasktype_e {
 
+  TASK_MAP_ONE,
+  TASK_MAP_TWO,
+  TASK_MAP_THREE,
+
   TASK_GEMM,
   TASK_HEMM,
   TASK_HER2K,

runtime/starpu/control/runtime_zlocality.c

@@ -94,6 +94,10 @@ void RUNTIME_zlocality_allrestrict( uint32_t where )
    cl_zunmlq_restrict_where( where );
    cl_ztpmlqt_restrict_where( where );
 
+    /* map */
+    cl_map_one_restrict_where( where );
+    cl_map_two_restrict_where( where );
+    cl_map_three_restrict_where( where );
 }
 
 void RUNTIME_zlocality_onerestrict( cham_tasktype_t kernel, uint32_t where )
@@ -138,11 +142,15 @@ void RUNTIME_zlocality_onerestrict( cham_tasktype_t kernel, uint32_t where )
     case TASK_TPMQRT: cl_ztpmqrt_restrict_where( where ); break;
 
     /* LQ */
-   case TASK_GELQT:  cl_zgelqt_restrict_where( where ); break;
-   case TASK_TPLQT:  cl_ztplqt_restrict_where( where ); break;
-   case TASK_UNMLQ:  cl_zunmlq_restrict_where( where ); break;
-   case TASK_TPMLQT: cl_ztpmlqt_restrict_where( where ); break;
-
+    case TASK_GELQT:  cl_zgelqt_restrict_where( where ); break;
+    case TASK_TPLQT:  cl_ztplqt_restrict_where( where ); break;
+    case TASK_UNMLQ:  cl_zunmlq_restrict_where( where ); break;
+    case TASK_TPMLQT: cl_ztpmlqt_restrict_where( where ); break;
+
+    /* map */
+    case TASK_MAP_ONE: cl_map_one_restrict_where( where ); break;
+    case TASK_MAP_TWO: cl_map_two_restrict_where( where ); break;
+    case TASK_MAP_THREE: cl_map_three_restrict_where( where ); break;
     default:
       return;
     }
@@ -190,6 +198,10 @@ void RUNTIME_zlocality_allrestore( )
    cl_zunmlq_restore_where();
    cl_ztpmlqt_restore_where();
 
+    /* map */
+    cl_map_one_restore_where();
+    cl_map_two_restore_where();
+    cl_map_three_restore_where();
 }
 
 void RUNTIME_zlocality_onerestore( cham_tasktype_t kernel )
@@ -231,10 +243,15 @@ void RUNTIME_zlocality_onerestore( cham_tasktype_t kernel )
     case TASK_TPMQRT: cl_ztpmqrt_restore_where(); break;
 
     /* LQ */
-   case TASK_GELQT:  cl_zgelqt_restore_where(); break;
-   case TASK_TPLQT:  cl_ztplqt_restore_where(); break;
-   case TASK_UNMLQ:  cl_zunmlq_restore_where(); break;
-   case TASK_TPMLQT: cl_ztpmlqt_restore_where(); break;
+    case TASK_GELQT:  cl_zgelqt_restore_where(); break;
+    case TASK_TPLQT:  cl_ztplqt_restore_where(); break;
+    case TASK_UNMLQ:  cl_zunmlq_restore_where(); break;
+    case TASK_TPMLQT: cl_ztpmlqt_restore_where(); break;
+
+    /* map */
+    case TASK_MAP_ONE: cl_map_one_restore_where(); break;
+    case TASK_MAP_TWO: cl_map_two_restore_where(); break;
+    case TASK_MAP_THREE: cl_map_three_restore_where(); break;
 
     default:
       return;

runtime/starpu/include/runtime_codelet_z.h

@@ -143,6 +143,11 @@ CODELETS_HEADER(dlag2h);
 CODELETS_HEADER(hlag2d);
 #endif
 
+/* map */
+CODELETS_HEADER(map_one);
+CODELETS_HEADER(map_two);
+CODELETS_HEADER(map_three);
+
 struct cl_zgemm_args_s {
     cham_trans_t transA;
     cham_trans_t transB;