chore: test

Author: GuillaumeLagrange

.github/workflows/ci.yml

@@ -56,7 +56,10 @@ jobs:
           key: ${{ runner.os }}-build-${{ matrix.codspeed-mode }}-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: Create build directory
-        run: mkdir examples\google_benchmark_cmake\build
+        run: |
+          if (-not (Test-Path examples\google_benchmark_cmake\build)) {
+            mkdir examples\google_benchmark_cmake\build
+          }
         shell: pwsh
 
       - name: Build benchmark example

core/include/codspeed.h

@@ -1,6 +1,7 @@
 #ifndef CODSPEED_H
 #define CODSPEED_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -33,7 +34,7 @@ class CodSpeed {
 struct RawWalltimeBenchmark {
   std::string name;
   std::string uri;
-  long iter_per_round;
+  int64_t iter_per_round;
   double mean_ns;
   double median_ns;
   double stdev_ns;

core/src/walltime.cpp

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

examples/google_benchmark_cmake/CMakeLists.txt

@@ -6,12 +6,16 @@ project(codspeed_picobench_compat 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)
 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)
 
-option(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+# 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)
 
 FetchContent_Declare(
     google_benchmark

google_benchmark/include/benchmark/benchmark.h

@@ -1459,16 +1459,27 @@ 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
 
 #ifdef CODSPEED_ENABLED
 #define CUR_FILE \
   codspeed::get_path_relative_to_workspace(__FILE__) + "::"
+#ifdef _MSC_VER
+#define NAMESPACE std::string("")
+#else
 #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