feat: add perf walltime support

Author: not-matthias

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    steps: 
+    steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
@@ -29,7 +29,7 @@ jobs:
           make -j
 
       - name: Run tests
-        run: | 
+        run: |
           cd core/build-tests
           GTEST_OUTPUT=json:test-results/ ctest
 
@@ -73,6 +73,8 @@ jobs:
       - name: Run the benchmarks
         uses: CodSpeedHQ/action@main
         if: matrix.codspeed-mode != 'off'
+        env:
+          CODSPEED_PERF_ENABLED: true
         with:
           run: examples/google_benchmark_cmake/build/benchmark_example
           token: ${{ secrets.CODSPEED_TOKEN }}
@@ -104,10 +106,12 @@ jobs:
       - name: Build and run benchmarks
         run: |
           bazel build //examples/google_benchmark_bazel:my_benchmark --//core:codspeed_mode=${{ matrix.codspeed-mode }}
-  
+
       - name: Run the benchmarks
         uses: CodSpeedHQ/action@main
         if: matrix.codspeed-mode != 'off'
+        env:
+          CODSPEED_PERF_ENABLED: true
         with:
           run: bazel run //examples/google_benchmark_bazel:my_benchmark --//core:codspeed_mode=${{ matrix.codspeed-mode }}
           token: ${{ secrets.CODSPEED_TOKEN }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "core/instrument-hooks"]
+	path = core/instrument-hooks
+	url = https://github.com/CodSpeedHQ/instrument-hooks

core/BUILD

@@ -3,6 +3,15 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 CODSPEED_VERSION = "1.1.1"
 
+# Define the instrument-hooks library separately to apply warning suppressions
+cc_library(
+    name = "instrument_hooks",
+    srcs = ["instrument-hooks/dist/core.c"],
+    hdrs = glob(["instrument-hooks/includes/*.h"]),
+    includes = ["instrument-hooks/includes"],
+    copts = ["-Wno-unused-variable", "-Wno-unused-parameter", "-Wno-unused-but-set-variable"],
+)
+
 # Define the codspeed library
 cc_library(
     name = "codspeed",
@@ -16,6 +25,7 @@ cc_library(
         ":walltime_mode": ["CODSPEED_ENABLED", "CODSPEED_WALLTIME"],
         "//conditions:default": [],
     }),
+    deps = [":instrument_hooks"],
     visibility = ["//visibility:public"],
 )
 

core/CMakeLists.txt

@@ -2,16 +2,34 @@ cmake_minimum_required(VERSION 3.10)
 
 set(CODSPEED_VERSION 1.1.1)
 
-project(codspeed VERSION ${CODSPEED_VERSION} LANGUAGES CXX)
+project(codspeed VERSION ${CODSPEED_VERSION} LANGUAGES CXX C)
 
 # Specify the C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # Add the include directory
 include_directories(include)
+include_directories(instrument-hooks/includes)
 
-# Add the library
+# Add the library 
+add_library(
+    instrument_hooks
+    instrument-hooks/dist/core.c
+)
+
+# Suppress warnings for the instrument_hooks library
+target_compile_options(
+    instrument_hooks
+    PRIVATE
+    -Wno-maybe-uninitialized
+    -Wno-unused-variable
+    -Wno-unused-parameter
+    -Wno-unused-but-set-variable
+    -Wno-type-limits
+)
+
+# Add the main library
 add_library(
     codspeed
     src/codspeed.cpp
@@ -20,13 +38,17 @@ add_library(
     src/workspace.cpp
 )
 
+# Link instrument_hooks to codspeed
+target_link_libraries(codspeed PRIVATE instrument_hooks)
+
 # Version
 add_compile_definitions(CODSPEED_VERSION="${CODSPEED_VERSION}")
 
 # Specify the include directories for users of the library
 target_include_directories(
     codspeed
     PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/instrument-hooks/includes>
 )
 
 # Disable valgrind compilation errors
@@ -116,7 +138,7 @@ install(
 )
 
 install(
-    TARGETS codspeed
+    TARGETS codspeed instrument_hooks
     EXPORT codspeed-targets
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

core/include/measurement.hpp

@@ -2,9 +2,26 @@
 #define MEASUREMENT_H
 
 #include <string>
+#ifdef _WIN32
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
 
 #include "callgrind.h"
 
+extern "C" {
+#include "core.h"
+}
+
+inline InstrumentHooks* get_hooks() {
+  static InstrumentHooks* g_hooks = nullptr;
+  if (!g_hooks) {
+    g_hooks = instrument_hooks_init();
+  }
+  return g_hooks;
+}
+
 inline std::string get_version() {
 #ifdef CODSPEED_VERSION
   return {CODSPEED_VERSION};
@@ -13,22 +30,40 @@ inline std::string get_version() {
 #endif
 }
 
-inline bool measurement_is_instrumented() { return RUNNING_ON_VALGRIND; }
+inline pid_t current_pid() {
+#ifdef _WIN32
+  return _getpid();
+#else
+  return getpid();
+#endif
+}
+
+inline bool measurement_is_instrumented() {
+  return instrument_hooks_is_instrumented(get_hooks());
+}
 
 inline void measurement_set_metadata() {
-  std::string metadata = "Metadata: codspeed-cpp " + get_version();
-  CALLGRIND_DUMP_STATS_AT(metadata.c_str());
+  std::string version = get_version();
+  instrument_hooks_set_integration(get_hooks(), "codspeed-cpp",
+                                   version.c_str());
 }
 
 __attribute__((always_inline)) inline void measurement_start() {
+  // Keep the callgrind macros here, so that they are properly inlined.
+  // Otherwise, we have an additional function call overhead to the
+  // instrument-hooks library.
   CALLGRIND_ZERO_STATS;
   CALLGRIND_START_INSTRUMENTATION;
+
+  instrument_hooks_start_benchmark(get_hooks());
 }
 
 __attribute__((always_inline)) inline void measurement_stop(
-    const std::string &name) {
+    const std::string& name) {
   CALLGRIND_STOP_INSTRUMENTATION;
-  CALLGRIND_DUMP_STATS_AT(name.c_str());
+
+  instrument_hooks_stop_benchmark(get_hooks());
+  instrument_hooks_executed_benchmark(get_hooks(), current_pid(), name.c_str());
 };
 
 #endif  // MEASUREMENT_H

core/instrument-hooks

@@ -92,7 +92,7 @@ set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
 set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
 set(pkg_config_main "${generated_dir}/${PROJECT_NAME}_main.pc")
 # TODO: Find a way to not expose codspeed headers to downstream users
-set(targets_to_export benchmark benchmark_main codspeed)
+set(targets_to_export benchmark benchmark_main codspeed instrument_hooks)
 set(targets_export_name "${PROJECT_NAME}Targets")
 
 set(namespace "${PROJECT_NAME}::")