test ci

Author: GuillaumeLagrange

.github/workflows/ci.yml

@@ -40,35 +40,6 @@ jobs:
           name: test_results
           path: ${{runner.workspace}}/core/build-tests/test/test-results/**/*.json
 
-  windows-build:
-    strategy:
-      matrix:
-        codspeed-mode: ["off", "walltime"]
-    runs-on: windows-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Cache build
-        uses: actions/cache@v3
-        with:
-          path: examples/google_benchmark_cmake/build
-          key: ${{ runner.os }}-build-${{ matrix.codspeed-mode }}-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - name: Create build directory
-        run: |
-          if (-not (Test-Path examples\google_benchmark_cmake\build)) {
-            mkdir examples\google_benchmark_cmake\build
-          }
-        shell: pwsh
-
-      - name: Build benchmark example
-        run: |
-          cd examples\google_benchmark_cmake\build
-          cmake -DCODSPEED_MODE=${{ matrix.codspeed-mode }} ..
-          cmake --build . --config Release
-        shell: pwsh
-
   cmake-integration-tests:
     strategy:
       matrix:
@@ -140,3 +111,55 @@ jobs:
         with:
           run: bazel run //examples/google_benchmark_bazel:my_benchmark --//core:codspeed_mode=${{ matrix.codspeed-mode }}
           token: ${{ secrets.CODSPEED_TOKEN }}
+
+  windows-cmake-build:
+    strategy:
+      matrix:
+        codspeed-mode: ["off", "walltime"]
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Cache build
+        uses: actions/cache@v3
+        with:
+          path: examples/google_benchmark_cmake/build
+          key: ${{ runner.os }}-build-${{ matrix.codspeed-mode }}-${{ hashFiles('**/CMakeLists.txt') }}
+
+      - name: Create build directory
+        run: |
+          if (-not (Test-Path examples\google_benchmark_cmake\build)) {
+            mkdir examples\google_benchmark_cmake\build
+          }
+        shell: pwsh
+
+      - name: Build benchmark example
+        run: |
+          cd examples\google_benchmark_cmake\build
+          cmake -DCODSPEED_MODE=${{ matrix.codspeed-mode }} ..
+          cmake --build . --config Release
+        shell: pwsh
+
+  windows-bazel-build:
+    strategy:
+      matrix:
+        codspeed-mode: ["off", "walltime"]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Bazel
+        uses: bazel-contrib/[email protected]
+        with:
+          # Avoid downloading Bazel every time.
+          bazelisk-cache: true
+          # Store build cache per workflow.
+          disk-cache: ${{ github.workflow }}
+          # Share repository cache between workflows.
+          repository-cache: true
+
+      - name: Build benchmark example
+        run: |
+          bazel build //examples/google_benchmark_bazel:my_benchmark --//core:codspeed_mode=${{ matrix.codspeed-mode }}
+        shell: pwsh

core/BUILD

@@ -3,12 +3,21 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 CODSPEED_VERSION = "1.1.1"
 
+config_setting(
+    name = "windows",
+    constraint_values = ["@platforms//os:windows"],
+)
+
 # Define the codspeed library
 cc_library(
     name = "codspeed",
     srcs = glob(["src/**/*.cpp"] + ["src/**/*.h"]),
     hdrs = glob(["include/**/*.h"] + ["include/**/*.hpp"]),
     includes = ["include"],
+    copts = select({
+        ":windows": ["/std:c++17"],
+        "//conditions:default": ["-std=c++17"],
+    }),
     defines = [
         "CODSPEED_VERSION=\\\"{}\\\"".format(CODSPEED_VERSION),
     ] + select({

core/include/codspeed.h

@@ -34,7 +34,7 @@ class CodSpeed {
 struct RawWalltimeBenchmark {
   std::string name;
   std::string uri;
-  int64_t iter_per_round;
+  uint64_t iter_per_round;
   double mean_ns;
   double median_ns;
   double stdev_ns;

core/src/walltime.cpp

@@ -32,7 +32,7 @@ struct BenchmarkStats {
   double total_time;
   uint64_t iqr_outlier_rounds;
   uint64_t stdev_outlier_rounds;
-  int64_t iter_per_round;
+  uint64_t iter_per_round;
   uint64_t warmup_iters;
 };
 

core/src/workspace.cpp

@@ -9,6 +9,8 @@ namespace codspeed {
 
 std::string safe_getenv(const char* var_name) {
 #ifdef _WIN32
+  // On Windows, use _dupenv_s instead of std::getenv for thread safety
+  // and to avoid issues with buffer ownership
   char* value;
   size_t len;
   errno_t err = _dupenv_s(&value, &len, var_name);

examples/google_benchmark_bazel/BUILD.bazel

@@ -1,7 +1,15 @@
+config_setting(
+    name = "windows",
+    constraint_values = ["@platforms//os:windows"],
+)
+
 cc_binary(
     name = "my_benchmark",
     srcs = glob(["*.cpp", "*.hpp"]),
-    copts = ["-Wall", "-Wextra", "-Werror"],
+    copts = select({
+        ":windows": ["/std:c++17", "/W4", "/WX"],
+        "//conditions:default": ["-Wall", "-Wextra", "-Werror"],
+    }),
     deps = [
         "//google_benchmark:benchmark",
     ],

examples/google_benchmark_cmake/CMakeLists.txt

@@ -1,24 +1,34 @@
 cmake_minimum_required(VERSION 3.12)
 include(FetchContent)
 
-project(codspeed_picobench_compat VERSION 0.0.0 LANGUAGES CXX)
+project(codspeed_google_benchmark_example VERSION 0.0.0 LANGUAGES CXX)
 
 # Treat warnings as errors
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     add_compile_options(-Wall -Wextra -Werror)
 elseif(MSVC)
-    add_compile_options(/W4 /WX 
-        /wd5051  # Ignore [[maybe_unused]] C++17 warnings from Google Benchmark
-        /wd4038  # Ignore STL <filesystem> C++17 warnings
+    # Set C++17 standard
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+    add_compile_options(
+        /W4
+        /WX
+        /wd5051 # Ignore [[maybe_unused]] C++17 warnings from Google Benchmark
+        /wd4038 # Ignore STL <filesystem> C++17 warnings
     )
 endif()
 
 # On the small benchmarks of this repo, most of the benches will be optimized out, but this is expected.
 set(CMAKE_BUILD_TYPE RelWithDebInfo)
 
-# Disable Google Benchmark tests
-set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Enable testing of the benchmark library." FORCE)
-set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Enable testing of the benchmark library." FORCE)
+# Disable Google Benchmark tests for examples
+set(BENCHMARK_ENABLE_GTEST_TESTS
+    OFF
+    CACHE BOOL
+    "Enable testing of the benchmark library."
+    FORCE
+)
 
 FetchContent_Declare(
     google_benchmark

google_benchmark/include/benchmark/benchmark.h

@@ -185,10 +185,10 @@ BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
 
 #ifdef CODSPEED_ENABLED
 #include <codspeed.h>
-#include <measurement.hpp>
 
 #include <filesystem>
-#endif // CODSPEED_ENABLED
+#include <measurement.hpp>
+#endif  // CODSPEED_ENABLED
 
 #if defined(_MSC_VER)
 #include <intrin.h>  // for _ReadWriteBarrier
@@ -947,7 +947,7 @@ class BENCHMARK_EXPORT BENCHMARK_INTERNAL_CACHELINE_ALIGNED State {
  public:
   const IterationCount max_iterations;
 #ifdef CODSPEED_INSTRUMENTATION
-  codspeed::CodSpeed *codspeed_;
+  codspeed::CodSpeed* codspeed_;
 #endif
 
  private:
@@ -970,11 +970,11 @@ class BENCHMARK_EXPORT BENCHMARK_INTERNAL_CACHELINE_ALIGNED State {
         internal::ThreadTimer* timer, internal::ThreadManager* manager,
         internal::PerfCountersMeasurement* perf_counters_measurement,
         ProfilerManager* profiler_manager
-  #ifdef CODSPEED_INSTRUMENTATION
+#ifdef CODSPEED_INSTRUMENTATION
         ,
-        codspeed::CodSpeed *codspeed = NULL
-  #endif
-        );
+        codspeed::CodSpeed* codspeed = NULL
+#endif
+  );
 
   void StartKeepRunning();
   // Implementation of KeepRunning() and KeepRunningBatch().
@@ -1459,27 +1459,18 @@ class Fixture : public internal::Benchmark {
 #define BENCHMARK_PRIVATE_CONCAT_NAME(BaseClass, Method) \
   BaseClass##_##Method##_Benchmark
 
-#ifdef _MSC_VER
-#define BENCHMARK_PRIVATE_DECLARE(n)                                           \
-  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */                           \
-  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME( \
-      n)
-#else
-#define BENCHMARK_PRIVATE_DECLARE(n)                                           \
-  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */                           \
-  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME( \
-      n) [[maybe_unused]]
-#endif
+#define BENCHMARK_PRIVATE_DECLARE(n)                 \
+  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */ \
+  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME(n)
 
 #ifdef CODSPEED_ENABLED
-#define CUR_FILE \
-  codspeed::get_path_relative_to_workspace(__FILE__) + "::"
+#define CUR_FILE codspeed::get_path_relative_to_workspace(__FILE__) + "::"
 #ifdef _MSC_VER
-#define NAMESPACE std::string("")
-#else
+// TODO: __PRETTY_FUNCTION__ is not available in MSVC and we dont support
+#define __PRETTY_FUNCTION__ "unsupported"
+#endif
 #define NAMESPACE \
   (([]() { return codspeed::extract_lambda_namespace(__PRETTY_FUNCTION__); })())
-#endif
 #define STATIC_NAMESPACE_STRING(name) static std::string name = NAMESPACE;
 
 #define FILE_AND_NAMESPACE CUR_FILE + NAMESPACE
@@ -1618,12 +1609,12 @@ class Fixture : public internal::Benchmark {
 #ifdef CODSPEED_ENABLED
 
 #define BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method)        \
-    STATIC_NAMESPACE_STRING(ns_##BaseClass##_##Method);         \
+  STATIC_NAMESPACE_STRING(ns_##BaseClass##_##Method);         \
   class BaseClass##_##Method##_Benchmark : public BaseClass { \
    public:                                                    \
     BaseClass##_##Method##_Benchmark() {                      \
       this->SetName(CUR_FILE + ns_##BaseClass##_##Method +    \
-                    #Method "[" #BaseClass "]");                  \
+                    #Method "[" #BaseClass "]");              \
     }                                                         \
                                                               \
    protected:                                                 \
@@ -1669,7 +1660,7 @@ class Fixture : public internal::Benchmark {
     void BenchmarkCase(::benchmark::State&) override;                      \
   };
 
-#else // CODSPEED_ENABLED undefined:
+#else  // CODSPEED_ENABLED undefined:
 
 #define BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method)        \
   class BaseClass##_##Method##_Benchmark : public BaseClass { \