Skip to content

Cod 2092 collect toolchain information alongside run #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
GuillaumeLagrange wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Cod 2092 collect toolchain information alongside run #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f44d0ba
chore: fix clang compilation error
GuillaumeLagrange Mar 25, 2026
1b80f19
--wip-- [skip ci]
GuillaumeLagrange Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,25 @@ target_link_libraries(codspeed PRIVATE instrument_hooks)
# Version
add_compile_definitions(CODSPEED_VERSION="${CODSPEED_VERSION}")

# Collect compiler toolchain information for environment reporting
execute_process(
COMMAND ${CMAKE_CXX_COMPILER} --version
OUTPUT_VARIABLE CODSPEED_CXX_COMPILER_FULL_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
# Extract first line only
if(CODSPEED_CXX_COMPILER_FULL_VERSION)
string(REGEX REPLACE "\n.*" "" CODSPEED_CXX_COMPILER_FULL_VERSION "${CODSPEED_CXX_COMPILER_FULL_VERSION}")
endif()

target_compile_definitions(codspeed PRIVATE
CODSPEED_CXX_COMPILER_ID="${CMAKE_CXX_COMPILER_ID}"
CODSPEED_CXX_COMPILER_VERSION="${CMAKE_CXX_COMPILER_VERSION}"
CODSPEED_CXX_COMPILER_FULL_VERSION="${CODSPEED_CXX_COMPILER_FULL_VERSION}"
CODSPEED_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
)

# Specify the include directories for users of the library
target_include_directories(
codspeed
Expand Down
21 changes: 18 additions & 3 deletions core/include/measurement.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ inline bool measurement_is_instrumented() {
inline void measurement_set_metadata() {
std::string version = get_version();
instrument_hooks_set_integration(g_hooks, "codspeed-cpp", version.c_str());

// Report C++ toolchain information
#ifdef CODSPEED_CXX_COMPILER_ID
instrument_hooks_set_toolchain("cpp", "compiler_id", CODSPEED_CXX_COMPILER_ID);
#endif
#ifdef CODSPEED_CXX_COMPILER_VERSION
instrument_hooks_set_toolchain("cpp", "version", CODSPEED_CXX_COMPILER_VERSION);
#endif
#ifdef CODSPEED_CXX_COMPILER_FULL_VERSION
instrument_hooks_set_toolchain("cpp", "build", CODSPEED_CXX_COMPILER_FULL_VERSION);
#endif
#ifdef CODSPEED_BUILD_TYPE
instrument_hooks_set_toolchain("cpp", "build_type", CODSPEED_BUILD_TYPE);
#endif
instrument_hooks_write_environment();
}

ALWAYS_INLINE void measurement_start() {
Expand All @@ -54,9 +69,9 @@ ALWAYS_INLINE uint64_t measurement_current_timestamp() {
return instrument_hooks_current_timestamp();
}

ALWAYS_INLINE int8_t measurement_add_marker(uint8_t marker_type,
uint64_t timestamp) {
auto pid = getpid();
ALWAYS_INLINE uint8_t measurement_add_marker(uint8_t marker_type,
uint64_t timestamp) {
auto pid = static_cast<uint32_t>(getpid());
return instrument_hooks_add_marker(g_hooks, pid, marker_type, timestamp);
}

Expand Down
2 changes: 1 addition & 1 deletion core/instrument-hooks
Open in desktop
Submodule instrument-hooks updated 6 files
+17,092 −3,992 dist/core.c
+9 −0 includes/core.h
+7 −0 scripts/stub.c
+10 −0 src/c.zig
+231 −0 src/environment.zig
+1 −0 src/root.zig
Loading