[libc] Fix unit test dependency and respect LIBC_INCLUDE_BENCHMARKS#180812
Merged
[libc] Fix unit test dependency and respect LIBC_INCLUDE_BENCHMARKS#180812
Conversation
Summary: The unittest framework function is defined in another CMake file which may not be present if the uesr disabled tests, provide a smaller version here to keep this private. Also respesct the LIBC_INCLUDE_BENCHMARKS variable.
jhuber6
requested review from
SchrodingerZhu,
lntue,
michaelrj-google and
ronlieb
Member
|
@llvm/pr-subscribers-libc Author: Joseph Huber (jhuber6) ChangesSummary: 2 Files Affected:
diff --git a/libc/benchmarks/CMakeLists.txt b/libc/benchmarks/CMakeLists.txt
index c17cc106f96d7..65c7cd76fad29 100644
--- a/libc/benchmarks/CMakeLists.txt
+++ b/libc/benchmarks/CMakeLists.txt
@@ -1,10 +1,10 @@
-if(LIBC_TARGET_OS_IS_GPU)
- add_subdirectory(gpu)
+# The CPU build depends on Google benchmark.
+if(NOT LIBC_INCLUDE_BENCHMARKS)
return()
endif()
-# The CPU build depends on Google benchmark.
-if(NOT LIBC_INCLUDE_BENCHMARKS)
+if(LIBC_TARGET_OS_IS_GPU)
+ add_subdirectory(gpu)
return()
endif()
diff --git a/libc/benchmarks/gpu/CMakeLists.txt b/libc/benchmarks/gpu/CMakeLists.txt
index cf8c9902ca7f0..629e51c39dbb3 100644
--- a/libc/benchmarks/gpu/CMakeLists.txt
+++ b/libc/benchmarks/gpu/CMakeLists.txt
@@ -33,7 +33,49 @@ function(add_benchmark benchmark_name)
add_dependencies(gpu-benchmark ${fq_target_name})
endfunction(add_benchmark)
-add_unittest_framework_library(
+function(add_benchmark_framework_library name)
+ cmake_parse_arguments(
+ "TEST_LIB"
+ "" # No optional arguments
+ "" # No single value arguments
+ "SRCS;HDRS;DEPENDS" # Multi value arguments
+ ${ARGN}
+ )
+ if(NOT TEST_LIB_SRCS)
+ message(FATAL_ERROR "'add_benchmark_framework_library' requires SRCS; for "
+ "header only libraries, use 'add_header_library'")
+ endif()
+
+ foreach(lib IN ITEMS ${name}.hermetic)
+ add_library(
+ ${lib}
+ STATIC
+ EXCLUDE_FROM_ALL
+ ${TEST_LIB_SRCS}
+ ${TEST_LIB_HDRS}
+ )
+ target_include_directories(${lib} PRIVATE ${LIBC_SOURCE_DIR})
+ if(TARGET libc.src.time.clock)
+ target_compile_definitions(${lib} PRIVATE TARGET_SUPPORTS_CLOCK)
+ endif()
+ endforeach()
+
+ _get_hermetic_test_compile_options(compile_options "")
+ target_include_directories(${name}.hermetic PRIVATE ${LIBC_INCLUDE_DIR})
+ target_compile_options(${name}.hermetic PRIVATE ${compile_options} -nostdinc++)
+
+ if(TEST_LIB_DEPENDS)
+ foreach(dep IN ITEMS ${TEST_LIB_DEPENDS})
+ if(TARGET ${dep}.hermetic)
+ add_dependencies(${name}.hermetic ${dep}.hermetic)
+ else()
+ add_dependencies(${name}.hermetic ${dep})
+ endif()
+ endforeach()
+ endif()
+endfunction()
+
+add_benchmark_framework_library(
LibcGpuBenchmark
SRCS
LibcGpuBenchmark.cpp
|
ronlieb
pushed a commit
to ROCm/llvm-project
that referenced
this pull request
Feb 11, 2026
…lvm#180812) Summary: The unittest framework function is defined in another CMake file which may not be present if the uesr disabled tests, provide a smaller version here to keep this private. Also respesct the LIBC_INCLUDE_BENCHMARKS variable.
ronlieb
added a commit
to ROCm/llvm-project
that referenced
this pull request
Feb 11, 2026
#1414) …llvm#180812) Summary: The unittest framework function is defined in another CMake file which may not be present if the uesr disabled tests, provide a smaller version here to keep this private. Also respesct the LIBC_INCLUDE_BENCHMARKS variable. Co-authored-by: Joseph Huber <[email protected]>
github-project-automation
Bot
moved this from Needs Triage
to Done
in LLVM Release Status
Contributor
Author
|
/cherry-pick c9ee81a |
Member
|
/pull-request #181048 |
c-rhodes
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Feb 12, 2026
…lvm#180812) Summary: The unittest framework function is defined in another CMake file which may not be present if the uesr disabled tests, provide a smaller version here to keep this private. Also respesct the LIBC_INCLUDE_BENCHMARKS variable. (cherry picked from commit c9ee81a)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
The unittest framework function is defined in another CMake file which
may not be present if the uesr disabled tests, provide a smaller version
here to keep this private. Also respesct the LIBC_INCLUDE_BENCHMARKS
variable.