Phase 5 E4-2: Malloc Wrapper ENV Snapshot (+21.83% GO, ADOPTED)

Target: Consolidate malloc wrapper TLS reads + eliminate function calls
- malloc (16.13%) + tiny_alloc_gate_fast (19.50%) = 35.63% combined
- Strategy: E4-1 success pattern + function call elimination

Implementation:
- ENV gate: HAKMEM_MALLOC_WRAPPER_ENV_SNAPSHOT=0/1 (default 0)
- core/box/malloc_wrapper_env_snapshot_box.{h,c}: New box
  - Consolidates multiple TLS reads → 1 TLS read
  - Pre-caches tiny_max_size() == 256 (eliminates function call)
  - Lazy init with probe window (bench_profile putenv sync)
- core/box/hak_wrappers.inc.h: Integration in malloc() wrapper
- Makefile: Add malloc_wrapper_env_snapshot_box.o to all targets

A/B Test Results (Mixed, 10-run, 20M iters):
- Baseline (SNAPSHOT=0): 35.74M ops/s (mean), 35.75M ops/s (median)
- Optimized (SNAPSHOT=1): 43.54M ops/s (mean), 43.92M ops/s (median)
- Improvement: +21.83% mean, +22.86% median (+7.80M ops/s)

Decision: GO (+21.83% >> +1.0% threshold, 21.8x over)
- Why 6.2x better than E4-1 (+3.51%)?
  - Higher malloc call frequency (allocation-heavy workload)
  - Function call elimination (tiny_max_size pre-cached)
  - Larger target: 35.63% vs free's 25.26%
- Health check: PASS (all profiles)
- Action: PROMOTED to MIXED_TINYV3_C7_SAFE preset

Phase 5 Cumulative (estimated):
- E1 (ENV Snapshot): +3.92%
- E4-1 (Free Wrapper Snapshot): +3.51%
- E4-2 (Malloc Wrapper Snapshot): +21.83%
- Estimated combined: ~+30% (needs validation)

Next Steps:
- Combined A/B test (E4-1 + E4-2 simultaneously)
- Measure actual cumulative effect
- Profile new baseline for next optimization targets

Deliverables:
- docs/analysis/PHASE5_E4_2_MALLOC_WRAPPER_ENV_SNAPSHOT_1_DESIGN.md
- docs/analysis/PHASE5_E4_2_MALLOC_WRAPPER_ENV_SNAPSHOT_1_AB_TEST_RESULTS.md
- docs/analysis/PHASE5_E4_2_MALLOC_WRAPPER_ENV_SNAPSHOT_NEXT_INSTRUCTIONS.md
- docs/analysis/PHASE5_E4_COMBINED_AB_TEST_NEXT_INSTRUCTIONS.md (next)
- docs/analysis/ENV_PROFILE_PRESETS.md (E4-2 added)
- CURRENT_TASK.md (E4-2 complete)
- core/bench_profile.h (E4-2 promoted to default)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Moe Charm (CI)
2025-12-14 05:13:29 +09:00
parent 4a070d8a14
commit 5528612f2a
12 changed files with 751 additions and 54 deletions

View File

@ -37,6 +37,7 @@ void* realloc(void* ptr, size_t size) {
#include "wrapper_env_box.h" // Wrapper env cache (step trace / LD safe / free trace)
#include "wrapper_env_cache_box.h" // Phase 3 D2: TLS cache for wrapper_env_cfg pointer
#include "free_wrapper_env_snapshot_box.h" // Phase 5 E4-1: Free wrapper ENV snapshot
#include "malloc_wrapper_env_snapshot_box.h" // Phase 5 E4-2: Malloc wrapper ENV snapshot
#include "../hakmem_internal.h" // AllocHeader helpers for diagnostics
#include "../hakmem_super_registry.h" // Superslab lookup for diagnostics
#include "../superslab/superslab_inline.h" // slab_index_for, capacity
@ -170,6 +171,55 @@ void* malloc(size_t size) {
// Fallback to normal path for large allocations
}
// Phase 5 E4-2: Malloc Wrapper ENV Snapshot (optional, ENV-gated)
// Strategy: Consolidate 2+ TLS reads -> 1 TLS read (50%+ reduction)
// Expected gain: +2-4% (from malloc 16.13% + tiny_alloc_gate_fast 19.50% reduction)
if (__builtin_expect(malloc_wrapper_env_snapshot_enabled(), 0)) {
// Optimized path: Single TLS snapshot (1 TLS read instead of 2+)
const struct malloc_wrapper_env_snapshot* env = malloc_wrapper_env_get();
// Fast path: Front gate unified (LIKELY in current presets)
if (__builtin_expect(env->front_gate_unified, 1)) {
// Common case: size <= 256 (pre-cached, no function call)
if (__builtin_expect(env->tiny_max_size_256 && size <= 256, 1)) {
void* ptr = tiny_alloc_gate_fast(size);
if (__builtin_expect(ptr != NULL, 1)) {
return ptr;
}
} else if (size <= tiny_get_max_size()) {
// Fallback for non-256 max sizes (rare)
void* ptr = tiny_alloc_gate_fast(size);
if (__builtin_expect(ptr != NULL, 1)) {
return ptr;
}
}
}
// Slow path fallback: Wrap shape dispatch
if (__builtin_expect(env->wrap_shape, 0)) {
// Need to increment lock depth for malloc_cold path
g_hakmem_lock_depth++;
// Guard against recursion during initialization
int init_wait = hak_init_wait_for_ready();
if (__builtin_expect(init_wait <= 0, 0)) {
wrapper_record_fallback(FB_INIT_WAIT_FAIL, "[wrap] libc malloc: init_wait\n");
g_hakmem_lock_depth--;
extern void* __libc_malloc(size_t);
return __libc_malloc(size);
}
// Ensure initialization before cold path
if (!g_initialized) hak_init();
// Delegate to cold path
const wrapper_env_cfg_t* wcfg = wrapper_env_cfg_fast();
return malloc_cold(size, wcfg);
}
// Fall through to legacy path below
}
// Phase 2 B4: Hot/Cold dispatch (HAKMEM_WRAP_SHAPE)
// Phase 3 D2: Use wrapper_env_cfg_fast() to reduce hot path overhead
const wrapper_env_cfg_t* wcfg = wrapper_env_cfg_fast();

View File

@ -0,0 +1,44 @@
// malloc_wrapper_env_snapshot_box.c - Box: Malloc Wrapper ENV Snapshot Implementation
//
// Phase 5 E4-2: Malloc Gate Optimization
#include "malloc_wrapper_env_snapshot_box.h"
#include "wrapper_env_box.h"
#include "tiny_front_config_box.h"
#include "../front/malloc_tiny_fast.h"
#include <stdio.h>
// TLS storage (initialized to zero on thread creation)
__thread struct malloc_wrapper_env_snapshot g_malloc_wrapper_env = {0};
// Lazy init implementation: Called once per thread on first malloc() call
void malloc_wrapper_env_snapshot_init(void)
{
// Read wrapper env config (wrap_shape flag)
const wrapper_env_cfg_t* wcfg = wrapper_env_cfg();
g_malloc_wrapper_env.wrap_shape = wcfg->wrap_shape;
// Read front gate unified constant (compile-time macro)
g_malloc_wrapper_env.front_gate_unified = TINY_FRONT_UNIFIED_GATE_ENABLED;
// Read tiny max size (most common case: 256 bytes)
g_malloc_wrapper_env.tiny_max_size_256 = (tiny_get_max_size() == 256) ? 1 : 0;
// Mark as initialized (lazy init complete)
g_malloc_wrapper_env.initialized = 1;
#if !HAKMEM_BUILD_RELEASE
// Debug: Log snapshot initialization (first 5 threads only)
static _Atomic uint32_t g_init_log_count = 0;
uint32_t n = atomic_fetch_add_explicit(&g_init_log_count, 1, memory_order_relaxed);
if (n < 5) {
fprintf(stderr,
"[MALLOC_WRAPPER_ENV_SNAPSHOT_INIT] wrap_shape=%d front_gate=%d tiny_max_256=%d\n",
g_malloc_wrapper_env.wrap_shape,
g_malloc_wrapper_env.front_gate_unified,
g_malloc_wrapper_env.tiny_max_size_256);
fflush(stderr);
}
#endif
}

View File

@ -0,0 +1,71 @@
// malloc_wrapper_env_snapshot_box.h - Box: Malloc Wrapper ENV Snapshot
//
// Phase 5 E4-2: Malloc Gate Optimization
//
// Purpose:
// Consolidate multiple TLS reads in malloc() wrapper into a single snapshot
// to reduce overhead (malloc 16.13% + tiny_alloc_gate_fast 19.50% -> target 33%)
//
// Strategy:
// - Reuse E4-1 success pattern (ENV snapshot consolidation, +3.51%)
// - Avoid E3-4 failure pattern (constructor init, -1.44%)
// - 2+ TLS reads -> 1 TLS read (50%+ reduction)
// - Eliminate tiny_get_max_size() function call in common case (size <= 256)
//
// Box Boundary:
// - Input: None (thread-local initialization on first access)
// - Output: const struct malloc_wrapper_env_snapshot* (cached snapshot)
// - ENV gate: HAKMEM_MALLOC_WRAPPER_ENV_SNAPSHOT=0/1 (default: 0, research box)
//
// Safety:
// - TLS storage (thread-safe)
// - Lazy init (once per thread)
// - ENV-gated rollback (SNAPSHOT=0 disables)
#ifndef MALLOC_WRAPPER_ENV_SNAPSHOT_BOX_H
#define MALLOC_WRAPPER_ENV_SNAPSHOT_BOX_H
#include <stdint.h>
#include <stdlib.h>
#include "../hakmem_build_flags.h"
// Snapshot structure: Consolidates 3 ENV checks into 1 TLS read
// Size: 4 bytes (cache-friendly, fits in single cache line)
struct malloc_wrapper_env_snapshot {
uint8_t wrap_shape; // HAKMEM_WRAP_SHAPE (from wrapper_env_cfg)
uint8_t front_gate_unified; // TINY_FRONT_UNIFIED_GATE_ENABLED (compile-time constant)
uint8_t tiny_max_size_256; // tiny_get_max_size() == 256 (most common case)
uint8_t initialized; // Lazy init flag (0 = not initialized, 1 = initialized)
};
// Thread-local storage for snapshot (initialized on first access per thread)
extern __thread struct malloc_wrapper_env_snapshot g_malloc_wrapper_env;
// ENV gate: Enable/disable snapshot optimization (default: OFF, research box)
static inline int malloc_wrapper_env_snapshot_enabled(void)
{
static __thread int s_enabled = -1;
if (__builtin_expect(s_enabled == -1, 0)) {
const char* env = getenv("HAKMEM_MALLOC_WRAPPER_ENV_SNAPSHOT");
s_enabled = (env && *env == '1') ? 1 : 0;
}
return s_enabled;
}
// Lazy init: Initialize snapshot on first access (once per thread)
void malloc_wrapper_env_snapshot_init(void);
// Primary API: Get snapshot (1 TLS read, lazy init on first call)
static inline const struct malloc_wrapper_env_snapshot* malloc_wrapper_env_get(void)
{
// Fast path: Already initialized
if (__builtin_expect(g_malloc_wrapper_env.initialized, 1)) {
return &g_malloc_wrapper_env;
}
// Slow path: First access, initialize snapshot
malloc_wrapper_env_snapshot_init();
return &g_malloc_wrapper_env;
}
#endif // MALLOC_WRAPPER_ENV_SNAPSHOT_BOX_H