[clang-format] Possible regression in clang-format-22 ?

[prj-]

$ cat foo.c 
#define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
#define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
#define PETSC_NUM(...)                                                                                PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
#define PETSC_REST_HELPER_TWOORMORE(first, ...)                                                       , __VA_ARGS__

$ clang-format --style=file:clang-format.txt foo.c
#define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
#define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
#define PETSC_NUM(...)                                                                                PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
#define PETSC_REST_HELPER_TWOORMORE(first, ...)                                                       , __VA_ARGS__

$ clang-format-22 --style=file:clang-format.txt foo.c
#define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
#define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
#define PETSC_NUM(...)                          PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
#define PETSC_REST_HELPER_TWOORMORE(first, ...) , __VA_ARGS__
$ clang-format-22 --version
Debian clang-format version 22.0.0 (++20251023101038+4ec5852c1d9f-1~exp1~20251023221217.3185)

Is there a way to go back to the pre-22 behavior? clang-format.txt

[llvmbot]

@llvm/issue-subscribers-clang-format

Author: Pierre Jolivet (prj-)

```c $ cat foo.c #define PETSC_FIRST_ARG(args) PETSC_FIRST_ARG_ args #define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16 #define PETSC_NUM(...) PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway) #define PETSC_REST_HELPER_TWOORMORE(first, ...) , __VA_ARGS__ ```

$ clang-format --style=file:clang-format.txt foo.c
#define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
#define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
#define PETSC_NUM(...)                                                                                PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
#define PETSC_REST_HELPER_TWOORMORE(first, ...)                                                       , __VA_ARGS__

$ clang-format-22 --style=file:clang-format.txt foo.c
#define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
#define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
#define PETSC_NUM(...)                          PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
#define PETSC_REST_HELPER_TWOORMORE(first, ...) , __VA_ARGS__
$ clang-format-22 --version
Debian clang-format version 22.0.0 (++20251023101038+4ec5852c1d9f-1~exp1~20251023221217.3185)

Is there a way to go back to the pre-22 behavior? clang-format.txt

[owenca]

Bisected it to dd6a6ba. cc @HazardyKnusperkeks

[prj-]

BTW, here is the list of changes triggered by this possible regression.

diff --git a/include/petsc/mpiuni/mpi.h b/include/petsc/mpiuni/mpi.h
index 0e8c5134f24..10c5bc7b640 100644
--- a/include/petsc/mpiuni/mpi.h
+++ b/include/petsc/mpiuni/mpi.h
@@ -410,31 +410,31 @@ typedef int MPI_Fint;
 #define MPI_Op_f2c(op)     (MPI_Op)(op)
 #define MPI_Op_c2f(op)     (MPI_Fint)(op)
 
-#define MPI_Send_c                                                                              MPI_Send
-#define MPI_Send(buf, count, datatype, dest, tag, comm)                                         (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Recv_c                                                                              MPI_Recv
-#define MPI_Recv(buf, count, datatype, source, tag, comm, status)                               (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(source), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(status), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Get_count_c                                                                         MPI_Get_count
-#define MPI_Get_count(status, datatype, count)                                                  (MPIUNI_ARG(status), MPIUNI_ARG(datatype), MPIUNI_ARG(count), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Bsend(buf, count, datatype, dest, tag, comm)                                        (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Ssend(buf, count, datatype, dest, tag, comm)                                        (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Rsend(buf, count, datatype, dest, tag, comm)                                        (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Buffer_attach(buffer, size)                                                         (MPIUNI_ARG(buffer), MPIUNI_ARG(size), MPI_SUCCESS)
-#define MPI_Buffer_detach(buffer, size)                                                         (MPIUNI_ARG(buffer), MPIUNI_ARG(size), MPI_SUCCESS)
-#define MPI_Ibsend(buf, count, datatype, dest, tag, comm, request)                              (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Issend(buf, count, datatype, dest, tag, comm, request)                              (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Irsend(buf, count, datatype, dest, tag, comm, request)                              (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Irecv_c                                                                             MPI_Irecv
-#define MPI_Irecv(buf, count, datatype, source, tag, comm, request)                             (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(source), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Isend_c                                                                             MPI_Isend
-#define MPI_Isend(buf, count, datatype, dest, tag, comm, request)                               (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
-#define MPI_Wait(request, status)                                                               (MPIUNI_ARG(request), MPIUNI_ARG(status), MPI_SUCCESS)
-#define MPI_Test(request, flag, status)                                                         (MPIUNI_ARG(request), MPIUNI_ARG(status), *(flag) = 0, MPI_SUCCESS)
-#define MPI_Request_free(request)                                                               (MPIUNI_ARG(request), MPI_SUCCESS)
-#define MPI_Waitany(count, array_of_requests, index, status)                                    (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(status), (*(status)).MPI_SOURCE = 0, *(index) = 0, MPI_SUCCESS)
-#define MPI_Testany(a, b, c, d, e)                                                              (MPIUNI_ARG(a), MPIUNI_ARG(b), MPIUNI_ARG(c), MPIUNI_ARG(d), MPIUNI_ARG(e), MPI_SUCCESS)
-#define MPI_Waitall(count, array_of_requests, array_of_statuses)                                (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(array_of_statuses), MPI_SUCCESS)
-#define MPI_Testall(count, array_of_requests, flag, array_of_statuses)                          (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(flag), MPIUNI_ARG(array_of_statuses), MPI_SUCCESS)
+#define MPI_Send_c                                                     MPI_Send
+#define MPI_Send(buf, count, datatype, dest, tag, comm)                (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Recv_c                                                     MPI_Recv
+#define MPI_Recv(buf, count, datatype, source, tag, comm, status)      (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(source), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(status), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Get_count_c                                                MPI_Get_count
+#define MPI_Get_count(status, datatype, count)                         (MPIUNI_ARG(status), MPIUNI_ARG(datatype), MPIUNI_ARG(count), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Bsend(buf, count, datatype, dest, tag, comm)               (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Ssend(buf, count, datatype, dest, tag, comm)               (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Rsend(buf, count, datatype, dest, tag, comm)               (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Buffer_attach(buffer, size)                                (MPIUNI_ARG(buffer), MPIUNI_ARG(size), MPI_SUCCESS)
+#define MPI_Buffer_detach(buffer, size)                                (MPIUNI_ARG(buffer), MPIUNI_ARG(size), MPI_SUCCESS)
+#define MPI_Ibsend(buf, count, datatype, dest, tag, comm, request)     (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Issend(buf, count, datatype, dest, tag, comm, request)     (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Irsend(buf, count, datatype, dest, tag, comm, request)     (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Irecv_c                                                    MPI_Irecv
+#define MPI_Irecv(buf, count, datatype, source, tag, comm, request)    (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(source), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Isend_c                                                    MPI_Isend
+#define MPI_Isend(buf, count, datatype, dest, tag, comm, request)      (MPIUNI_ARG(buf), MPIUNI_ARG(count), MPIUNI_ARG(datatype), MPIUNI_ARG(dest), MPIUNI_ARG(tag), MPIUNI_ARG(comm), MPIUNI_ARG(request), MPIUni_Abort(MPI_COMM_WORLD, 0))
+#define MPI_Wait(request, status)                                      (MPIUNI_ARG(request), MPIUNI_ARG(status), MPI_SUCCESS)
+#define MPI_Test(request, flag, status)                                (MPIUNI_ARG(request), MPIUNI_ARG(status), *(flag) = 0, MPI_SUCCESS)
+#define MPI_Request_free(request)                                      (MPIUNI_ARG(request), MPI_SUCCESS)
+#define MPI_Waitany(count, array_of_requests, index, status)           (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(status), (*(status)).MPI_SOURCE = 0, *(index) = 0, MPI_SUCCESS)
+#define MPI_Testany(a, b, c, d, e)                                     (MPIUNI_ARG(a), MPIUNI_ARG(b), MPIUNI_ARG(c), MPIUNI_ARG(d), MPIUNI_ARG(e), MPI_SUCCESS)
+#define MPI_Waitall(count, array_of_requests, array_of_statuses)       (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(array_of_statuses), MPI_SUCCESS)
+#define MPI_Testall(count, array_of_requests, flag, array_of_statuses) (MPIUNI_ARG(count), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(flag), MPIUNI_ARG(array_of_statuses), MPI_SUCCESS)
 #define MPI_Waitsome(incount, array_of_requests, outcount, array_of_indices, array_of_statuses) (MPIUNI_ARG(incount), MPIUNI_ARG(array_of_requests), MPIUNI_ARG(outcount), MPIUNI_ARG(array_of_indices), MPIUNI_ARG(array_of_statuses), MPI_SUCCESS)
 #define MPI_Comm_group(comm, group)                                                             (MPIUNI_ARG(comm), *group = 1, MPI_SUCCESS)
 #define MPI_Group_excl(group, n, ranks, newgroup)                                               (MPIUNI_ARG(group), MPIUNI_ARG(n), MPIUNI_ARG(ranks), MPIUNI_ARG(newgroup), MPI_SUCCESS)
diff --git a/include/petscmacros.h b/include/petscmacros.h
index 3f97783e272..580052b42d9 100644
--- a/include/petscmacros.h
+++ b/include/petscmacros.h
@@ -1201,8 +1201,8 @@ static inline constexpr std::size_t PETSC_STATIC_ARRAY_LENGTH(const T &) noexcep
 #define PETSC_FIRST_ARG_(N, ...)                                                                      N
 #define PETSC_FIRST_ARG(args)                                                                         PETSC_FIRST_ARG_ args
 #define PETSC_SELECT_16TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, ...) a16
-#define PETSC_NUM(...)                                                                                PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
-#define PETSC_REST_HELPER_TWOORMORE(first, ...)                                                       , __VA_ARGS__
+#define PETSC_NUM(...)                          PETSC_SELECT_16TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
+#define PETSC_REST_HELPER_TWOORMORE(first, ...) , __VA_ARGS__
 #define PETSC_REST_HELPER_ONE(first)
 #define PETSC_REST_HELPER2(qty, ...) PETSC_REST_HELPER_##qty(__VA_ARGS__)
 #define PETSC_REST_HELPER(qty, ...)  PETSC_REST_HELPER2(qty, __VA_ARGS__)
diff --git a/src/dm/impls/plex/transform/impls/refine/tobox/plexreftobox.c b/src/dm/impls/plex/transform/impls/refine/tobox/plexreftobox.c
index 145236a8ece..02f1c7f1fe5 100644
--- a/src/dm/impls/plex/transform/impls/refine/tobox/plexreftobox.c
+++ b/src/dm/impls/plex/transform/impls/refine/tobox/plexreftobox.c
@@ -254,10 +254,10 @@ static PetscErrorCode DMPlexTransformCellRefine_ToBox(DMPlexTransform tr, DMPoly
   */
   static DMPolytopeType tsegT[] = {DM_POLYTOPE_SEGMENT, DM_POLYTOPE_QUADRILATERAL};
   static PetscInt       tsegS[] = {1, 2};
-  static PetscInt       tsegC[] = {DM_POLYTOPE_POINT, 1, 0, 0, DM_POLYTOPE_POINT, 1, 1, 0,
-                                   /* TODO  Fix these */
-                                   DM_POLYTOPE_SEGMENT, 1, 0, 0, DM_POLYTOPE_SEGMENT, 0, 0, DM_POLYTOPE_SEGMENT, 1, 1, 0, DM_POLYTOPE_SEGMENT, 1, 2, 0, DM_POLYTOPE_SEGMENT, 1, 0, 1, DM_POLYTOPE_SEGMENT, 1, 3, 0, DM_POLYTOPE_SEGMENT, 1, 1, 1, DM_POLYTOPE_SEGMENT, 0, 0};
-  static PetscInt       tsegO[] = {0, 0, 0, 0, -1, -1, 0, 0, -1, -1};
+  static PetscInt tsegC[] = {DM_POLYTOPE_POINT, 1, 0, 0, DM_POLYTOPE_POINT, 1, 1, 0,
+                             /* TODO  Fix these */
+                             DM_POLYTOPE_SEGMENT, 1, 0, 0, DM_POLYTOPE_SEGMENT, 0, 0, DM_POLYTOPE_SEGMENT, 1, 1, 0, DM_POLYTOPE_SEGMENT, 1, 2, 0, DM_POLYTOPE_SEGMENT, 1, 0, 1, DM_POLYTOPE_SEGMENT, 1, 3, 0, DM_POLYTOPE_SEGMENT, 1, 1, 1, DM_POLYTOPE_SEGMENT, 0, 0};
+  static PetscInt tsegO[] = {0, 0, 0, 0, -1, -1, 0, 0, -1, -1};
   /* Add 6 triangles inside every cell, making 4 new hexs
      The vertices of our reference tet are [(-1, -1, -1), (-1, 1, -1), (1, -1, -1), (-1, -1, 1)], which we call [v0, v1, v2, v3]. The first
      three edges are [v0, v1], [v1, v2], [v2, v0] called e0, e1, and e2, and then three edges to the top point [v0, v3], [v1, v3], [v2, v3]
diff --git a/src/mat/impls/aij/seq/seqcusparse/cusparsematimpl.h b/src/mat/impls/aij/seq/seqcusparse/cusparsematimpl.h
index 5a519387c62..ba7c75f05b2 100644
--- a/src/mat/impls/aij/seq/seqcusparse/cusparsematimpl.h
+++ b/src/mat/impls/aij/seq/seqcusparse/cusparsematimpl.h
@@ -134,12 +134,12 @@ const PetscScalar PETSC_CUSPARSE_ZERO = 0.0;
 #else /* PETSC_PKG_CUDA_VERSION_GE(11, 0, 0) */
   #if defined(PETSC_USE_COMPLEX)
     #if defined(PETSC_USE_REAL_SINGLE)
-      #define cusparse_csr_spmv(a, b, c, d, e, f, g, h, i, j, k, l, m)                        cusparseCcsrmv((a), (b), (c), (d), (e), (cuComplex *)(f), (g), (cuComplex *)(h), (i), (j), (cuComplex *)(k), (cuComplex *)(l), (cuComplex *)(m))
-      #define cusparse_csr_spmm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p)               cusparseCcsrmm((a), (b), (c), (d), (e), (f), (cuComplex *)(g), (h), (cuComplex *)(i), (j), (k), (cuComplex *)(l), (m), (cuComplex *)(n), (cuComplex *)(o), (p))
-      #define cusparse_csr2csc(a, b, c, d, e, f, g, h, i, j, k, l)                            cusparseCcsr2csc((a), (b), (c), (d), (cuComplex *)(e), (f), (g), (cuComplex *)(h), (i), (j), (k), (l))
-      #define cusparse_hyb_spmv(a, b, c, d, e, f, g, h)                                       cusparseChybmv((a), (b), (cuComplex *)(c), (d), (e), (cuComplex *)(f), (cuComplex *)(g), (cuComplex *)(h))
-      #define cusparse_csr2hyb(a, b, c, d, e, f, g, h, i, j)                                  cusparseCcsr2hyb((a), (b), (c), (d), (cuComplex *)(e), (f), (g), (h), (i), (j))
-      #define cusparse_hyb2csr(a, b, c, d, e, f)                                              cusparseChyb2csr((a), (b), (c), (cuComplex *)(d), (e), (f))
+      #define cusparse_csr_spmv(a, b, c, d, e, f, g, h, i, j, k, l, m)          cusparseCcsrmv((a), (b), (c), (d), (e), (cuComplex *)(f), (g), (cuComplex *)(h), (i), (j), (cuComplex *)(k), (cuComplex *)(l), (cuComplex *)(m))
+      #define cusparse_csr_spmm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) cusparseCcsrmm((a), (b), (c), (d), (e), (f), (cuComplex *)(g), (h), (cuComplex *)(i), (j), (k), (cuComplex *)(l), (m), (cuComplex *)(n), (cuComplex *)(o), (p))
+      #define cusparse_csr2csc(a, b, c, d, e, f, g, h, i, j, k, l)              cusparseCcsr2csc((a), (b), (c), (d), (cuComplex *)(e), (f), (g), (cuComplex *)(h), (i), (j), (k), (l))
+      #define cusparse_hyb_spmv(a, b, c, d, e, f, g, h)                         cusparseChybmv((a), (b), (cuComplex *)(c), (d), (e), (cuComplex *)(f), (cuComplex *)(g), (cuComplex *)(h))
+      #define cusparse_csr2hyb(a, b, c, d, e, f, g, h, i, j)                    cusparseCcsr2hyb((a), (b), (c), (d), (cuComplex *)(e), (f), (g), (h), (i), (j))
+      #define cusparse_hyb2csr(a, b, c, d, e, f)                                cusparseChyb2csr((a), (b), (c), (cuComplex *)(d), (e), (f))
       #define cusparse_csr_spgemm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) cusparseCcsrgemm(a, b, c, d, e, f, g, h, (cuComplex *)i, j, k, l, m, (cuComplex *)n, o, p, q, (cuComplex *)r, s, t)
       #define cusparse_csr_spgeam(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s)    cusparseCcsrgeam(a, b, c, (cuComplex *)d, e, f, (cuComplex *)g, h, i, (cuComplex *)j, k, l, (cuComplex *)m, n, o, p, (cuComplex *)q, r, s)
     #elif defined(PETSC_USE_REAL_DOUBLE)
diff --git a/src/mat/impls/aij/seq/seqhipsparse/hipsparsematimpl.h b/src/mat/impls/aij/seq/seqhipsparse/hipsparsematimpl.h
index e605cbbb878..75499782696 100644
--- a/src/mat/impls/aij/seq/seqhipsparse/hipsparsematimpl.h
+++ b/src/mat/impls/aij/seq/seqhipsparse/hipsparsematimpl.h
@@ -121,13 +121,13 @@ const PetscScalar PETSC_HIPSPARSE_ZERO = 0.0;
 
 #if defined(PETSC_USE_COMPLEX)
   #if defined(PETSC_USE_REAL_SINGLE)
-    #define hipsparse_scalartype                                                             HIP_C_32F
-    #define hipsparse_csr_spmv(a, b, c, d, e, f, g, h, i, j, k, l, m)                        hipsparseCcsrmv((a), (b), (c), (d), (e), (hipComplex *)(f), (g), (hipComplex *)(h), (i), (j), (hipComplex *)(k), (hipComplex *)(l), (hipComplex *)(m))
-    #define hipsparse_csr_spmm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p)               hipsparseCcsrmm((a), (b), (c), (d), (e), (f), (hipComplex *)(g), (h), (hipComplex *)(i), (j), (k), (hipComplex *)(l), (m), (hipComplex *)(n), (hipComplex *)(o), (p))
-    #define hipsparse_csr2csc(a, b, c, d, e, f, g, h, i, j, k, l)                            hipsparseCcsr2csc((a), (b), (c), (d), (hipComplex *)(e), (f), (g), (hipComplex *)(h), (i), (j), (k), (l))
-    #define hipsparse_hyb_spmv(a, b, c, d, e, f, g, h)                                       hipsparseChybmv((a), (b), (hipComplex *)(c), (d), (e), (hipComplex *)(f), (hipComplex *)(g), (hipComplex *)(h))
-    #define hipsparse_csr2hyb(a, b, c, d, e, f, g, h, i, j)                                  hipsparseCcsr2hyb((a), (b), (c), (d), (hipComplex *)(e), (f), (g), (h), (i), (j))
-    #define hipsparse_hyb2csr(a, b, c, d, e, f)                                              hipsparseChyb2csr((a), (b), (c), (hipComplex *)(d), (e), (f))
+    #define hipsparse_scalartype                                               HIP_C_32F
+    #define hipsparse_csr_spmv(a, b, c, d, e, f, g, h, i, j, k, l, m)          hipsparseCcsrmv((a), (b), (c), (d), (e), (hipComplex *)(f), (g), (hipComplex *)(h), (i), (j), (hipComplex *)(k), (hipComplex *)(l), (hipComplex *)(m))
+    #define hipsparse_csr_spmm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) hipsparseCcsrmm((a), (b), (c), (d), (e), (f), (hipComplex *)(g), (h), (hipComplex *)(i), (j), (k), (hipComplex *)(l), (m), (hipComplex *)(n), (hipComplex *)(o), (p))
+    #define hipsparse_csr2csc(a, b, c, d, e, f, g, h, i, j, k, l)              hipsparseCcsr2csc((a), (b), (c), (d), (hipComplex *)(e), (f), (g), (hipComplex *)(h), (i), (j), (k), (l))
+    #define hipsparse_hyb_spmv(a, b, c, d, e, f, g, h)                         hipsparseChybmv((a), (b), (hipComplex *)(c), (d), (e), (hipComplex *)(f), (hipComplex *)(g), (hipComplex *)(h))
+    #define hipsparse_csr2hyb(a, b, c, d, e, f, g, h, i, j)                    hipsparseCcsr2hyb((a), (b), (c), (d), (hipComplex *)(e), (f), (g), (h), (i), (j))
+    #define hipsparse_hyb2csr(a, b, c, d, e, f)                                hipsparseChyb2csr((a), (b), (c), (hipComplex *)(d), (e), (f))
     #define hipsparse_csr_spgemm(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) hipsparseCcsrgemm(a, b, c, d, e, f, g, h, (hipComplex *)i, j, k, l, m, (hipComplex *)n, o, p, q, (hipComplex *)r, s, t)
   // #define hipsparse_csr_spgeam(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s)    hipsparseCcsrgeam(a, b, c, (hipComplex *)d, e, f, (hipComplex *)g, h, i, (hipComplex *)j, k, l, (hipComplex *)m, n, o, p, (hipComplex *)q, r, s)
   #elif defined(PETSC_USE_REAL_DOUBLE)
diff --git a/src/vec/vec/tests/ex1k.kokkos.cxx b/src/vec/vec/tests/ex1k.kokkos.cxx
index 88f0149a88f..0cc26cff9bd 100644
--- a/src/vec/vec/tests/ex1k.kokkos.cxx
+++ b/src/vec/vec/tests/ex1k.kokkos.cxx
@@ -37,7 +37,7 @@ int main(int argc, char **argv)
   PetscLogDouble bandwidth;
   PetscMPIInt    size;
   PetscInt       Ns[] = {/* Use explicit sizes so that one can add sizes very close to 2^31 */
-                   128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912};
+                         128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912};
   n = nsamples = PETSC_STATIC_ARRAY_LENGTH(Ns);
 
   PetscFunctionBeginUser;

The very last changes (in src/vec/vec/tests/ex1k.kokkos.cxx) look nice, but it would be great to revert all others.

[HazardyKnusperkeks]

I'll have a look at it.

[HazardyKnusperkeks]

So the thing is, your before may look nicely, but it violates the ColumnLimit, your initial example hits column 302 of 250 allowed.

mpi.h reaches 263, plexreftobox.c 269, but even afterwards still 263, so either the .clang-format file does not match, or we have a bug in that regard? Didn't count the other examples, but I presume if you increase your ColumnLimit you're back at your old results.

So I remove the bug label, and would also remove the regression label, since this is more a result of a bug fix.

You can now:

• Increase your ColumnLimit, maybe only for some folders.
• Add // clang-format off.
• Request a feature to ignore the column limit for aligning macros. But I would speak against that.
• Request a feature for a separate column limit for preprocessor directives. That I could maybe get behind.
• Or live with the results. Maybe rearranging some of the defines will result in more to be aligned to the same level.

Btw. I'd prefer a way to get your .clang-format without downloading it. It is very small, you could've just added it in a code tag.

[prj-]

Thanks for your explanation. Feel free to close the issue if you don’t thing there is anything wrong with the MWE.