diff --git a/lib/Backend/JnHelperMethod.cpp b/lib/Backend/JnHelperMethod.cpp index 7d6d676b653..23ceefc0a39 100644 --- a/lib/Backend/JnHelperMethod.cpp +++ b/lib/Backend/JnHelperMethod.cpp @@ -194,10 +194,10 @@ DECLSPEC_GUARDIGNORE _NOINLINE intptr_t GetNonTableMethodAddress(ThreadContextI return ShiftAddr(context, (void*(*)(void *, void const*, size_t))memcpy); case HelperDirectMath_FloorFlt: - return ShiftAddr(context, (float(*)(float))floor); + return ShiftAddr(context, (float(*)(float))floorf); case HelperDirectMath_CeilFlt: - return ShiftAddr(context, (float(*)(float))ceil); + return ShiftAddr(context, (float(*)(float))ceilf); #if defined(_M_X64) case HelperDirectMath_Acos: diff --git a/lib/Common/CommonDefines.h b/lib/Common/CommonDefines.h index 55b04b67eb2..a85c5262f13 100644 --- a/lib/Common/CommonDefines.h +++ b/lib/Common/CommonDefines.h @@ -727,15 +727,12 @@ #endif #if defined(ASMJS_PLAT) -// xplat-todo: once all the wasm tests are passing on xplat, enable it for release builds -#if defined(_WIN32) || (defined(__clang__) && defined(ENABLE_DEBUG_CONFIG_OPTIONS)) #define ENABLE_WASM #ifdef CAN_BUILD_WABT #define ENABLE_WABT #endif -#endif #endif #if _M_IX86 diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h index b81dfd70a04..7d72fca49d3 100644 --- a/lib/Common/ConfigFlagsList.h +++ b/lib/Common/ConfigFlagsList.h @@ -393,12 +393,7 @@ PHASE(All) #endif #endif // #ifdef ENABLE_SIMDJS -#ifdef _WIN32 #define DEFAULT_CONFIG_Wasm (true) -#else -// Do not enable wasm by default on xplat builds -#define DEFAULT_CONFIG_Wasm (false) -#endif #define DEFAULT_CONFIG_WasmI64 (false) #if ENABLE_FAST_ARRAYBUFFER #define DEFAULT_CONFIG_WasmFastArray (true) diff --git a/lib/Common/Memory/HeapAllocator.h b/lib/Common/Memory/HeapAllocator.h index d9b5d689b27..573f40f5826 100644 --- a/lib/Common/Memory/HeapAllocator.h +++ b/lib/Common/Memory/HeapAllocator.h @@ -93,6 +93,57 @@ struct HeapAllocatorData struct HeapAllocator { + template + struct AutoFree + { + private: + T * obj = nullptr; + public: + ~AutoFree() + { + HeapDelete(obj); + } + void Replace(T* obj) + { + this->obj = obj; + } + void Release() + { + this->obj = nullptr; + } + T* Get() const + { + return this->obj; + } + }; + + template + struct AutoFreeArray + { + private: + T* obj = nullptr; + size_t count = 0; + public: + ~AutoFreeArray() + { + HeapDeleteArray(count, obj); + } + void Replace(__ecount(count) T* obj, size_t count) + { + this->obj = obj; + this->count = count; + } + void Release() + { + this->obj = nullptr; + this->count = 0; + } + T* Get() const + { + return this->obj; + } + }; + static const bool FakeZeroLengthArray = false; char * Alloc(DECLSPEC_GUARD_OVERFLOW size_t byteSize) diff --git a/lib/Runtime/Language/InterpreterStackFrame.cpp b/lib/Runtime/Language/InterpreterStackFrame.cpp index d50034e918c..afc5a2a9f42 100644 --- a/lib/Runtime/Language/InterpreterStackFrame.cpp +++ b/lib/Runtime/Language/InterpreterStackFrame.cpp @@ -3000,7 +3000,7 @@ namespace Js // Move the arguments to the right location ArgSlot argCount = info->GetArgCount(); -#if _M_X64 +#if _M_X64 && _WIN32 uint homingAreaSize = 0; #endif @@ -3019,7 +3019,7 @@ namespace Js uintptr_t argAddress = (uintptr_t)m_inParams; for (ArgSlot i = 0; i < argCount; i++) { -#if _M_X64 +#if _M_X64 && _WIN32 // 3rd Argument should be at the end of the homing area. Assert(i != 3 || argAddress == (uintptr_t)m_inParams + homingAreaSize); if (i < 3) @@ -3040,12 +3040,7 @@ namespace Js // IAT xmm2 spill // IAT xmm1 spill <- floatSpillAddress for arg1 -#ifdef _WIN32 #define FLOAT_SPILL_ADDRESS_OFFSET_WORDS 15 -#else -// On Sys V x64 we have 4 words less (4 reg shadow) -#define FLOAT_SPILL_ADDRESS_OFFSET_WORDS 11 -#endif // floats are spilled as xmmwords uintptr_t floatSpillAddress = (uintptr_t)m_inParams - MachPtr * (FLOAT_SPILL_ADDRESS_OFFSET_WORDS - 2*i); @@ -3730,17 +3725,17 @@ namespace Js AsmJsScriptFunction* scriptFunc = AsmJsScriptFunction::FromVar(function); AsmJsFunctionInfo* asmInfo = scriptFunc->GetFunctionBody()->GetAsmJsFunctionInfo(); uint alignedArgsSize = ::Math::Align(asmInfo->GetArgByteSize(), 16); -#if _M_X64 +#if _M_X64 && _WIN32 // convention is to always allocate spill space for rcx,rdx,r8,r9 if (alignedArgsSize < 0x20) alignedArgsSize = 0x20; - - // Prepare in advance the possible arguments that will need to be put in register - byte _declspec(align(16)) reg[3 * 16]; uint* argSizes = asmInfo->GetArgsSizesArray(); Assert(asmInfo->GetArgSizeArrayLength() >= 2); - CompileAssert((FunctionBody::MinAsmJsOutParams() * sizeof(Var)) == (sizeof(Var) * 2 + sizeof(reg))); byte* curOutParams = (byte*)m_outParams + sizeof(Var); Assert(curOutParams + argSizes[0] + argSizes[1] + 16 <= (byte*)this->m_outParamsEnd); + + // Prepare in advance the possible arguments that will need to be put in register + byte _declspec(align(16)) reg[3 * 16]; + CompileAssert((FunctionBody::MinAsmJsOutParams() * sizeof(Var)) == (sizeof(Var) * 2 + sizeof(reg))); js_memcpy_s(reg, 16, curOutParams, 16); js_memcpy_s(reg + 16, 16, curOutParams + argSizes[0], 16); js_memcpy_s(reg + 32, 16, curOutParams + argSizes[0] + argSizes[1], 16); diff --git a/lib/Runtime/Language/amd64/amd64_Thunks.S b/lib/Runtime/Language/amd64/amd64_Thunks.S index 12109dc65b7..e2e3e414640 100644 --- a/lib/Runtime/Language/amd64/amd64_Thunks.S +++ b/lib/Runtime/Language/amd64/amd64_Thunks.S @@ -62,21 +62,7 @@ NESTED_ENTRY _ZN2Js21InterpreterStackFrame33AsmJsDelayDynamicInterpreterThunkEPN push r8 push r9 - sub rsp, 40h - - // spill potential floating point arguments to stack - movaps xmmword ptr [rsp + 00h], xmm0 - movaps xmmword ptr [rsp + 10h], xmm1 - movaps xmmword ptr [rsp + 20h], xmm2 - movaps xmmword ptr [rsp + 30h], xmm3 call C_FUNC(_ZN2Js21InterpreterStackFrame29EnsureDynamicInterpreterThunkEPNS_14ScriptFunctionE) - // restore potential floating point arguments from stack - movaps xmm0, xmmword ptr [rsp + 00h] - movaps xmm1, xmmword ptr [rsp + 10h] - movaps xmm2, xmmword ptr [rsp + 20h] - movaps xmm3, xmmword ptr [rsp + 30h] - - add rsp, 40h pop r9 pop r8 @@ -190,13 +176,6 @@ NESTED_ENTRY _ZN2Js21InterpreterStackFrame19InterpreterAsmThunkEPNS_20AsmJsCallS set_cfa_register rbp, (2*8) // Set to compute CFA as: rbp + 16 (sizeof: [rbp] [ReturnAddress]) - sub rsp, 40h - - // spill potential floating point arguments to stack - movaps xmmword ptr [rsp + 00h], xmm0 - movaps xmmword ptr [rsp + 10h], xmm1 - movaps xmmword ptr [rsp + 20h], xmm2 - movaps xmmword ptr [rsp + 30h], xmm3 // save argument registers used by custom calling convention push rdi @@ -210,7 +189,6 @@ NESTED_ENTRY _ZN2Js21InterpreterStackFrame19InterpreterAsmThunkEPNS_20AsmJsCallS call rax // call appropriate template - add rsp, 40h pop_nonvol_reg rbp ret NESTED_END _ZN2Js21InterpreterStackFrame19InterpreterAsmThunkEPNS_20AsmJsCallStackLayoutE, _TEXT @@ -260,64 +238,8 @@ NESTED_ENTRY _ZN2Js23AsmJsExternalEntryPointEPNS_16RecyclableObjectENS_8CallInfo call C_FUNC(_ZN2Js19UnboxAsmJsArgumentsEPNS_14ScriptFunctionEPPvPcNS_8CallInfoE) // rax = target function address - // move first 4 arguments into registers. - // don't know types other than arg0 (which is ScriptFunction *), so put in both xmm and general purpose registers mov rdi, r12 // arg0: func - // int GetArgsSizesArray(ScriptFunction* func) - // get args sizes of target asmjs function - // rdi has ScriptFunction* - push r13 - push rax - push rdi - sub rsp, 8h - call C_FUNC(_ZN2Js17GetArgsSizesArrayEPNS_14ScriptFunctionE) - mov r13, rax // r13: arg size - add rsp, 8h - pop rdi - pop rax - - // NOTE: Below xmm usage is non-standard. - - // Move 3 args to regs per convention. rdi already has first arg: ScriptFunction* - push r12 - // r12->unboxed args - lea r12, [rsp + 18h] // rsp + size of(r12 + r13 + ScriptFunction*) - - // r13 is arg size - cmp dword ptr [r13], 10h - je SIMDArg2 - mov rsi, [r12] // arg1 - movq xmm1, qword ptr [r12] // arg1 - add r12, 8h - jmp Arg3 - SIMDArg2: - movups xmm1, xmmword ptr[r12] - add r12, 10h - Arg3: - cmp dword ptr [r13 + 4h], 10h - je SIMDArg3 - mov rdx, [r12] // arg2 - movq xmm2, qword ptr [r12] // arg2 - add r12, 8h - jmp Arg4 - SIMDArg3: - movups xmm2, xmmword ptr[r12] - add r12, 10h - Arg4: - cmp dword ptr [r13 + 8h], 10h - je SIMDArg4 - mov rcx, [r12] // arg3 - movq xmm3, qword ptr [r12] // arg3 - jmp ArgsDone - SIMDArg4: - movups xmm3, xmmword ptr [r12] - - ArgsDone: - pop r12 // r12: func - pop r13 // r13: orig stack pointer - - // "home" arg0. other args were read from stack and already homed. mov [rsp + 00h], rdi // call entry point diff --git a/lib/Runtime/Library/WasmLibrary.cpp b/lib/Runtime/Library/WasmLibrary.cpp index 91e3d8dc2ff..01e769d56f9 100644 --- a/lib/Runtime/Library/WasmLibrary.cpp +++ b/lib/Runtime/Library/WasmLibrary.cpp @@ -107,7 +107,7 @@ Js::JavascriptMethod Js::WasmLibrary::WasmDeferredParseEntryPoint(Js::AsmJsScrip } catch (Wasm::WasmCompilationException& ex) { - AutoCleanStr autoCleanExceptionMessage; + AutoFreeExceptionMessage autoCleanExceptionMessage; char16* exceptionMessage = WebAssemblyModule::FormatExceptionMessage(&ex, &autoCleanExceptionMessage, readerInfo->m_module, body); JavascriptLibrary *library = scriptContext->GetLibrary(); diff --git a/lib/Runtime/Library/WebAssemblyModule.cpp b/lib/Runtime/Library/WebAssemblyModule.cpp index 098208f75e1..78fdb2f927b 100644 --- a/lib/Runtime/Library/WebAssemblyModule.cpp +++ b/lib/Runtime/Library/WebAssemblyModule.cpp @@ -227,7 +227,7 @@ WebAssemblyModule::CreateModule( Wasm::WasmReaderInfo * readerInfo = nullptr; Js::FunctionBody * currentBody = nullptr; char16* exceptionMessage = nullptr; - AutoCleanStr autoCleanExceptionMessage; + AutoFreeExceptionMessage autoCleanExceptionMessage; try { Wasm::WasmModuleGenerator bytecodeGen(scriptContext, src); @@ -827,42 +827,31 @@ WebAssemblyModule::GetModuleEnvironmentSize() const return size; } -char16* WebAssemblyModule::FormatExceptionMessage(Wasm::WasmCompilationException* ex, AutoCleanStr* autoClean, WebAssemblyModule* wasmModule, FunctionBody* body) +char16* WebAssemblyModule::FormatExceptionMessage(Wasm::WasmCompilationException* ex, AutoFreeExceptionMessage* autoFree, WebAssemblyModule* wasmModule, FunctionBody* body) { char16* originalExceptionMessage = ex->GetTempErrorMessageRef(); if (!wasmModule || !body) { size_t len = wcslen(originalExceptionMessage) + 1; - autoClean->str = new char16[len]; - js_memcpy_s(autoClean->str, len * sizeof(char16), originalExceptionMessage, len * sizeof(char16)); - return autoClean->str; + char16* buf = HeapNewArray(char16, len); + autoFree->Replace(buf, len); + js_memcpy_s(buf, len * sizeof(char16), originalExceptionMessage, len * sizeof(char16)); + return buf; } Wasm::BinaryLocation location = wasmModule->GetReader()->GetCurrentLocation(); const char16* format = _u("function %s at offset %u/%u (0x%x/0x%x): %s"); const char16* funcName = body->GetDisplayName(); + char16* buf = HeapNewArray(char16, 2048); + autoFree->Replace(buf, 2048); - uint size = (uint)_scwprintf(format, + _snwprintf_s(buf, 2048, _TRUNCATE, format, funcName, location.offset, location.size, location.offset, location.size, originalExceptionMessage); - - if (size > 2048) - { - // Do not allocate too much for the exception message, just truncate the message past 2048 characters - size = 2047; - } - ++size; // Null terminate character - autoClean->str = new char16[size]; - int written = _snwprintf_s(autoClean->str, size, _TRUNCATE, format, - funcName, - location.offset, location.size, - location.offset, location.size, - originalExceptionMessage); - Assert((uint)written == size - 1); - return autoClean->str; + return buf; } void diff --git a/lib/Runtime/Library/WebAssemblyModule.h b/lib/Runtime/Library/WebAssemblyModule.h index eecb56670a0..44129cfb374 100644 --- a/lib/Runtime/Library/WebAssemblyModule.h +++ b/lib/Runtime/Library/WebAssemblyModule.h @@ -23,16 +23,7 @@ namespace Wasm namespace Js { - -struct AutoCleanStr -{ - char16* str = nullptr; - ~AutoCleanStr() - { - delete[] str; - } -}; - +typedef HeapAllocator::AutoFreeArray AutoFreeExceptionMessage; class WebAssemblyModule : public DynamicObject { @@ -160,7 +151,7 @@ class WebAssemblyModule : public DynamicObject Wasm::WasmBinaryReader* GetReader() const { return m_reader; } - static char16* FormatExceptionMessage(Wasm::WasmCompilationException* ex, AutoCleanStr* autoClean, WebAssemblyModule* wasmModule = nullptr, FunctionBody* body = nullptr); + static char16* FormatExceptionMessage(Wasm::WasmCompilationException* ex, AutoFreeExceptionMessage* autoClean, WebAssemblyModule* wasmModule = nullptr, FunctionBody* body = nullptr); virtual void Finalize(bool isShutdown) override; virtual void Dispose(bool isShutdown) override; diff --git a/lib/Runtime/Library/amd64/JavascriptFunctionA.S b/lib/Runtime/Library/amd64/JavascriptFunctionA.S index 17edad70ced..33d4f19f034 100644 --- a/lib/Runtime/Library/amd64/JavascriptFunctionA.S +++ b/lib/Runtime/Library/amd64/JavascriptFunctionA.S @@ -141,19 +141,7 @@ NESTED_ENTRY _ZN2Js18JavascriptFunction17CallAsmJsFunctionIiEET_PNS_16Recyclable mov rdi, rsp // rdi = arguments destination rep movsq - // Load 4 first arguments - // First Argument mov rdi, qword ptr [rsp] - // Review:: Is this really our calling convention on xplat ? - // Second Argument - mov rsi, qword ptr [r8] - movaps xmm1, xmmword ptr [r8] - // Third Argument - mov rdx, qword ptr [r8 + 10h] - movaps xmm2, xmmword ptr [r8 + 10h] - // Fourth Argument - mov rcx, qword ptr [r8 + 20h] - movaps xmm3, xmmword ptr [r8 + 20h] xor rax, rax // Zero out rax in case r11 expects varags call r11 diff --git a/pal/inc/pal.h b/pal/inc/pal.h index d33e0987676..71d8e5abb41 100644 --- a/pal/inc/pal.h +++ b/pal/inc/pal.h @@ -6358,7 +6358,9 @@ PALIMPORT double __cdecl tanh(double); PALIMPORT double __cdecl fmod(double, double); PALIMPORT float __cdecl fmodf(float, float); PALIMPORT double __cdecl floor(double); +PALIMPORT float __cdecl floorf(float); PALIMPORT double __cdecl ceil(double); +PALIMPORT float __cdecl ceilf(float); PALIMPORT float __cdecl fabsf(float); PALIMPORT double __cdecl modf(double, double *); PALIMPORT float __cdecl modff(float, float *); diff --git a/pal/inc/rt/palrt.h b/pal/inc/rt/palrt.h index 8b9a7c21848..86c5e1b597a 100644 --- a/pal/inc/rt/palrt.h +++ b/pal/inc/rt/palrt.h @@ -912,7 +912,7 @@ inline int __cdecl _scwprintf_unsafe(const WCHAR *_Format, ...) inline int __cdecl _vsnwprintf_unsafe(WCHAR *_Dst, size_t _SizeInWords, size_t _Count, const WCHAR *_Format, va_list _ArgList) { - if (_Count == _TRUNCATE) _Count = _SizeInWords - 1; + if (_Count == _TRUNCATE) _Count = _SizeInWords; int ret = _vsnwprintf(_Dst, _Count, _Format, _ArgList); _Dst[_SizeInWords - 1] = L'\0'; if (ret < 0 && errno == 0) @@ -934,7 +934,7 @@ inline int __cdecl _snwprintf_unsafe(WCHAR *_Dst, size_t _SizeInWords, size_t _C inline int __cdecl _vsnprintf_unsafe(char *_Dst, size_t _SizeInWords, size_t _Count, const char *_Format, va_list _ArgList) { - if (_Count == _TRUNCATE) _Count = _SizeInWords - 1; + if (_Count == _TRUNCATE) _Count = _SizeInWords; int ret = _vsnprintf(_Dst, _Count, _Format, _ArgList); _Dst[_SizeInWords - 1] = L'\0'; if (ret < 0 && errno == 0) diff --git a/test/AsmJs/rlexe.xml b/test/AsmJs/rlexe.xml index 22b92a644c9..c5995610cf0 100644 --- a/test/AsmJs/rlexe.xml +++ b/test/AsmJs/rlexe.xml @@ -120,7 +120,7 @@ MathBuiltinsCall.js MathBuiltinsCall.baseline - exclude_xplat + exclude_mac -testtrace:asmjs @@ -128,7 +128,7 @@ MathBuiltinsCall.js MathBuiltinsCall.baseline - exclude_xplat + exclude_mac -testtrace:asmjs -maic:1 -sse:3 @@ -351,7 +351,7 @@ MathBuiltinsCall.js MathBuiltinsCall.baseline - exclude_amd64,exclude_xplat + exclude_amd64 @@ -524,7 +524,8 @@ MathBuiltinsCall.js MathBuiltinsCall.baseline - exclude_xplat + + exclude_mac -testtrace:asmjs -nonative @@ -977,7 +978,7 @@ -testtrace:asmjs -args 14000 -endargs -EnableFatalErrorOnOOM- - exclude_dynapogo,exclude_xplat + exclude_dynapogo diff --git a/test/rlexedirs.xml b/test/rlexedirs.xml index 5c90f814421..822ebba5154 100644 --- a/test/rlexedirs.xml +++ b/test/rlexedirs.xml @@ -288,7 +288,7 @@ WasmSpec - exclude_serialized,exclude_arm,exclude_arm64,require_backend,exclude_jshost,exclude_win7,require_wasm,exclude_xplat + exclude_serialized,exclude_arm,exclude_arm64,require_backend,exclude_jshost,exclude_win7,require_wasm diff --git a/test/wasm/binary.js b/test/wasm/binary.js index 7e88c54394f..914c59faefb 100644 --- a/test/wasm/binary.js +++ b/test/wasm/binary.js @@ -4,9 +4,9 @@ //------------------------------------------------------------------------------------------------------- /* global assert,testRunner */ // eslint rule -WScript.LoadScriptFile("../UnitTestFrameWork/UnitTestFrameWork.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-constants.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-module-builder.js"); +WScript.LoadScriptFile("../UnitTestFramework/UnitTestFramework.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-constants.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-module-builder.js"); WScript.Flag("-off:wasmdeferred"); function makeReservedTest(name, body, msg) { @@ -34,7 +34,7 @@ const tests = [ makeReservedTest("call_indirect reserved", [kExprCallIndirect, 1], "call_indirect reserved value must be 0"), ]; -WScript.LoadScriptFile("../UnitTestFrameWork/yargs.js"); +WScript.LoadScriptFile("../UnitTestFramework/yargs.js"); const argv = yargsParse(WScript.Arguments, { boolean: ["verbose"], number: ["start", "end"], diff --git a/test/wasm/i64.js b/test/wasm/i64.js index 4cdcbed9b56..68daf47f278 100644 --- a/test/wasm/i64.js +++ b/test/wasm/i64.js @@ -5,11 +5,11 @@ /* global assert,testRunner,yargsParse,i64ToString */ // eslint rule WScript.Flag("-wasmI64"); -WScript.LoadScriptFile("../UnitTestFrameWork/UnitTestFrameWork.js"); +WScript.LoadScriptFile("../UnitTestFramework/UnitTestFramework.js"); WScript.LoadScriptFile("wasmutils.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-constants.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-module-builder.js"); -WScript.LoadScriptFile("../UnitTestFrameWork/yargs.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-constants.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-module-builder.js"); +WScript.LoadScriptFile("../UnitTestFramework/yargs.js"); const argv = yargsParse(WScript.Arguments, { number: ["start", "end", "verbose"], default: { diff --git a/test/wasm/limits.js b/test/wasm/limits.js index 68f3d5f3289..6b0de02726f 100644 --- a/test/wasm/limits.js +++ b/test/wasm/limits.js @@ -24,9 +24,9 @@ const MaxModuleSize = 1024 * 1024 * 1024; const MaxFunctionSize = 7654321; /* global assert,testRunner */ // eslint rule -WScript.LoadScriptFile("../UnitTestFrameWork/UnitTestFrameWork.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-constants.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-module-builder.js"); +WScript.LoadScriptFile("../UnitTestFramework/UnitTestFramework.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-constants.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-module-builder.js"); WScript.Flag("-off:wasmdeferred"); function compile(moduleStr) { diff --git a/test/wasm/nestedblocks.js b/test/wasm/nestedblocks.js index 000821fc385..78f9c37b8ec 100644 --- a/test/wasm/nestedblocks.js +++ b/test/wasm/nestedblocks.js @@ -4,8 +4,8 @@ //------------------------------------------------------------------------------------------------------- WScript.Flag("-off:wasmdeferred"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-constants.js"); -WScript.LoadScriptFile("../wasmspec/testsuite/harness/wasm-module-builder.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-constants.js"); +WScript.LoadScriptFile("../WasmSpec/testsuite/harness/wasm-module-builder.js"); function test(nNestedBlocks) { const builder = new WasmModuleBuilder(); diff --git a/test/wasm/rlexe.xml b/test/wasm/rlexe.xml index 892e10f7d0d..3882394a5b2 100644 --- a/test/wasm/rlexe.xml +++ b/test/wasm/rlexe.xml @@ -59,7 +59,6 @@ math.js - exclude_xplat -wasm -wasmi64 @@ -87,7 +86,6 @@ global.js baselines/global.baseline - exclude_xplat -wasm -wasmi64 @@ -96,7 +94,6 @@ basic.js basic.baseline -wasm - exclude_xplat @@ -117,7 +114,6 @@ table_imports.js baselines/table_imports.baseline - exclude_xplat -wasm -wasmi64 @@ -126,14 +122,12 @@ call.js baselines/call.baseline -wasm - exclude_xplat array.js array.baseline - exclude_xplat -wasm @@ -141,7 +135,6 @@ trunc.js -wasm - exclude_xplat @@ -149,7 +142,6 @@ api.js baselines/api.baseline -wasm - exclude_xplat @@ -177,7 +169,7 @@ inlining.js inlining.baseline - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 @@ -185,35 +177,35 @@ params.js baselines/params.baseline -wasm -args 14000 -endargs - exclude_jshost,exclude_win7,exclude_dynapogo,exclude_xplat + exclude_jshost,exclude_win7,exclude_dynapogo debugger_basic.js -wasm -dbgbaseline:debugger_basic.js.dbg.baseline - exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger,exclude_xplat + exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger debugger_basic.js -wasm -maic:1 -dbgbaseline:debugger_basic.js.dbg.baseline - exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger,exclude_xplat + exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger debugger_basic.js -wasm -debuglaunch -args debuglaunch -endargs -dbgbaseline:debugger_basic_launch.js.dbg.baseline - exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger,exclude_xplat + exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger wasmcctx.js -wasm -dbgbaseline:wasmcctx.js.dbg.baseline -InspectMaxStringLength:50 - exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger,exclude_xplat + exclude_jshost,exclude_win7,exclude_drt,exclude_snap,require_debugger @@ -257,7 +249,6 @@ i64.js -wasm -args --no-verbose -endargs - exclude_xplat @@ -271,7 +262,7 @@ nestedblocks.js -wasm - exclude_jshost,exclude_drt,exclude_win7,exclude_dynapogo,exclude_xplat + exclude_jshost,exclude_drt,exclude_win7,exclude_dynapogo @@ -286,7 +277,7 @@ signextend.js -wasm -args --no-verbose -endargs - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 @@ -294,49 +285,47 @@ unsigned.js baselines/unsigned.baseline -wasm - exclude_jshost,exclude_drt,exclude_win7,exclude_xplat + exclude_jshost,exclude_drt,exclude_win7 memory.js -wasm - exclude_jshost,exclude_drt,exclude_win7,exclude_xplat + exclude_jshost,exclude_drt,exclude_win7 memory.js -wasm -wasmfastarray- - exclude_jshost,exclude_drt,exclude_win7,exclude_xplat + exclude_jshost,exclude_drt,exclude_win7 superlongsignaturemismatch.js -wasm - exclude_xplat,exclude_jshost,exclude_drt,exclude_win7 + exclude_jshost,exclude_drt,exclude_win7 binary.js -wasm -args --no-verbose -endargs - exclude_xplat binary.js -wasm -args --no-verbose -endargs - exclude_xplat polyinline.js -maxinterpretcount:2 -off:simplejit - exclude_xplat,exclude_jshost,exclude_win7 + exclude_jshost,exclude_win7 @@ -344,7 +333,7 @@ limits.js -wasm -args --no-verbose --end 4 -endargs 300 - exclude_xplat,exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow + exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow @@ -352,7 +341,7 @@ limits.js -wasm -args --no-verbose --start 4 --end 12 -endargs 300 - exclude_xplat,exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow + exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow @@ -360,42 +349,42 @@ limits.js -wasm -args --no-verbose --start 12 -endargs 300 - exclude_xplat,exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow + exclude_jshost,exclude_drt,exclude_win7,exclude_chk,exclude_dynapogo,exclude_x86,Slow loopstslot.js -forcejitloopbody - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 loopyield.js -forcejitloopbody - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 loopyieldnested.js -lic:10 -bgjit- - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 loopyieldtypes.js -forcejitloopbody - exclude_jshost,exclude_win7,exclude_xplat + exclude_jshost,exclude_win7 loopyieldregress.js -lic:0 -bgjit- - exclude_win7,exclude_xplat + exclude_win7 diff --git a/test/wasm/signextend.js b/test/wasm/signextend.js index 4b8c85c822b..ce44cefbd0c 100644 --- a/test/wasm/signextend.js +++ b/test/wasm/signextend.js @@ -6,7 +6,7 @@ /* global assert,testRunner */ // eslint rule WScript.Flag("-WasmSignExtends"); WScript.Flag("-WasmI64"); -WScript.LoadScriptFile("../UnitTestFrameWork/UnitTestFrameWork.js"); +WScript.LoadScriptFile("../UnitTestFramework/UnitTestFramework.js"); function makeCSETest(type, op1, op2, tests) { return { @@ -60,7 +60,7 @@ const tests = [ makeCSETest("i64", "extend32_s", "extend16_s", [0xFF4F, 0xFFF4FFFF, {low: 0x4FFFFFFF, high: 1}]), ]; -WScript.LoadScriptFile("../UnitTestFrameWork/yargs.js"); +WScript.LoadScriptFile("../UnitTestFramework/yargs.js"); const argv = yargsParse(WScript.Arguments, { boolean: ["verbose"], number: ["start", "end"],