Skip to content

Commit d9e787e

Browse files
committed
Restore layout pins and source-only placement test registration
Expectation corrected: PineExecutionAdapter 89488 -> 89520 and PineStrategyHost 108392 -> 108424, because #756 added four PlacementTable members and grew both enclosing layouts by 32 bytes. Use the agreeing Linux x86_64 GNU libstdc++ compiler measurements from the Release and Debug builds. Register the placement scaling and differential tests only when the source layer is enabled, matching the source-host test registration.
1 parent d398279 commit d9e787e

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Placement storage: sparse placement work and representation equivalence.
2-
list(APPEND TEST_SOURCES test_placement_order_scaling)
3-
pineforge_add_unit_test(test_placement_order_scaling)
4-
list(APPEND TEST_SOURCES test_placement_table_differential)
5-
pineforge_add_unit_test(test_placement_table_differential)
2+
if(PINEFORGE_BUILD_SOURCE_LAYER)
3+
list(APPEND TEST_SOURCES test_placement_order_scaling)
4+
pineforge_add_unit_test(test_placement_order_scaling)
5+
list(APPEND TEST_SOURCES test_placement_table_differential)
6+
pineforge_add_unit_test(test_placement_table_differential)
7+
endif()

‎tests/test_abi_layout_probe.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ using Scratch = std::remove_reference_t<
5656

5757
#if defined(__linux__) && defined(__x86_64__) && defined(__GLIBCXX__)
5858
// The ABI pins apply to Linux x86_64 builds that use GNU libstdc++.
59+
// PlacementTable members added in #756 grow both enclosing layouts by 32 bytes.
5960
static_assert(sizeof(Scratch) == 672, "RetiredRowScratch size changed");
60-
static_assert(sizeof(Adapter) == 89488, "PineExecutionAdapter size changed");
61+
static_assert(sizeof(Adapter) == 89520, "PineExecutionAdapter size changed");
6162
#ifndef PINEFORGE_RUNTIME_LAYOUT_MEASURE_ONLY
62-
// Measured with this probe in measurement mode on Linux x86_64 (GNU 13.3,
63-
// libstdc++), Release and Debug alike, on the integrated tree. Measurement
64-
// mode skips this pin and is never a passing ABI gate.
65-
static_assert(sizeof(Host) == 108392, "PineStrategyHost size changed; measure and pin the final layout");
63+
// Linux x86_64 GNU libstdc++ compiler diagnostics agree in Release and Debug
64+
// on the integrated tree. Measurement mode skips this pin and is never a
65+
// passing ABI gate.
66+
static_assert(sizeof(Host) == 108424, "PineStrategyHost size changed; measure and pin the final layout");
6667
#endif
6768
static_assert(PF_STREAM_ENGINE_LAYOUT_VERSION == 4u, "runtime contexts require layout stamp 4");
6869
static_assert(!HasRosterRoots<Scratch>::value,
@@ -132,9 +133,9 @@ int main() {
132133
#if defined(__linux__) && defined(__x86_64__) && defined(__GLIBCXX__)
133134
bool pins_hold = true;
134135
pins_hold &= pin("sizeof RetiredRowScratch", sizeof(Scratch), 672);
135-
pins_hold &= pin("sizeof PineExecutionAdapter", sizeof(Adapter), 89488);
136+
pins_hold &= pin("sizeof PineExecutionAdapter", sizeof(Adapter), 89520);
136137
#ifndef PINEFORGE_RUNTIME_LAYOUT_MEASURE_ONLY
137-
pins_hold &= pin("sizeof PineStrategyHost", sizeof(Host), 108392);
138+
pins_hold &= pin("sizeof PineStrategyHost", sizeof(Host), 108424);
138139
#else
139140
// A successful measurement command is never a successful layout test.
140141
pins_hold = false;

0 commit comments

Comments
 (0)