charmplusplus · JiakunYan · Sep 29, 2025
diff --git a/.clang-format b/.clang-format
@@ -1,6 +1,6 @@
 ---
 Language:        Cpp
-BasedOnStyle:   LLVM
+# BasedOnStyle:  LLVM
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
 AlignArrayOfStructures: None
@@ -36,29 +36,7 @@ AlignConsecutiveShortCaseStatements:
   Enabled:         false
   AcrossEmptyLines: false
   AcrossComments:  false
-  AlignCaseArrows: false
   AlignCaseColons: false
-AlignConsecutiveTableGenBreakingDAGArgColons:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
-AlignConsecutiveTableGenCondOperatorColons:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
-AlignConsecutiveTableGenDefinitionColons:
-  Enabled:         false
-  AcrossEmptyLines: false
-  AcrossComments:  false
-  AlignCompound:   false
-  AlignFunctionPointers: false
-  PadOperators:    false
 AlignEscapedNewlines: Right
 AlignOperands:   Align
 AlignTrailingComments:
@@ -68,7 +46,6 @@ AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowBreakBeforeNoexceptSpecifier: Never
 AllowShortBlocksOnASingleLine: Never
-AllowShortCaseExpressionOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortCompoundRequirementOnASingleLine: true
 AllowShortEnumsOnASingleLine: true
@@ -77,7 +54,9 @@ AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
 AttributeMacros:
   - __capability
 BinPackArguments: true
@@ -105,18 +84,15 @@ BraceWrapping:
 BreakAdjacentStringLiterals: true
 BreakAfterAttributes: Leave
 BreakAfterJavaFieldAnnotations: false
-BreakAfterReturnType: None
 BreakArrays:     true
 BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Attach
 BreakBeforeInlineASMColon: OnlyMultiline
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
-BreakFunctionDefinitionParameters: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
-BreakTemplateDeclarations: MultiLine
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
@@ -172,15 +148,12 @@ IntegerLiteralSeparator:
   HexMinDigits:    0
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
-KeepEmptyLines:
-  AtEndOfFile:     false
-  AtStartOfBlock:  true
-  AtStartOfFile:   true
+KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLinesAtEOF: false
 LambdaBodyIndentation: Signature
 LineEnding:      DeriveLF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
-MainIncludeChar: Quote
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
@@ -249,7 +222,6 @@ SpacesInLineCommentPrefix:
   Maximum:         -1
 SpacesInParens:  Never
 SpacesInParensOptions:
-  ExceptDoubleParentheses: false
   InCStyleCasts:   false
   InConditionalStatements: false
   InEmptyParentheses: false
@@ -261,7 +233,6 @@ StatementAttributeLikeMacros:
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
-TableGenBreakInsideDAGArg: DontBreak
 TabWidth:        8
 UseTab:          Never
 VerilogBreakBetweenInstancePorts: true

diff --git a/.github/workflows/clang-format.yaml b/.github/workflows/clang-format.yaml
@@ -21,10 +21,19 @@ jobs:
         sudo apt-get update
         sudo apt-get install clang-format
 
-    - name: Run clang-format
+    - name: Verify clang-format installation
       run: |
-        git diff --exit-code --ignore-submodules -- '*.cpp' '*.h' '*.c' '*.hpp'
-        if [ $? -ne 0 ]; then
-          echo "Clang-format failed. Please format your code."
+        clang-format --version
+
+    - name: Run clang-format on all files
+      run: |
+        # From anywhere inside the repo:
+        repo_root=$(git rev-parse --show-toplevel) && cd "$repo_root"
+        git ls-files -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' \
+        | xargs -0 -r clang-format -i
+
+        # Fail if formatting made changes
+        git diff --exit-code || {
+          echo "clang-format changed files above. Please commit the formatting."
           exit 1
-        fi
+        }
diff --git a/include/converse.h b/include/converse.h
@@ -302,7 +302,7 @@ int CmiMyRank();
 int CmiNumPes();
 int CmiNumNodes();
 // FIXME
-//#define CmiPhysicalNodeID(node) (node)
+// #define CmiPhysicalNodeID(node) (node)
 extern int CmiPhysicalNodeID(int pe);
 int CmiNodeOf(int pe);
 int CmiRankOf(int pe);
@@ -836,20 +836,20 @@ enum ncpyFreeNcpyOpInfoMode {
 #define CMK_SPANTREE_MAXSPAN 4
 #define CST_W (CMK_SPANTREE_MAXSPAN)
 #define CST_NN (CmiNumNodes())
-#define CmiNodeSpanTreeParent(n) ((n) ? (((n)-1) / CST_W) : (-1))
+#define CmiNodeSpanTreeParent(n) ((n) ? (((n) - 1) / CST_W) : (-1))
 #define CmiNodeSpanTreeChildren(n, c)                                          \
   do {                                                                         \
     int _i;                                                                    \
     for (_i = 0; _i < CST_W; _i++) {                                           \
-      int _x = (n)*CST_W + _i + 1;                                             \
+      int _x = (n) * CST_W + _i + 1;                                           \
       if (_x < CST_NN)                                                         \
         (c)[_i] = _x;                                                          \
     }                                                                          \
   } while (0)
 #define CmiNumNodeSpanTreeChildren(n)                                          \
   ((((n) + 1) * CST_W < CST_NN)                                                \
        ? CST_W                                                                 \
-       : ((((n)*CST_W + 1) >= CST_NN) ? 0 : ((CST_NN - 1) - (n)*CST_W)))
+       : ((((n) * CST_W + 1) >= CST_NN) ? 0 : ((CST_NN - 1) - (n) * CST_W)))
 #define CST_R(p) (CmiRankOf(p))
 #define CST_NF(n) (CmiNodeFirst(n))
 #define CST_SP(n) (CmiNodeSpanTreeParent(n))
@@ -920,63 +920,72 @@ void registerTraceInit(void (*fn)(char **argv));
 
 int CmiDeliverMsgs(int maxmsgs);
 
-#define CmiMemoryReadFence()                 std::atomic_thread_fence(std::memory_order_seq_cst)
-#define CmiMemoryWriteFence()                std::atomic_thread_fence(std::memory_order_seq_cst)
+#define CmiMemoryReadFence() std::atomic_thread_fence(std::memory_order_seq_cst)
+#define CmiMemoryWriteFence()                                                  \
+  std::atomic_thread_fence(std::memory_order_seq_cst)
 
 extern CmiNodeLock CmiMemLock_lock;
-#define CmiMemLock() do{if (CmiMemLock_lock) CmiLock(CmiMemLock_lock);} while (0)
+#define CmiMemLock()                                                           \
+  do {                                                                         \
+    if (CmiMemLock_lock)                                                       \
+      CmiLock(CmiMemLock_lock);                                                \
+  } while (0)
 
-#define CmiMemUnlock() do{if (CmiMemLock_lock) CmiUnlock(CmiMemLock_lock);} while (0)
+#define CmiMemUnlock()                                                         \
+  do {                                                                         \
+    if (CmiMemLock_lock)                                                       \
+      CmiUnlock(CmiMemLock_lock);                                              \
+  } while (0)
 
 template <typename T> struct CmiIsAtomic : std::false_type {};
 template <typename T> struct CmiIsAtomic<std::atomic<T>> : std::true_type {};
 
 template <typename T>
 typename std::enable_if<CmiIsAtomic<T>::value, typename T::value_type>::type
-CmiAtomicFetchAndIncImpl(T& input) {
-    return std::atomic_fetch_add(&input, typename T::value_type(1));
+CmiAtomicFetchAndIncImpl(T &input) {
+  return std::atomic_fetch_add(&input, typename T::value_type(1));
 }
 
 template <typename T>
 typename std::enable_if<!CmiIsAtomic<T>::value, T>::type
-CmiAtomicFetchAndIncImpl(T& input) {
-    T old = input;
-    ++input;
-    return old;
+CmiAtomicFetchAndIncImpl(T &input) {
+  T old = input;
+  ++input;
+  return old;
 }
 
-#define CmiMemoryAtomicFetchAndInc(input, output) ((output) = CmiAtomicFetchAndIncImpl(input))
+#define CmiMemoryAtomicFetchAndInc(input, output)                              \
+  ((output) = CmiAtomicFetchAndIncImpl(input))
 
 #define CmiEnableUrgentSend(yn) /* intentionally left empty */
 
 typedef struct CmmTableStruct *CmmTable;
 
 #define CmmWildCard (-1)
 
-//typedef void (*CmmPupMessageFn)(pup_er p,void **msg);
-//CmmTable CmmPup(pup_er p, CmmTable t, CmmPupMessageFn msgpup);
-
-CmmTable   CmmNew(void);
-void       CmmFree(CmmTable t);
-void	   CmmFreeAll(CmmTable t);
-void       CmmPut(CmmTable t, int ntags, int *tags, void *msg);
-void      *CmmFind(CmmTable t, int ntags, int *tags, int *returntags, int del);
-int        CmmEntries(CmmTable t);
-int 	   CmmGetLastTag(CmmTable t, int ntags, int *tags);
-#define    CmmGet(t,nt,tg,rt)   (CmmFind((t),(nt),(tg),(rt),1))
-#define    CmmProbe(t,nt,tg,rt) (CmmFind((t),(nt),(tg),(rt),0))
+// typedef void (*CmmPupMessageFn)(pup_er p,void **msg);
+// CmmTable CmmPup(pup_er p, CmmTable t, CmmPupMessageFn msgpup);
 
+CmmTable CmmNew(void);
+void CmmFree(CmmTable t);
+void CmmFreeAll(CmmTable t);
+void CmmPut(CmmTable t, int ntags, int *tags, void *msg);
+void *CmmFind(CmmTable t, int ntags, int *tags, int *returntags, int del);
+int CmmEntries(CmmTable t);
+int CmmGetLastTag(CmmTable t, int ntags, int *tags);
+#define CmmGet(t, nt, tg, rt) (CmmFind((t), (nt), (tg), (rt), 1))
+#define CmmProbe(t, nt, tg, rt) (CmmFind((t), (nt), (tg), (rt), 0))
 
 #ifndef CMI_CACHE_LINE_SIZE
 #ifdef __cpp_lib_hardware_interference_size
-# define CMI_CACHE_LINE_SIZE std::hardware_destructive_interference_size
+#define CMI_CACHE_LINE_SIZE std::hardware_destructive_interference_size
 #elif CMK_PPC64 || (defined __APPLE__ && defined __arm64__)
-# define CMI_CACHE_LINE_SIZE 128
+#define CMI_CACHE_LINE_SIZE 128
 #else
-# define CMI_CACHE_LINE_SIZE 64
+#define CMI_CACHE_LINE_SIZE 64
 #endif
 #endif
-//partitions
+// partitions
 
 typedef enum Partition_Type {
   PARTITION_SINGLETON,

diff --git a/src/barrier.h b/src/barrier.h
@@ -1,22 +1,21 @@
-// Acknowledgement: adopted from https://github.com/uiuc-hpc/lci/blob/master/lct/tbarrier/tbarrier.cpp
+// Acknowledgement: adopted from
+// https://github.com/uiuc-hpc/lci/blob/master/lct/tbarrier/tbarrier.cpp
 
-#include <iostream>
 #include <atomic>
+#include <iostream>
 #include <thread>
 
 class Barrier {
- private:
+private:
   alignas(64) std::atomic<int> waiting;
   alignas(64) std::atomic<int64_t> step;
   alignas(64) int thread_num_;
 
- public:
+public:
   explicit Barrier(int thread_num)
-      : waiting(0), step(0), thread_num_(thread_num)
-  {}
+      : waiting(0), step(0), thread_num_(thread_num) {}
 
-  int64_t arrive()
-  {
+  int64_t arrive() {
     int64_t mstep = step.load();
     if (++waiting == thread_num_) {
       waiting = 0;
@@ -27,13 +26,12 @@ class Barrier {
 
   bool test_ticket(int64_t ticket) { return ticket != step; }
 
-  void wait_ticket(int64_t ticket)
-  {
-    while (!test_ticket(ticket)) continue;
+  void wait_ticket(int64_t ticket) {
+    while (!test_ticket(ticket))
+      continue;
   }
 
-  void wait()
-  {
+  void wait() {
     int64_t ticket = arrive();
     wait_ticket(ticket);
   }

diff --git a/src/cldb.none.cpp b/src/cldb.none.cpp
@@ -25,9 +25,9 @@ void CldHandler(char *msg) {
             msg); // use priority queue when we add priority queue
 }
 
-void CldEnqueueGroup(CmiGroup grp, void *msg, int infofn)
-{
-  int len, queueing, priobits; unsigned int *prioptr;
+void CldEnqueueGroup(CmiGroup grp, void *msg, int infofn) {
+  int len, queueing, priobits;
+  unsigned int *prioptr;
   CldInfoFn ifn = (CldInfoFn)CmiHandlerToFunction(infofn);
   CldPackFn pfn;
   ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
@@ -36,7 +36,7 @@ void CldEnqueueGroup(CmiGroup grp, void *msg, int infofn)
     ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
   }
   CldSwitchHandler((char *)msg, CldHandlerIndex);
-  CmiSetInfo(msg,infofn);
+  CmiSetInfo(msg, infofn);
 
   CmiSyncMulticastAndFree(grp, len, msg);
 }

diff --git a/src/cldb.rand.cpp b/src/cldb.rand.cpp
@@ -103,9 +103,8 @@ void CldEnqueue(int pe, void *msg, int infofn) {
     /* CsdEnqueueGeneral is not thread or SIGIO safe */
     // CmiPrintf("   myself processor %d ==> %d, length=%d Timer:%f , priori=%d
     // \n", CmiMyPe(), pe, len, CmiWallTimer(), *prioptr);
-    //CsdEnqueueGeneral(msg, queueing, priobits, prioptr);
-    CmiPushPE(CmiMyPe(), len,
-              msg);
+    // CsdEnqueueGeneral(msg, queueing, priobits, prioptr);
+    CmiPushPE(CmiMyPe(), len, msg);
   } else {
     ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
     if (pfn && CmiNodeOf(pe) != CmiMyNode()) {