hack wasm threads for ceval
Niklas Fiekas
parent
1d5f5e3b02
commit
f36891ebed
|
|
@ -22,7 +22,7 @@ csp: Option[lila.common.ContentSecurityPolicy] = None)(body: Html)(implicit ctx:
|
|||
<head>
|
||||
<meta charset="utf-8">
|
||||
@if(cspEnabled()) {
|
||||
<meta http-equiv="Content-Security-Policy" content="@csp.getOrElse(defaultCsp)">
|
||||
<!-- <meta http-equiv="Content-Security-Policy" content="@csp.getOrElse(defaultCsp)"> -->
|
||||
}
|
||||
@if(isProd) {
|
||||
<title>@fullTitle.getOrElse{@title • lichess.org}</title>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
// Copyright 2015 The Emscripten Authors. All rights reserved.
|
||||
// Emscripten is available under two separate licenses, the MIT license and the
|
||||
// University of Illinois/NCSA Open Source License. Both these licenses can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Pthread Web Worker startup routine:
|
||||
// This is the entry point file that is loaded first by each Web Worker
|
||||
// that executes pthreads on the Emscripten application.
|
||||
|
||||
// Thread-local:
|
||||
var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread.
|
||||
var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread.
|
||||
var parentThreadId = 0; // The ID of the parent pthread that launched this thread.
|
||||
var tempDoublePtr = 0; // A temporary memory area for global float and double marshalling operations.
|
||||
|
||||
// Thread-local: Each thread has its own allocated stack space.
|
||||
var STACK_BASE = 0;
|
||||
var STACKTOP = 0;
|
||||
var STACK_MAX = 0;
|
||||
|
||||
// These are system-wide memory area parameters that are set at main runtime startup in main thread, and stay constant throughout the application.
|
||||
var buffer; // All pthreads share the same Emscripten HEAP as SharedArrayBuffer with the main execution thread.
|
||||
var DYNAMICTOP_PTR = 0;
|
||||
var TOTAL_MEMORY = 0;
|
||||
var STATICTOP = 0;
|
||||
var staticSealed = true; // When threads are being initialized, the static memory area has been already sealed a long time ago.
|
||||
var DYNAMIC_BASE = 0;
|
||||
|
||||
var ENVIRONMENT_IS_PTHREAD = true;
|
||||
|
||||
// performance.now() is specced to return a wallclock time in msecs since that Web Worker/main thread launched. However for pthreads this can cause
|
||||
// subtle problems in emscripten_get_now() as this essentially would measure time from pthread_create(), meaning that the clocks between each threads
|
||||
// would be wildly out of sync. Therefore sync all pthreads to the clock on the main browser thread, so that different threads see a somewhat
|
||||
// coherent clock across each of them (+/- 0.1msecs in testing)
|
||||
var __performance_now_clock_drift = 0;
|
||||
|
||||
// Cannot use console.log or console.error in a web worker, since that would risk a browser deadlock! https://bugzilla.mozilla.org/show_bug.cgi?id=1049091
|
||||
// Therefore implement custom logging facility for threads running in a worker, which queue the messages to main thread to print.
|
||||
var Module = {};
|
||||
|
||||
// When error objects propagate from Web Worker to main thread, they lose helpful call stack and thread ID information, so print out errors early here,
|
||||
// before that happens.
|
||||
this.addEventListener('error', function(e) {
|
||||
if (e.message.indexOf('SimulateInfiniteLoop') != -1) return e.preventDefault();
|
||||
|
||||
var errorSource = ' in ' + e.filename + ':' + e.lineno + ':' + e.colno;
|
||||
console.error('Pthread ' + selfThreadId + ' uncaught exception' + (e.filename || e.lineno || e.colno ? errorSource : '') + ': ' + e.message + '. Error object:');
|
||||
console.error(e.error);
|
||||
});
|
||||
|
||||
function threadPrint() {
|
||||
var text = Array.prototype.slice.call(arguments).join(' ');
|
||||
console.log(text);
|
||||
}
|
||||
function threadPrintErr() {
|
||||
var text = Array.prototype.slice.call(arguments).join(' ');
|
||||
console.error(text);
|
||||
console.error(new Error().stack);
|
||||
}
|
||||
function threadAlert() {
|
||||
var text = Array.prototype.slice.call(arguments).join(' ');
|
||||
postMessage({cmd: 'alert', text: text, threadId: selfThreadId});
|
||||
}
|
||||
out = threadPrint;
|
||||
err = threadPrintErr;
|
||||
this.alert = threadAlert;
|
||||
|
||||
// #if WASM
|
||||
Module['instantiateWasm'] = function(info, receiveInstance) {
|
||||
// Instantiate from the module posted from the main thread.
|
||||
// We can just use sync instantiation in the worker.
|
||||
instance = new WebAssembly.Instance(Module['wasmModule'], info);
|
||||
// We don't need the module anymore; new threads will be spawned from the main thread.
|
||||
delete Module['wasmModule'];
|
||||
receiveInstance(instance);
|
||||
return instance.exports;
|
||||
}
|
||||
//#endif
|
||||
|
||||
this.onmessage = function(e) {
|
||||
try {
|
||||
if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
|
||||
// Initialize the thread-local field(s):
|
||||
tempDoublePtr = e.data.tempDoublePtr;
|
||||
|
||||
// Initialize the global "process"-wide fields:
|
||||
Module['TOTAL_MEMORY'] = TOTAL_MEMORY = e.data.TOTAL_MEMORY;
|
||||
STATICTOP = e.data.STATICTOP;
|
||||
DYNAMIC_BASE = e.data.DYNAMIC_BASE;
|
||||
DYNAMICTOP_PTR = e.data.DYNAMICTOP_PTR;
|
||||
|
||||
|
||||
//#if WASM
|
||||
if (e.data.wasmModule) {
|
||||
// Module and memory were sent from main thread
|
||||
Module['wasmModule'] = e.data.wasmModule;
|
||||
Module['wasmMemory'] = e.data.wasmMemory;
|
||||
buffer = Module['wasmMemory'].buffer;
|
||||
} else {
|
||||
//#else
|
||||
buffer = e.data.buffer;
|
||||
}
|
||||
//#endif
|
||||
|
||||
PthreadWorkerInit = e.data.PthreadWorkerInit;
|
||||
if (typeof e.data.urlOrBlob === 'string') {
|
||||
importScripts(e.data.urlOrBlob);
|
||||
} else {
|
||||
var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
|
||||
importScripts(objectUrl);
|
||||
URL.revokeObjectURL(objectUrl);
|
||||
}
|
||||
//#if !ASMFS
|
||||
if (typeof FS !== 'undefined' && typeof FS.createStandardStreams === 'function') FS.createStandardStreams();
|
||||
//#endif
|
||||
postMessage({ cmd: 'loaded' });
|
||||
} else if (e.data.cmd === 'objectTransfer') {
|
||||
PThread.receiveObjectTransfer(e.data);
|
||||
} else if (e.data.cmd === 'run') { // This worker was idle, and now should start executing its pthread entry point.
|
||||
__performance_now_clock_drift = performance.now() - e.data.time; // Sync up to the clock of the main thread.
|
||||
threadInfoStruct = e.data.threadInfoStruct;
|
||||
__register_pthread_ptr(threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0); // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out.
|
||||
assert(threadInfoStruct);
|
||||
selfThreadId = e.data.selfThreadId;
|
||||
parentThreadId = e.data.parentThreadId;
|
||||
assert(selfThreadId);
|
||||
assert(parentThreadId);
|
||||
// TODO: Emscripten runtime has these variables twice(!), once outside the asm.js module, and a second time inside the asm.js module.
|
||||
// Review why that is? Can those get out of sync?
|
||||
STACK_BASE = STACKTOP = e.data.stackBase;
|
||||
STACK_MAX = STACK_BASE + e.data.stackSize;
|
||||
assert(STACK_BASE != 0);
|
||||
assert(STACK_MAX > STACK_BASE);
|
||||
Module['establishStackSpace'](e.data.stackBase, e.data.stackBase + e.data.stackSize);
|
||||
var result = 0;
|
||||
//#if STACK_OVERFLOW_CHECK
|
||||
if (typeof writeStackCookie === 'function') writeStackCookie();
|
||||
//#endif
|
||||
|
||||
PThread.receiveObjectTransfer(e.data);
|
||||
PThread.setThreadStatus(_pthread_self(), 1/*EM_THREAD_STATUS_RUNNING*/);
|
||||
|
||||
try {
|
||||
// pthread entry points are always of signature 'void *ThreadMain(void *arg)'
|
||||
// Native codebases sometimes spawn threads with other thread entry point signatures,
|
||||
// such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
|
||||
// That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
|
||||
// enable that to work. If you find the following line to crash, either change the signature
|
||||
// to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
|
||||
// flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
|
||||
result = Module['dynCall_ii'](e.data.start_routine, e.data.arg);
|
||||
|
||||
//#if STACK_OVERFLOW_CHECK
|
||||
if (typeof checkStackCookie === 'function') checkStackCookie();
|
||||
//#endif
|
||||
|
||||
} catch(e) {
|
||||
if (e === 'Canceled!') {
|
||||
PThread.threadCancel();
|
||||
return;
|
||||
} else if (e === 'SimulateInfiniteLoop') {
|
||||
return;
|
||||
} else {
|
||||
Atomics.store(HEAPU32, (threadInfoStruct + 4 /*{{{ C_STRUCTS.pthread.threadExitCode }}}*/ ) >> 2, (e instanceof ExitStatus) ? e.status : -2 /*A custom entry specific to Emscripten denoting that the thread crashed.*/);
|
||||
Atomics.store(HEAPU32, (threadInfoStruct + 0 /*{{{ C_STRUCTS.pthread.threadStatus }}}*/ ) >> 2, 1); // Mark the thread as no longer running.
|
||||
_emscripten_futex_wake(threadInfoStruct + 0 /*{{{ C_STRUCTS.pthread.threadStatus }}}*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish.
|
||||
if (!(e instanceof ExitStatus)) throw e;
|
||||
}
|
||||
}
|
||||
// The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves.
|
||||
// (This is a no-op if explicit pthread_exit() had been called prior.)
|
||||
PThread.threadExit(result);
|
||||
} else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
|
||||
if (threadInfoStruct && PThread.thisThreadCancelState == 0/*PTHREAD_CANCEL_ENABLE*/) {
|
||||
PThread.threadCancel();
|
||||
}
|
||||
} else if (e.data.target === 'setimmediate') {
|
||||
// no-op
|
||||
} else if (e.data.cmd === 'processThreadQueue') {
|
||||
if (threadInfoStruct) { // If this thread is actually running?
|
||||
_emscripten_current_thread_process_queued_calls();
|
||||
}
|
||||
} else {
|
||||
err('pthread-main.js received unknown command ' + e.data.cmd);
|
||||
console.error(e.data);
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('pthread-main.js onmessage() captured an uncaught exception: ' + e);
|
||||
console.error(e.stack);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
|
|
@ -10,7 +10,7 @@ interface Lichess {
|
|||
storage: LichessStorageHelper
|
||||
reload(): void;
|
||||
redirect(o: string | { url: string, cookie: Cookie }): void;
|
||||
loadScript(url: string): any
|
||||
loadScript(url: string, opts?: AssetUrlOpts): any
|
||||
keyboardMove: any
|
||||
slider(): any
|
||||
reloadOtherTabs(): void
|
||||
|
|
@ -139,9 +139,11 @@ interface Math {
|
|||
|
||||
interface WebAssemblyStatic {
|
||||
validate(bufferSource: ArrayBuffer | Uint8Array): boolean
|
||||
Memory: any
|
||||
}
|
||||
|
||||
declare var WebAssembly: WebAssemblyStatic | undefined;
|
||||
declare var SharedArrayBuffer: any | undefined;
|
||||
|
||||
declare type VariantKey = 'standard' | 'chess960' | 'antichess' | 'fromPosition' | 'kingOfTheHill' | 'threeCheck' | 'atomic' | 'horde' | 'racingKings' | 'crazyhouse'
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ export default function(opts: CevalOpts): CevalCtrl {
|
|||
|
||||
const pnaclSupported: boolean = !opts.failsafe && 'application/x-pnacl' in navigator.mimeTypes;
|
||||
const wasmSupported = typeof WebAssembly === 'object' && WebAssembly.validate(Uint8Array.of(0x0, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00));
|
||||
const wasmThreadsSupported = wasmSupported && new WebAssembly!.Memory({shared: true, initial: 8, maximum: 8}).buffer instanceof SharedArrayBuffer;
|
||||
const minDepth = 6;
|
||||
const maxDepth = storedProp<number>(storageKey('ceval.max-depth'), 18);
|
||||
const multiPv = storedProp(storageKey('ceval.multipv'), opts.multiPvDefault || 1);
|
||||
|
|
@ -43,6 +44,7 @@ export default function(opts: CevalOpts): CevalCtrl {
|
|||
asmjs: li.assetUrl(sfPath + '.js', {sameDomain: true}),
|
||||
pnacl: pnaclSupported && li.assetUrl(sfPath + '.nmf'),
|
||||
wasm: wasmSupported && li.assetUrl(sfPath + '.wasm.js', {sameDomain: true}),
|
||||
wasmThreaded: wasmThreadsSupported && 'vendor/stockfish.wasm/stockfish.js',
|
||||
onCrash: opts.onCrash
|
||||
}, {
|
||||
minDepth,
|
||||
|
|
@ -181,6 +183,7 @@ export default function(opts: CevalOpts): CevalCtrl {
|
|||
return {
|
||||
pnaclSupported,
|
||||
wasmSupported,
|
||||
wasmThreadsSupported,
|
||||
start,
|
||||
stop,
|
||||
allowed,
|
||||
|
|
|
|||
|
|
@ -120,6 +120,28 @@ class PNaClWorker extends AbstractWorker {
|
|||
}
|
||||
}
|
||||
|
||||
class ThreadedWasmWorker extends AbstractWorker {
|
||||
private module?: any;
|
||||
|
||||
boot(): Promise<Protocol> {
|
||||
return window.lichess.loadScript(this.url, {sameDomain: true}).then(() => {
|
||||
this.module = window['Module'];
|
||||
const protocol = new Protocol(this.send.bind(this), this.workerOpts);
|
||||
this.module.addMessageListener(protocol.received.bind(protocol));
|
||||
return protocol;
|
||||
});
|
||||
}
|
||||
|
||||
destroy() {
|
||||
if (this.module) this.module.postMessage('quit');
|
||||
this.module = undefined;
|
||||
}
|
||||
|
||||
send(cmd: string) {
|
||||
if (this.module) this.module.postMessage(cmd);
|
||||
}
|
||||
}
|
||||
|
||||
export default class Pool {
|
||||
private workers: AbstractWorker[] = [];
|
||||
private token = 0;
|
||||
|
|
@ -150,7 +172,9 @@ export default class Pool {
|
|||
warmup() {
|
||||
if (this.workers.length) return;
|
||||
|
||||
if (this.poolOpts.pnacl)
|
||||
if (this.poolOpts.wasmThreaded)
|
||||
this.workers.push(new ThreadedWasmWorker(this.poolOpts.wasmThreaded, this.poolOpts, this.protocolOpts));
|
||||
else if (this.poolOpts.pnacl)
|
||||
this.workers.push(new PNaClWorker(this.poolOpts.pnacl, this.poolOpts, this.protocolOpts));
|
||||
else
|
||||
for (var i = 1; i <= 2; i++)
|
||||
|
|
|
|||
|
|
@ -115,8 +115,8 @@ export default class Protocol {
|
|||
this.curEval = null;
|
||||
this.stopped = null;
|
||||
this.expectedPvs = 1;
|
||||
if (this.opts.threads) this.send('setoption name Threads value ' + this.opts.threads());
|
||||
if (this.opts.hashSize) this.send('setoption name Hash value ' + this.opts.hashSize());
|
||||
//if (this.opts.threads) this.send('setoption name Threads value ' + this.opts.threads());
|
||||
//if (this.opts.hashSize) this.send('setoption name Hash value ' + this.opts.hashSize());
|
||||
this.send('setoption name MultiPV value ' + this.work.multiPv);
|
||||
this.send(['position', 'fen', this.work.initialFen, 'moves'].concat(this.work.moves).join(' '));
|
||||
if (this.work.maxDepth >= 99) this.send('go depth 99');
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ export interface Work {
|
|||
export interface PoolOpts {
|
||||
pnacl: string | false;
|
||||
wasm: string | false;
|
||||
wasmThreaded: string | false;
|
||||
asmjs: string;
|
||||
onCrash: (err: any) => void;
|
||||
}
|
||||
|
|
@ -60,6 +61,7 @@ export interface CevalCtrl {
|
|||
effectiveMaxDepth(): number;
|
||||
pnaclSupported: boolean;
|
||||
wasmSupported: boolean;
|
||||
wasmThreadsSupported: boolean;
|
||||
allowed: Prop<boolean>;
|
||||
enabled: Prop<boolean>;
|
||||
possible: boolean;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ function engineName(ctrl: CevalCtrl): VNode[] {
|
|||
h('span', version ? {
|
||||
attrs: { title: version }
|
||||
} : {}, window.lichess.engineName),
|
||||
ctrl.pnaclSupported ? h('span.native', 'pnacl') : (ctrl.wasmSupported ? h('span.native', 'wasm') : h('span.asmjs', 'asmjs'))
|
||||
ctrl.wasmThreadsSupported ? h('span.native', 'sab') : (ctrl.pnaclSupported ? h('span.native', 'pnacl') : (ctrl.wasmSupported ? h('span.native', 'wasm') : h('span.asmjs', 'asmjs')))
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue