Skip to content

Update CMake rules. #549

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
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −13
Draft

Update CMake rules. #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions tcmalloc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,8 @@ tcmalloc_cc_library(
"tcmalloc::common_8k_pages"
"tcmalloc::internal_config"
"tcmalloc::internal_logging"
"tcmalloc::internal_memory_tag"
"tcmalloc::internal_system_allocator"
)

tcmalloc_cc_test(
Expand Down Expand Up @@ -1967,16 +1969,3 @@ tcmalloc_cc_library(
"absl::core_headers"
)

tcmalloc_cc_library(
NAME
tcmalloc_want_disable_span_lifetime_tracking
ALIAS
tcmalloc::want_disable_span_lifetime_tracking
SRCS
"want_disable_span_lifetime_tracking.cc"
COPTS
"-g0"
DEPS
"absl::core_headers"
)

8 changes: 8 additions & 0 deletions tcmalloc/tcmalloc_variants.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,14 @@ function(tcmalloc_cc_test_variants)
DEPS ${TCMALLOC_DEPS} $<LINK_LIBRARY:WHOLE_ARCHIVE,tcmalloc::tcmalloc,tcmalloc::common_8k_pages>
)
set_tests_properties(${TCMALLOC_NAME}_tcmalloc_madv_nohugepage_regions PROPERTIES ENVIRONMENT "BORG_EXPERIMENTS=TCMALLOC_SONIC_MADV_NOHUGEPAGE_REGIONS;TEST_TMPDIR=${CMAKE_CURRENT_BINARY_DIR};TEST_SRCDIR=${CMAKE_SOURCE_DIR}")
tcmalloc_cc_test(NAME ${TCMALLOC_NAME}_tcmalloc_madv_sampled_holdback
SRCS ${TCMALLOC_SRCS}
HDRS ${TCMALLOC_HDRS}
COPTS ${TCMALLOC_COPTS}
LINKOPTS ${TCMALLOC_LINKOPTS}
DEPS ${TCMALLOC_DEPS} $<LINK_LIBRARY:WHOLE_ARCHIVE,tcmalloc::tcmalloc,tcmalloc::common_8k_pages>
)
set_tests_properties(${TCMALLOC_NAME}_tcmalloc_madv_sampled_holdback PROPERTIES ENVIRONMENT "BORG_EXPERIMENTS=TCMALLOC_SONIC_MADVISE_SAMPLED_ALLOCATIONS_HOLDBACK;TEST_TMPDIR=${CMAKE_CURRENT_BINARY_DIR};TEST_SRCDIR=${CMAKE_SOURCE_DIR}")
endfunction()

function(tcmalloc_cc_binary_variants)
Expand Down
7 changes: 7 additions & 0 deletions tcmalloc/testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ tcmalloc_cc_library(
"absl::time"
"benchmark::benchmark"
"tcmalloc::internal_logging"
"tcmalloc::internal_parameter_accessors"
"tcmalloc::internal_percpu"
"tcmalloc::malloc_extension"
)
Expand Down Expand Up @@ -620,6 +621,7 @@ tcmalloc_cc_test_variants(
"tcmalloc::internal_logging"
"tcmalloc::internal_memory_stats"
"tcmalloc::malloc_extension"
"tcmalloc::testing_testutil"
)

tcmalloc_cc_test_variants(
Expand Down Expand Up @@ -774,6 +776,7 @@ tcmalloc_cc_test_variants(
"benchmark::benchmark"
"protobuf::libprotobuf"
"tcmalloc::internal_linked_list"
"tcmalloc::internal_parameter_accessors"
"tcmalloc::internal_profile_cc_proto"
"tcmalloc::malloc_extension"
"tcmalloc::profile_marshaler"
Expand Down Expand Up @@ -943,12 +946,16 @@ tcmalloc_cc_test_variants(
"absl::time"
"tcmalloc::internal_config"
"tcmalloc::internal_logging"
"tcmalloc::internal_memory_tag"
"tcmalloc::internal_page_size"
"tcmalloc::internal_profile_builder"
"tcmalloc::internal_profile_cc_proto"
"tcmalloc::internal_residency"
"tcmalloc::internal_sampled_allocation"
"tcmalloc::malloc_extension"
"tcmalloc::malloc_hook"
"tcmalloc::testing_test_allocator_harness"
"tcmalloc::testing_testutil"
"tcmalloc::testing_thread_manager"
)

Expand Down
Loading