Minor name change in `fmpi_task_generic.h`

include/internal/generic/fmpi_task_generic.h

@@ -73,18 +73,18 @@ _Pragma("GCC diagnostic warning \"-Wincompatible-pointer-types\"")\
         return futhark_entry_##FUNC(ctx, out, FMPI_PRIV_TASK_ARGS_##N(args_in));  \
     }
 
-#define FMPI_TASK_REGISTER_IMPL(ctx, func, stencil, ...) \
-    FMPI_PRIV_TASK_CONCAT(FMPI_TASK_REGISTER_, CPL_ARG_COUNT(__VA_ARGS__)) \
-    (ctx, func, stencil,__VA_ARGS__)
+#define FMPI_TASK_REGISTER_IMPL(ctx, FUNC, stencil, ...) \
+    FMPI_PRIV_TASK_CONCAT(FMPI_PRIV_TASK_REGISTER_, CPL_ARG_COUNT(__VA_ARGS__)) \
+    (FUNC, ctx, stencil ,__VA_ARGS__)
 
-#define FMPI_TASK_REGISTER_1(ctx, func, stencil, arg_out) \
-    fmpi_task_register((ctx), func##_0, #func, stencil, &(struct fmpi_task_args){ \
+#define FMPI_PRIV_TASK_REGISTER_1(FUNC, ctx, stencil, arg_out) \
+    fmpi_task_register((ctx), FUNC##_0, #FUNC, (stencil), &(struct fmpi_task_args){ \
         .out = (arg_out), \
         .cnt = 0 \
     })
 
-#define FMPI_TASK_REGISTER_N(N, ctx, func, stencil, arg_out, ...) \
-    fmpi_task_register((ctx), func##_##N, #func, stencil, &(struct fmpi_task_args){ \
+#define FMPI_PRIV_TASK_REGISTER_N(N, FUNC, ctx, stencil, arg_out, ...) \
+    fmpi_task_register((ctx), FUNC##_##N, #FUNC, (stencil), &(struct fmpi_task_args){ \
         .in = {__VA_ARGS__}, \
         .out = (arg_out), \
         .cnt = N \
@@ -123,38 +123,38 @@ _Pragma("GCC diagnostic warning \"-Wincompatible-pointer-types\"")\
 #define FMPI_PRIV_TASK_ARGS_31(args_in) FMPI_PRIV_TASK_ARGS_30(args_in), (args_in)[30].start
 #define FMPI_PRIV_TASK_ARGS_32(args_in) FMPI_PRIV_TASK_ARGS_31(args_in), (args_in)[31].start
 
-#define FMPI_TASK_REGISTER_2(...)  FMPI_TASK_REGISTER_N(1, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_3(...)  FMPI_TASK_REGISTER_N(2, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_4(...)  FMPI_TASK_REGISTER_N(3, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_5(...)  FMPI_TASK_REGISTER_N(4, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_6(...)  FMPI_TASK_REGISTER_N(5, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_7(...)  FMPI_TASK_REGISTER_N(6, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_8(...)  FMPI_TASK_REGISTER_N(7, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_9(...)  FMPI_TASK_REGISTER_N(8, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_10(...) FMPI_TASK_REGISTER_N(9, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_11(...) FMPI_TASK_REGISTER_N(10, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_12(...) FMPI_TASK_REGISTER_N(11, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_13(...) FMPI_TASK_REGISTER_N(12, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_14(...) FMPI_TASK_REGISTER_N(13, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_15(...) FMPI_TASK_REGISTER_N(14, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_16(...) FMPI_TASK_REGISTER_N(15, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_17(...) FMPI_TASK_REGISTER_N(16, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_18(...) FMPI_TASK_REGISTER_N(17, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_19(...) FMPI_TASK_REGISTER_N(18, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_20(...) FMPI_TASK_REGISTER_N(19, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_21(...) FMPI_TASK_REGISTER_N(20, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_22(...) FMPI_TASK_REGISTER_N(21, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_23(...) FMPI_TASK_REGISTER_N(22, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_24(...) FMPI_TASK_REGISTER_N(23, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_25(...) FMPI_TASK_REGISTER_N(24, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_26(...) FMPI_TASK_REGISTER_N(25, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_27(...) FMPI_TASK_REGISTER_N(26, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_28(...) FMPI_TASK_REGISTER_N(27, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_29(...) FMPI_TASK_REGISTER_N(28, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_30(...) FMPI_TASK_REGISTER_N(29, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_31(...) FMPI_TASK_REGISTER_N(30, __VA_ARGS__)
-#define FMPI_TASK_REGISTER_32(...) FMPI_TASK_REGISTER_N(31, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_2(...)  FMPI_PRIV_TASK_REGISTER_N(1, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_3(...)  FMPI_PRIV_TASK_REGISTER_N(2, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_4(...)  FMPI_PRIV_TASK_REGISTER_N(3, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_5(...)  FMPI_PRIV_TASK_REGISTER_N(4, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_6(...)  FMPI_PRIV_TASK_REGISTER_N(5, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_7(...)  FMPI_PRIV_TASK_REGISTER_N(6, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_8(...)  FMPI_PRIV_TASK_REGISTER_N(7, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_9(...)  FMPI_PRIV_TASK_REGISTER_N(8, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_10(...) FMPI_PRIV_TASK_REGISTER_N(9, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_11(...) FMPI_PRIV_TASK_REGISTER_N(10, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_12(...) FMPI_PRIV_TASK_REGISTER_N(11, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_13(...) FMPI_PRIV_TASK_REGISTER_N(12, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_14(...) FMPI_PRIV_TASK_REGISTER_N(13, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_15(...) FMPI_PRIV_TASK_REGISTER_N(14, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_16(...) FMPI_PRIV_TASK_REGISTER_N(15, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_17(...) FMPI_PRIV_TASK_REGISTER_N(16, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_18(...) FMPI_PRIV_TASK_REGISTER_N(17, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_19(...) FMPI_PRIV_TASK_REGISTER_N(18, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_20(...) FMPI_PRIV_TASK_REGISTER_N(19, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_21(...) FMPI_PRIV_TASK_REGISTER_N(20, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_22(...) FMPI_PRIV_TASK_REGISTER_N(21, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_23(...) FMPI_PRIV_TASK_REGISTER_N(22, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_24(...) FMPI_PRIV_TASK_REGISTER_N(23, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_25(...) FMPI_PRIV_TASK_REGISTER_N(24, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_26(...) FMPI_PRIV_TASK_REGISTER_N(25, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_27(...) FMPI_PRIV_TASK_REGISTER_N(26, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_28(...) FMPI_PRIV_TASK_REGISTER_N(27, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_29(...) FMPI_PRIV_TASK_REGISTER_N(28, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_30(...) FMPI_PRIV_TASK_REGISTER_N(29, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_31(...) FMPI_PRIV_TASK_REGISTER_N(30, __VA_ARGS__)
+#define FMPI_PRIV_TASK_REGISTER_32(...) FMPI_PRIV_TASK_REGISTER_N(31, __VA_ARGS__)
 /*==============================================================================
     GUARD
 ==============================================================================*/
-#endif // FMPI_TASK_GENERIC_H_20220515003504
+#endif // FMPI_PRIV_TASK_GENERIC_H_20220515003504