Replace the legacy Emscripten JS-exceptions model with native wasm-EH (legacy encoding) across the whole build, keeping Asyncify coroutines working via a from-source Binaryen --hoist-cpp-catches pre-pass. Net result: native-EH is the only build mode, the 3D viewer is on by default, and pcbnew shrinks substantially. Highlights: - Binaryen submodule everywhere + --hoist-cpp-catches integration in apply-asyncify; post-link Asyncify covers every app wasm (not just standalone test wasm). - Build deps (incl. OpenCASCADE without OCC_CONVERT_SIGNALS) and all KiCad apps with -fwasm-exceptions; emscripten_sleep added to the post-link asyncify-imports. - libcontext fiber entry wired under native exceptions; while-loop main loop + currData shim injected into all wx apps. - Native-EH collab apply fixed: DEBUG-define the embind TU + match all out-of-CMake C++ TUs' ABI flags to the core, fixing the vtable-layout skew / mis-dispatch. - 3D viewer enabled by default (real raytracer linked, not the stub). - Retire the EH-spike scaffolding; flip the asyncify-races ablation pins to shim-redundancy pins (native-EH stays clean with the legacy shims ablated). - Fix the asyncify-races quiescence check to not require Asyncify.currData==0: under the native-EH per-frame-yield top loop the main stack is asyncify-suspended every frame, so currData legitimately churns (a freed-but-not-yet-nulled buffer, not a leak). Refresh the pcbnew toolbar screenshot baseline for the new kicad. - CI: drop the obsolete binaryen_version input/env (the build uses the binaryen submodule fork's wasm-opt, not a version download); key the wasm-output cache on the binaryen submodule SHA instead. Bumps the wxwidgets + binaryen submodules to their squashed feature commits. Validated green: all 7 apps native-EH (real 3D in pcbnew); KiCad e2e 63/63 Firefox + Chromium (3D viewer renders); wx 336; coroutine 34/34 both engines; asyncify 7/7 both engines. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
48 lines
2.5 KiB
TypeScript
48 lines
2.5 KiB
TypeScript
import { test, expect } from './utils/fixtures';
|
|
|
|
// A raytracer-style worker-join run inside a wx modal pump. A pass is dispatched from a wxTimer that
|
|
// fires while a ShowModal() dialog is open; the modal pump runs ProcessEvents via ccall(async:true),
|
|
// so the work runs in a fresh managed Asyncify context at state == Normal. Both join styles complete
|
|
// multi-core there:
|
|
// m=0 busywait : sleep_for join; the pre-warmed pool completes it.
|
|
// m=1 yield : emscripten_sleep join; legal at state == Normal, so it suspends and resumes.
|
|
//
|
|
// Named coroutine-* so playwright-coroutine.config.ts runs it in real Chrome + Firefox. WebKit
|
|
// skipped for pthread apps (COEP).
|
|
|
|
const APP = '/standalone/raytrace-modal/raytrace_modal_test.html';
|
|
|
|
function workersRan( logs: string[] ): number {
|
|
const l = logs.find( x => x.includes( '[RTPOOL] SUCCESS' ) );
|
|
const m = l?.match( /workersRan=(\d+)/ );
|
|
return m ? +m[1] : -1;
|
|
}
|
|
|
|
function abortErrors( testLogger: { errors: string[] } ) {
|
|
return testLogger.errors.filter( e => /invalid state:\s*1|Aborted/i.test( e ) );
|
|
}
|
|
|
|
async function waitForLog( testLogger: { consoleLogs: string[] }, needle: string, timeout = 60000 ) {
|
|
await expect.poll( () => testLogger.consoleLogs.some( l => l.includes( needle ) ), { timeout } ).toBe( true );
|
|
}
|
|
|
|
test.describe( 'Raytracer worker-join inside a wx modal pump', () => {
|
|
|
|
test( 'm=0 busywait: pre-warmed pool busy-wait completes inside the modal → multi-core', async ( { page, testLogger } ) => {
|
|
await page.goto( `${APP}#m=0` );
|
|
await waitForLog( testLogger, '[RTPOOL] SUCCESS mode=0' );
|
|
expect( workersRan( testLogger.consoleLogs ), 'multi-core inside the modal' ).toBeGreaterThan( 1 );
|
|
expect( abortErrors( testLogger ), 'no Asyncify abort' ).toHaveLength( 0 );
|
|
} );
|
|
|
|
// The in-modal work runs in a fresh ProcessEvents entry at Asyncify state == Normal (the app
|
|
// probes and logs it), so an emscripten_sleep join is legal and the pass completes multi-core.
|
|
test( 'm=1 yield: emscripten_sleep join inside the modal → multi-core', async ( { page, testLogger } ) => {
|
|
await page.goto( `${APP}#m=1` );
|
|
await waitForLog( testLogger, '[RTPOOL] SUCCESS mode=1' );
|
|
expect( testLogger.consoleLogs.some( l => /Asyncify\.state=0/.test( l ) ),
|
|
'the in-modal work runs at state == Normal (a fresh ProcessEvents entry)' ).toBe( true );
|
|
expect( workersRan( testLogger.consoleLogs ), 'the yield-join completes → multi-core' ).toBeGreaterThan( 1 );
|
|
expect( abortErrors( testLogger ), 'no Asyncify abort' ).toHaveLength( 0 );
|
|
} );
|
|
} );
|