Place WebAssembly fast array under a flag

chakra-core · Jan 27, 2017 · f48d1f5 · f48d1f5
1 parent 6a7a303
commit f48d1f5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/lib/Backend/IRBuilderAsmJs.cpp b/lib/Backend/IRBuilderAsmJs.cpp
@@ -1445,8 +1445,10 @@ void
 IRBuilderAsmJs::BuildAsmTypedArr(Js::OpCodeAsmJs newOpcode, uint32 offset, uint32 slotIndex, Js::RegSlot value, int8 viewType)
 {
     IRType type = TyInt32;
+    bool isWasm = this->m_func->GetJITFunctionBody()->IsWasmFunction();
     bool isLd = newOpcode == Js::OpCodeAsmJs::LdArr || newOpcode == Js::OpCodeAsmJs::LdArrWasm || newOpcode == Js::OpCodeAsmJs::LdArrConst;
-    Js::OpCode op = isLd ? (this->m_func->GetJITFunctionBody()->IsWasmFunction() ?
+
+    Js::OpCode op = isLd ? (isWasm ?
         Js::OpCode::LdArrViewElemWasm : Js::OpCode::LdArrViewElem) : Js::OpCode::StArrViewElem;
     ValueType arrayType;
     WAsmJs::Types valueRegType = WAsmJs::INT32;
@@ -1578,9 +1580,12 @@ IRBuilderAsmJs::BuildAsmTypedArr(Js::OpCodeAsmJs newOpcode, uint32 offset, uint3
         instr = IR::Instr::New(op, indirOpnd, regOpnd, m_func);
     }
 
-#if !_WIN64
-    instr->SetSrc2(BuildSrcOpnd(AsmJsRegSlots::LengthReg, TyUint32));
+#if ENABLE_FAST_ARRAYBUFFER
+    if (isWasm && !PHASE_ON1(Js::WasmFastArrayPhase))
 #endif
+    {
+        instr->SetSrc2(BuildSrcOpnd(AsmJsRegSlots::LengthReg, TyUint32));
+    }
     AddInstr(instr, offset);
 }
 

diff --git a/lib/Backend/amd64/LowererMDArch.cpp b/lib/Backend/amd64/LowererMDArch.cpp
@@ -1118,9 +1118,13 @@ LowererMDArch::LowerAsmJsCallI(IR::Instr * callInstr)
 IR::Instr *
 LowererMDArch::LowerWasmMemOp(IR::Instr * instr, IR::Opnd *addrOpnd)
 {
-#if _WIN64
-    return instr;
-#else
+#if ENABLE_FAST_ARRAYBUFFER
+    if (PHASE_ON1(Js::WasmFastArrayPhase))
+    {
+        return instr;
+    }
+#endif
+
     Assert(instr->GetSrc2());
     IR::LabelInstr * helperLabel = Lowerer::InsertLabel(true, instr);
     IR::LabelInstr * loadLabel = Lowerer::InsertLabel(false, instr);
@@ -1137,8 +1141,7 @@ LowererMDArch::LowerWasmMemOp(IR::Instr * instr, IR::Opnd *addrOpnd)
 
     lowererMD->m_lowerer->GenerateThrow(IR::IntConstOpnd::New(WASMERR_ArrayIndexOutOfRange, TyInt32, m_func), loadLabel);
     Lowerer::InsertBranch(Js::OpCode::Br, loadLabel, helperLabel);
-    return done;
-#endif
+    return doneLabel;
 }
 
 IR::Instr*

diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h
@@ -40,6 +40,7 @@ PHASE(All)
         PHASE(WasmFunctionBody)
         PHASE(WasmDeferred)
         PHASE(WasmValidatePrejit)
+        PHASE(WasmFastArray)
     PHASE(Asmjs)
         PHASE(AsmjsTmpRegisterAllocation)
         PHASE(AsmjsEncoder)

diff --git a/lib/Runtime/Library/WebAssemblyMemory.cpp b/lib/Runtime/Library/WebAssemblyMemory.cpp
@@ -188,7 +188,17 @@ WebAssemblyMemory *
 WebAssemblyMemory::CreateMemoryObject(uint32 initial, uint32 maximum, ScriptContext * scriptContext)
 {
     uint32 byteLength = UInt32Math::Mul<WebAssembly::PageSize>(initial);
-    ArrayBuffer * buffer = scriptContext->GetLibrary()->CreateWebAssemblyArrayBuffer(byteLength);
+    ArrayBuffer* buffer;
+#if ENABLE_FAST_ARRAYBUFFER
+    if (PHASE_ON1(Js::WasmFastArrayPhase))
+    {
+        buffer = scriptContext->GetLibrary()->CreateWebAssemblyArrayBuffer(byteLength);
+    }
+    else
+#endif
+    {
+        buffer = scriptContext->GetLibrary()->CreateArrayBuffer(byteLength);
+    }
     return RecyclerNewFinalized(scriptContext->GetRecycler(), WebAssemblyMemory, buffer, initial, maximum, scriptContext->GetLibrary()->GetWebAssemblyMemoryType());
 }
 

diff --git a/test/wasm/rlexe.xml b/test/wasm/rlexe.xml
@@ -10,7 +10,13 @@
 <test>
   <default>
     <files>fastarray.js</files>
-    <compile-flags>-wasm </compile-flags>
+    <compile-flags>-wasm</compile-flags>
+  </default>
+</test>
+<test>
+  <default>
+    <files>fastarray.js</files>
+    <compile-flags>-wasm -on:WasmFastArray</compile-flags>
   </default>
 </test>
 <test>