Test build perf v2

BUILD.bazel

@@ -6,6 +6,7 @@ filegroup(
         [
             "src/snmalloc/**/*",
             "src/test/*.h",
+            "src/test/*.cc",
             "CMakeLists.txt",
         ],
     ),
@@ -39,6 +40,7 @@ CMAKE_FLAGS = {
     "SNMALLOC_USE_SELF_VENDORED_STL": "OFF",
     "SNMALLOC_IPO": "ON",
     "USE_SNMALLOC_STATS": "ON",
+    "SNMALLOC_BUILD_TESTING": "OFF",
 } | select({
     ":release_with_debug": {"CMAKE_BUILD_TYPE": "RelWithDebInfo"},
     ":release": {"CMAKE_BUILD_TYPE": "Release"},

CMakeLists.txt

@@ -479,6 +479,16 @@ if(NOT SNMALLOC_HEADER_ONLY_LIBRARY)
     set(TEST_CLEANUP ${SNMALLOC_CLEANUP})
   endif()
 
+  # Tests that only include snmalloc_testlib.h (no snmalloc.h or snmalloc_core.h).
+  # These are mitigation-independent and can be compiled once, then linked
+  # against both fast and check testlib variants.
+  set(TESTLIB_ONLY_TESTS
+    bits first_operation memory memory_usage multi_atexit multi_threadatexit
+    redblack statistics teardown
+    contention external_pointer large_alloc lotsofthreads post_teardown
+    singlethread startup
+  )
+
   function(make_tests TAG DEFINES)
     foreach(TEST_CATEGORY ${TEST_CATEGORIES})
       message(VERBOSE "Adding ${TAG}/${TEST_CATEGORY} tests")
@@ -488,7 +498,32 @@ if(NOT SNMALLOC_HEADER_ONLY_LIBRARY)
         aux_source_directory(${TESTDIR}/${TEST_CATEGORY}/${TEST} SRC)
         set(TESTNAME "${TEST_CATEGORY}-${TEST}-${TAG}")
 
-        add_executable(${TESTNAME} ${SRC})
+        # Check if this test is testlib-only (mitigation-independent).
+        # If so, compile the source once into an object library and reuse
+        # across flavours.
+        list(FIND TESTLIB_ONLY_TESTS ${TEST} _testlib_only_idx)
+        set(OBJLIBNAME "${TEST_CATEGORY}-${TEST}-obj")
+        if (NOT ${_testlib_only_idx} EQUAL -1 AND NOT TARGET ${OBJLIBNAME})
+          # First flavour to see this test creates the object library.
+          add_library(${OBJLIBNAME} OBJECT ${SRC})
+          target_link_libraries(${OBJLIBNAME} snmalloc)
+          target_compile_definitions(${OBJLIBNAME} PRIVATE "SNMALLOC_USE_${TEST_CLEANUP}")
+          add_warning_flags(${OBJLIBNAME})
+          if(SNMALLOC_SANITIZER)
+            target_compile_options(${OBJLIBNAME} PRIVATE -g -fsanitize=${SNMALLOC_SANITIZER} -fno-omit-frame-pointer)
+            if (${SNMALLOC_SANITIZER} MATCHES "thread")
+              target_compile_definitions(${OBJLIBNAME} PRIVATE SNMALLOC_THREAD_SANITIZER_ENABLED)
+            endif()
+          endif()
+        endif()
+
+        if (NOT ${_testlib_only_idx} EQUAL -1)
+          # Testlib-only: link the shared object library against this
+          # flavour's testlib.
+          add_executable(${TESTNAME} $<TARGET_OBJECTS:${OBJLIBNAME}>)
+        else()
+          add_executable(${TESTNAME} ${SRC})
+        endif()
 
         if(SNMALLOC_SANITIZER)
           target_compile_options(${TESTNAME} PRIVATE -g -fsanitize=${SNMALLOC_SANITIZER} -fno-omit-frame-pointer)
@@ -501,6 +536,10 @@ if(NOT SNMALLOC_HEADER_ONLY_LIBRARY)
         add_warning_flags(${TESTNAME})
 
         target_link_libraries(${TESTNAME} snmalloc)
+        # Link the pre-compiled test library into all tests.  For tests
+        # that include snmalloc.h directly the linker will simply discard
+        # the duplicate inline definitions (ODR-safe).
+        target_link_libraries(${TESTNAME} snmalloc-testlib-${TAG})
         target_compile_definitions(${TESTNAME} PRIVATE "SNMALLOC_USE_${TEST_CLEANUP}")
 
         if (NOT DEFINES STREQUAL " ")
@@ -538,6 +577,24 @@ if(NOT SNMALLOC_HEADER_ONLY_LIBRARY)
     endforeach()
   endfunction()
 
+  function(build_test_library TAG DEFINES)
+    set(LIBNAME snmalloc-testlib-${TAG})
+    add_library(${LIBNAME} STATIC src/test/snmalloc_testlib.cc)
+    target_link_libraries(${LIBNAME} PRIVATE snmalloc)
+    set_target_properties(${LIBNAME} PROPERTIES INTERFACE_LINK_LIBRARIES "")
+    target_compile_definitions(${LIBNAME} PRIVATE "SNMALLOC_USE_${TEST_CLEANUP}")
+    if (NOT DEFINES STREQUAL " ")
+      target_compile_definitions(${LIBNAME} PRIVATE ${DEFINES})
+    endif()
+    if(SNMALLOC_SANITIZER)
+      target_compile_options(${LIBNAME} PRIVATE -g -fsanitize=${SNMALLOC_SANITIZER} -fno-omit-frame-pointer)
+      if (${SNMALLOC_SANITIZER} MATCHES "thread")
+        target_compile_definitions(${LIBNAME} PRIVATE SNMALLOC_THREAD_SANITIZER_ENABLED)
+      endif()
+    endif()
+    add_warning_flags(${LIBNAME})
+  endfunction()
+
   if(NOT (DEFINED SNMALLOC_LINKER_FLAVOUR) OR ("${SNMALLOC_LINKER_FLAVOUR}" MATCHES "^$"))
     # Linker not specified externally; probe to see if we can make lld work
     set(CMAKE_REQUIRED_LINK_OPTIONS -fuse-ld=lld -Wl,--icf=all)
@@ -680,6 +737,7 @@ if(NOT SNMALLOC_HEADER_ONLY_LIBRARY)
         set(DEFINES " ")
       endif()
 
+      build_test_library(${FLAVOUR} ${DEFINES})
       make_tests(${FLAVOUR} ${DEFINES})
     endforeach()
   endif()
@@ -743,6 +801,7 @@ install(DIRECTORY src/snmalloc/ds_aal DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/ds_core DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/global DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/mem DESTINATION include/snmalloc)
+install(DIRECTORY src/snmalloc/mitigations DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/override DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/pal DESTINATION include/snmalloc)
 install(DIRECTORY src/snmalloc/stl DESTINATION include/snmalloc)

src/snmalloc/README.md

@@ -10,6 +10,9 @@ These are arranged in a hierarchy such that each of the directories may include
    This layer provides abstractions over CPU-specific intrinsics and defines things such as the virtual address-space size.
    There is a single AAL for an snmalloc instantiation.
  - `ds_aal/` provides data structures that depend on the AAL.
+ - `mitigations/` provides compile-time configuration for security mitigations.
+   This includes the `mitigations()` function (controlled by `SNMALLOC_CHECK_CLIENT`), mitigation-dependent allocator constants, and CHERI capability checks.
+   Layers below this (`ds_core/`, `aal/`, `ds_aal/`) are mitigation-independent, which allows code that only includes those layers to be compiled once regardless of mitigation settings.
  - `pal/` provides the platform abstraction layer (PAL).
    This exposes OS- or environment-specific abstractions into the rest of the code.
    An snmalloc instantiation may use more than one PAL, including ones provided by the user.

src/snmalloc/ds/ds.h

@@ -6,8 +6,10 @@
 #include "../ds_aal/ds_aal.h"
 #include "../pal/pal.h"
 #include "aba.h"
-#include "allocconfig.h"
 #include "combininglock.h"
 #include "entropy.h"
 #include "mpmcstack.h"
 #include "pagemap.h"
+#include "pool.h"
+#include "pooled.h"
+#include "sizeclasstable.h"

src/snmalloc/ds/mpmcstack.h

@@ -2,7 +2,6 @@
 
 #include "../ds_core/ds_core.h"
 #include "aba.h"
-#include "allocconfig.h"
 
 namespace snmalloc
 {

src/snmalloc/mem/pooled.h → src/snmalloc/ds/pooled.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../ds/ds.h"
-#include "backend_concept.h"
+#include "../mem/backend_concept.h"
 
 namespace snmalloc
 {