Format and fix ci

Author: gbaraldi

.clang-format

@@ -0,0 +1,62 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+
+# Indentation
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+IndentCaseLabels: false
+NamespaceIndentation: None
+
+# Braces
+BreakBeforeBraces: Attach
+AllowShortBlocksOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+
+# Line length
+ColumnLimit: 100
+
+# Spaces
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpacesInAngles: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Alignment
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: true
+
+# Other
+AllowAllParametersOfDeclarationOnNextLine: true
+BinPackArguments: true
+BinPackParameters: true
+BreakConstructorInitializers: BeforeColon
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+PointerAlignment: Left
+IncludeBlocks: Preserve
+SortIncludes: false
+ReflowComments: true
+
+# Keep existing newlines in some cases
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: false
+---
+Language: C
+BasedOnStyle: LLVM
+IndentWidth: 4
+ColumnLimit: 100
+PointerAlignment: Left
+

.github/workflows/ci.yml

@@ -7,6 +7,14 @@ on:
     branches: [ main, master ]
 
 jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Check format
+      run: make format-check
+
   build-linux:
     runs-on: ubuntu-latest
     strategy:
@@ -118,7 +126,7 @@ jobs:
         submodules: recursive
 
     - name: Build with C++${{ matrix.std }}
-      run: make CXXFLAGS="-std=c++${{ matrix.std }} -Wall -Wextra -O2"
+      run: make CXXFLAGS="-std=c++${{ matrix.std }} -Wall -Wextra -Werror -O2"
 
     - name: Run tests
       run: make check

Makefile

@@ -16,7 +16,7 @@ CXX ?= g++
 AR ?= ar
 
 # Base flags
-CXXFLAGS ?= -std=c++17 -Wall -Wextra -O2
+CXXFLAGS ?= -std=c++17 -Wall -Wextra -Werror -O2
 INCLUDES = -I./include -I./extern/json/single_include
 
 # Platform-specific settings
@@ -94,9 +94,10 @@ examples: $(EXAMPLE_BINARIES) $(BINDIR)/c_api_example$(EXE_EXT)
 $(BINDIR)/%$(EXE_EXT): $(EXAMPLEDIR)/%.cpp $(STATIC_LIB)
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $< -L$(LIBDIR) -l$(LIB_NAME) $(LDFLAGS) -o $@
 
-# C example needs special handling (link with C++ runtime)
+# C example - compile as C, link with C++ runtime
 $(BINDIR)/c_api_example$(EXE_EXT): $(EXAMPLEDIR)/c_api_example.c $(STATIC_LIB)
-	$(CXX) $(CXXFLAGS) $(INCLUDES) $< -L$(LIBDIR) -l$(LIB_NAME) $(LDFLAGS) -o $@
+	$(CC) -Wall -Wextra -Werror -O2 $(INCLUDES) -c $< -o $(OBJDIR)/c_api_example.o
+	$(CXX) $(OBJDIR)/c_api_example.o -L$(LIBDIR) -l$(LIB_NAME) $(LDFLAGS) -o $@
 
 # Build tests
 tests: $(TEST_BINARIES)
@@ -168,5 +169,20 @@ regenerate-data:
 	@echo '#endif // ARCHSPEC_MICROARCHITECTURES_DATA_INC' >> $(SRCDIR)/microarchitectures_data.inc
 	@echo "Done!"
 
-.PHONY: all directories examples tests check run-examples clean install uninstall debug compile_commands regenerate-data
+# Source files for formatting
+FORMAT_SOURCES = $(shell find src include examples tests \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.c' \) 2>/dev/null)
+
+# Format source code
+format:
+	@echo "Formatting source files..."
+	@for f in $(FORMAT_SOURCES); do clang-format -i "$$f"; done
+	@echo "Done!"
+
+# Check formatting (for CI)
+format-check:
+	@echo "Checking format..."
+	@for f in $(FORMAT_SOURCES); do clang-format --dry-run --Werror "$$f" || exit 1; done
+	@echo "Format OK!"
+
+.PHONY: all directories examples tests check run-examples clean install uninstall debug compile_commands regenerate-data format format-check
 

examples/c_api_example.c

@@ -3,45 +3,45 @@
  * Example demonstrating the C API for archspec
  */
 
-#include <stdio.h>
 #include "archspec/archspec_c.h"
+#include <stdio.h>
 
 int main(void) {
     printf("=== archspec C API Example ===\n\n");
-    
+
     /* Host CPU information */
     const char* host_name = archspec_host_name();
     const char* host_vendor = archspec_host_vendor();
-    
+
     printf("Host CPU:\n");
     printf("  Name:   %s\n", host_name ? host_name : "(unknown)");
     printf("  Vendor: %s\n", host_vendor ? host_vendor : "(unknown)");
-    
+
     char* host_features = archspec_host_features();
     if (host_features) {
         printf("  Features: %s\n", host_features);
         archspec_free(host_features);
     }
-    
+
     /* Get optimization flags */
     char* gcc_flags = archspec_host_flags("gcc");
     if (gcc_flags) {
         printf("  GCC flags: %s\n", gcc_flags);
         archspec_free(gcc_flags);
     }
-    
+
     char* clang_flags = archspec_host_flags("clang");
     if (clang_flags) {
         printf("  Clang flags: %s\n", clang_flags);
         archspec_free(clang_flags);
     }
-    
+
     /* Check for specific features */
     printf("\nFeature checks:\n");
     printf("  Has SSE4.2: %s\n", archspec_host_has_feature("sse4_2") ? "yes" : "no");
     printf("  Has AVX2:   %s\n", archspec_host_has_feature("avx2") ? "yes" : "no");
     printf("  Has NEON:   %s\n", archspec_host_has_feature("neon") ? "yes" : "no");
-    
+
     /* Query a specific target */
     printf("\nHaswell features:\n");
     char* haswell_features = archspec_get_features("haswell");
@@ -51,32 +51,33 @@ int main(void) {
     } else {
         printf("  (not found)\n");
     }
-    
+
     char* haswell_flags = archspec_get_flags("haswell", "gcc");
     if (haswell_flags) {
         printf("  GCC flags: %s\n", haswell_flags);
         archspec_free(haswell_flags);
     }
-    
+
     /* List all targets */
     printf("\nKnown targets (%zu total):\n  ", archspec_target_count());
     size_t count = archspec_target_count();
     for (size_t i = 0; i < count && i < 10; i++) {
         const char* name = archspec_target_name(i);
         if (name) {
             printf("%s", name);
-            if (i < 9 && i < count - 1) printf(", ");
+            if (i < 9 && i < count - 1)
+                printf(", ");
         }
     }
-    if (count > 10) printf(", ... (%zu more)", count - 10);
+    if (count > 10)
+        printf(", ... (%zu more)", count - 10);
     printf("\n");
-    
+
     /* Check if a target exists */
     printf("\nTarget existence:\n");
     printf("  'skylake' exists: %s\n", archspec_target_exists("skylake") ? "yes" : "no");
     printf("  'zen4' exists:    %s\n", archspec_target_exists("zen4") ? "yes" : "no");
     printf("  'foobar' exists:  %s\n", archspec_target_exists("foobar") ? "yes" : "no");
-    
+
     return 0;
 }
-

examples/compiler_flags.cpp

@@ -10,60 +10,46 @@
 int main(int argc, char* argv[]) {
     std::cout << "=== archspec_cpp Compiler Flags ===" << std::endl;
     std::cout << std::endl;
-    
+
     // Targets to show flags for
     std::vector<std::string> targets;
-    
+
     if (argc > 1) {
         // Use command line arguments
         for (int i = 1; i < argc; ++i) {
             targets.push_back(argv[i]);
         }
     } else {
         // Default targets
-        targets = {
-            "x86_64",
-            "x86_64_v2",
-            "x86_64_v3",
-            "x86_64_v4",
-            "haswell",
-            "skylake",
-            "skylake_avx512",
-            "zen2",
-            "zen3",
-            "zen4",
-            "aarch64",
-            "neoverse_n1",
-            "neoverse_v2",
-            "m1",
-            "m2"
-        };
+        targets = {"x86_64",  "x86_64_v2",      "x86_64_v3",   "x86_64_v4", "haswell",
+                   "skylake", "skylake_avx512", "zen2",        "zen3",      "zen4",
+                   "aarch64", "neoverse_n1",    "neoverse_v2", "m1",        "m2"};
     }
-    
+
     // Compilers and versions to test
     std::vector<std::pair<std::string, std::string>> compilers = {
         {"gcc", "10.0"},
         {"gcc", "12.0"},
         {"clang", "12.0"},
         {"clang", "15.0"},
     };
-    
+
     for (const auto& target_name : targets) {
         const auto* target = archspec::get_target(target_name);
-        
+
         if (!target) {
             std::cout << target_name << ": NOT FOUND" << std::endl;
             continue;
         }
-        
+
         std::cout << "=== " << target_name << " ===" << std::endl;
         std::cout << "  Vendor: " << target->vendor() << std::endl;
         std::cout << "  Family: " << target->family() << std::endl;
         std::cout << std::endl;
-        
+
         for (const auto& [compiler, version] : compilers) {
             std::string flags = target->optimization_flags(compiler, version);
-            
+
             std::cout << "  " << std::setw(12) << std::left << (compiler + " " + version + ":");
             if (flags.empty()) {
                 std::cout << "(not supported)";
@@ -74,9 +60,8 @@ int main(int argc, char* argv[]) {
         }
         std::cout << std::endl;
     }
-    
+
     std::cout << "Usage: " << argv[0] << " [target1] [target2] ..." << std::endl;
-    
+
     return 0;
 }
-