put wasm under experimental JS features flag

lib/Common/ConfigFlagsList.h

@@ -31,13 +31,12 @@ PHASE(All)
     PHASE(Delay)
         PHASE(Speculation)
         PHASE(GatherCodeGenData)
-    PHASE(Wasm)
-        PHASE(WasmBytecode)
-            PHASE(WasmParser)
-            PHASE(WasmReader)
-            PHASE(WasmSection)
-            PHASE(WasmLEB128)
-            PHASE(WasmFunctionBody)
+    PHASE(WasmBytecode)
+        PHASE(WasmParser)
+        PHASE(WasmReader)
+        PHASE(WasmSection)
+        PHASE(WasmLEB128)
+        PHASE(WasmFunctionBody)
         PHASE(WasmDeferred)
         PHASE(WasmNativeTypeCallTest)
     PHASE(Asmjs)
@@ -378,6 +377,7 @@ PHASE(All)
 #else
     #define DEFAULT_CONFIG_SIMDJS               (false)
 #endif
+#define DEFAULT_CONFIG_WASM               (false)
 #define DEFAULT_CONFIG_BgJitDelayFgBuffer   (0)
 #define DEFAULT_CONFIG_BgJitPendingFuncCap  (31)
 #define DEFAULT_CONFIG_CurrentSourceInfo     (true)
@@ -830,6 +830,7 @@ FLAGNR(Boolean, AsmJsEdge             , "Enable asm.js features which may have b
     #define COMPILE_DISABLE_Simdjs 0
 #endif
 FLAGPR_REGOVR_EXP(Boolean, ES6, Simdjs, "Enable Simdjs", DEFAULT_CONFIG_SIMDJS)
+
 FLAGR(Boolean, Simd128TypeSpec, "Enable type-specialization of Simd128 symbols", false)
 
 FLAGNR(Boolean, AssertBreak           , "Debug break on assert", false)
@@ -1023,6 +1024,11 @@ FLAGPRA          (Boolean, ES6, ESSharedArrayBuffer    , sab     , "Enable Share
 
 // /ES6 (BLUE+1) features/flags
 
+#ifndef COMPILE_DISABLE_Wasm
+#define COMPILE_DISABLE_Wasm 0
+#endif
+FLAGPR_REGOVR_EXP(Boolean, ES6, Wasm, "Enable WebAssembly", DEFAULT_CONFIG_WASM)
+
 #ifdef ENABLE_PROJECTION
 FLAGNR(Boolean, WinRTDelegateInterfaces , "Treat WinRT Delegates as Interfaces when determining their resolvability.", DEFAULT_CONFIG_WinRTDelegateInterfaces)
 FLAGR(Boolean, WinRTAdaptiveApps        , "Enable the adaptive apps feature, allowing for variable projection."      , DEFAULT_CONFIG_WinRTAdaptiveApps)

lib/Runtime/Base/ThreadConfigFlagsList.h

@@ -48,6 +48,7 @@ FLAG_RELEASE(IsES7AsyncAndAwaitEnabled, ES7AsyncAwait)
 FLAG_RELEASE(IsArrayBufferTransferEnabled, ArrayBufferTransfer)
 FLAG_RELEASE(IsESObjectGetOwnPropertyDescriptorsEnabled, ESObjectGetOwnPropertyDescriptors)
 FLAG_RELEASE(IsESSharedArrayBufferEnabled, ESSharedArrayBuffer)
+FLAG_RELEASE(IsWasmEnabled, Wasm)
 #ifdef ENABLE_PROJECTION
 FLAG(AreWinRTDelegatesInterfaces, WinRTDelegateInterfaces)
 FLAG_RELEASE(IsWinRTAdaptiveAppsEnabled, WinRTAdaptiveApps)

lib/Runtime/Library/JavascriptLibrary.cpp

@@ -307,7 +307,7 @@ namespace Js
         INIT_ERROR_PROTO(uriErrorPrototype, InitializeURIErrorPrototype);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             INIT_ERROR_PROTO(webAssemblyCompileErrorPrototype, InitializeWebAssemblyCompileErrorPrototype);
             INIT_ERROR_PROTO(webAssemblyRuntimeErrorPrototype, InitializeWebAssemblyRuntimeErrorPrototype);
@@ -363,7 +363,7 @@ namespace Js
             DeferredTypeHandler<InitializeStringIteratorPrototype, DefaultDeferredTypeFilter, true>::GetDefaultInstance()));
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             webAssemblyMemoryPrototype = DynamicObject::New(recycler,
                 DynamicType::New(scriptContext, TypeIds_Object, objectPrototype, nullptr,
@@ -467,7 +467,7 @@ namespace Js
         INIT_SIMPLE_TYPE(uriErrorType, TypeIds_Error, uriErrorPrototype);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             INIT_SIMPLE_TYPE(webAssemblyCompileErrorType, TypeIds_Error, webAssemblyCompileErrorPrototype);
             INIT_SIMPLE_TYPE(webAssemblyRuntimeErrorType, TypeIds_Error, webAssemblyRuntimeErrorPrototype);
@@ -612,7 +612,7 @@ namespace Js
 #endif
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             webAssemblyModuleType = DynamicType::New(scriptContext, TypeIds_WebAssemblyModule, webAssemblyModulePrototype, nullptr, NullTypeHandler<false>::GetDefaultInstance(), true, true);
             webAssemblyInstanceType = DynamicType::New(scriptContext, TypeIds_WebAssemblyInstance, webAssemblyInstancePrototype, nullptr, NullTypeHandler<false>::GetDefaultInstance(), true, true);
@@ -1508,7 +1508,7 @@ namespace Js
         AddFunction(globalObject, PropertyIds::URIError, uriErrorConstructor);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             // new WebAssembly object
             webAssemblyObject = DynamicObject::New(recycler,

lib/Runtime/Library/WebAssemblyModule.cpp

@@ -94,7 +94,7 @@ WebAssemblyModule::CreateModule(
     const byte* buffer,
     const uint lengthBytes)
 {
-    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmPhase);
+    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmBytecodePhase);
     Unused(wasmPhase);
 
     WebAssemblyModule * webAssemblyModule = nullptr;
@@ -162,7 +162,7 @@ WebAssemblyModule::ValidateModule(
     const byte* buffer,
     const uint lengthBytes)
 {
-    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmPhase);
+    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmBytecodePhase);
     Unused(wasmPhase);
 
     try

lib/WasmReader/WasmReader.h

@@ -20,7 +20,7 @@
     }
 
 // Level of tracing
-#define DO_WASM_TRACE_ALL       PHASE_TRACE1(Js::WasmPhase)
+#define DO_WASM_TRACE_ALL       PHASE_TRACE1(Js::WasmBytecodePhase)
 #define DO_WASM_TRACE_DECODER   DO_WASM_TRACE_ALL || PHASE_TRACE1(Js::WasmReaderPhase)
   #define DO_WASM_TRACE_SECTION DO_WASM_TRACE_DECODER || PHASE_TRACE1(Js::WasmSectionPhase)
 #define DO_WASM_TRACE_LEB128    DO_WASM_TRACE_ALL || PHASE_TRACE1(Js::WasmLEB128Phase)

test/WasmSpec/rlexe.xml

@@ -5,364 +5,364 @@
     <default>
       <files>spec.js</files>
       <baseline>baselines\address.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\address.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\address.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\block.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\block.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\block.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\br.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\br.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\br.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\br_if.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\br_if.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\br_if.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\br_table.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\br_table.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\br_table.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\break-drop.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\break-drop.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\break-drop.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\call.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\call.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\call.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\call_indirect.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\call_indirect.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\call_indirect.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\chakra_i64.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\chakra_i64.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\chakra_i64.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\comments.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\comments.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\comments.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\conversions.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\conversions.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\conversions.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\endianness.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\endianness.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\endianness.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\f32.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\f32.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\f32.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\f32_cmp.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\f32_cmp.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\f32_cmp.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\f64.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\f64.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\f64.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\f64_cmp.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\f64_cmp.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\f64_cmp.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\fac.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\fac.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\fac.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\float_exprs.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\float_exprs.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\float_exprs.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\float_literals.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\float_literals.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\float_literals.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\float_misc.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\float_misc.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\float_misc.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\forward.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\forward.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\forward.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\func.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\func.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\func.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\func_ptrs.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\func_ptrs.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\func_ptrs.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\get_local.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\get_local.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\get_local.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\globals.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\globals.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\globals.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\i32.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\i32.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\i32.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\i64.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\i64.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\i64.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\imports.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\imports.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\imports.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\int_exprs.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\int_exprs.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\int_exprs.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\int_literals.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\int_literals.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\int_literals.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\labels.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\labels.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\labels.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\left-to-right.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\left-to-right.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\left-to-right.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\loop.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\loop.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\loop.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\memory.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\memory.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\memory.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\memory_redundancy.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\memory_redundancy.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\memory_redundancy.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\memory_trap.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\memory_trap.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\memory_trap.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\names.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\names.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\names.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\nop.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\nop.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\nop.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\resizing.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\resizing.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\resizing.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\return.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\return.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\return.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\select.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\select.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\select.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\set_local.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\set_local.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\set_local.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\skip-stack-guard-page.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\skip-stack-guard-page.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\skip-stack-guard-page.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\stack.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\stack.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\stack.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\start.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\start.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\start.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\store_retval.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\store_retval.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\store_retval.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\switch.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\switch.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\switch.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\tee_local.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\tee_local.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\tee_local.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\traps.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\traps.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\traps.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\typecheck.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\typecheck.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\typecheck.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\unreachable.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\unreachable.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\unreachable.json -endargs</compile-flags>
     </default>
   </test>
   <test>
     <default>
       <files>spec.js</files>
       <baseline>baselines\unwind.baseline</baseline>
-      <compile-flags>-on:wasm -args testsuite-bin\unwind.json -endargs</compile-flags>
+      <compile-flags>-wasm -args testsuite-bin\unwind.json -endargs</compile-flags>
     </default>
   </test>
 </regress-exe>

test/wasm/rlexe.xml

@@ -4,108 +4,108 @@
   <default>
     <files>rot.js</files>
     <baseline>rot.baseline</baseline>
-    <compile-flags>-on:wasm</compile-flags>
+    <compile-flags>-wasm</compile-flags>
   </default>
 </test>
 <test>
   <default>
     <files>misc.js</files>
     <baseline>misc.baseline</baseline>
-    <compile-flags>-on:wasm </compile-flags>
+    <compile-flags>-wasm </compile-flags>
   </default>
 </test>
 <test>
   <default>
     <files>controlflow.js</files>
     <baseline>controlflow.baseline</baseline>
-    <compile-flags>-on:wasm</compile-flags>
+    <compile-flags>-wasm</compile-flags>
   </default>
 </test>
 <test>
     <default>
        <files>f32.js</files>
        <baseline>f32.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>math.js</files>
-       <compile-flags>-on:Wasm -on:WasmNativeTypeCallTest</compile-flags>
+       <compile-flags>-wasm -on:wasmNativeTypeCallTest</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>dropteelocal.js</files>
        <baseline>dropteelocal.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>i32_popcnt.js</files>
        <baseline>i32_popcnt.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>f32address.js</files>
-       <compile-flags>-on:Wasm  </compile-flags>
+       <compile-flags>-wasm  </compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>unreachable.js</files>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>global.js</files>
        <baseline>global.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>basic.js</files>
        <baseline>basic.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>table.js</files>
        <baseline>table.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>table_imports.js</files>
        <baseline>baselines\table_imports.baseline</baseline>
-       <compile-flags>-on:Wasm -on:WasmNativeTypeCallTest</compile-flags>
+       <compile-flags>-wasm -on:wasmNativeTypeCallTest</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>call.js</files>
        <baseline>baselines\call.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>array.js</files>
        <baseline>array.baseline</baseline>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 <test>
     <default>
        <files>trunc.js</files>
-       <compile-flags>-on:Wasm</compile-flags>
+       <compile-flags>-wasm</compile-flags>
     </default>
 </test>
 </regress-exe>