Changeset 237803 in webkit

Timestamp:

Nov 5, 2018 8:07:40 AM (5 years ago)

Author:

dinfuehr@igalia.com

Message:

Enable LLInt on ARMv7/Linux
​https://bugs.webkit.org/show_bug.cgi?id=191190

Reviewed by Yusuke Suzuki.

After enabling the new bytecode format in r237547, C_LOOP was
forced on all 32-bit platforms. Now enable LLInt again on
.:

ARMv7-Thumb2/Linux by default.

• Source/cmake/WebKitFeatures.cmake:

Source/JavaScriptCore:

ARMv7-Thumb2/Linux.

This adds a callee-saved register in ARMv7/Linux for the metadataTable and
stores/restores it on LLInt function calls. It also introduces the globaladdr-
instruction for the ARM-offlineasm to access the opcode-table.

• jit/GPRInfo.h:
• jit/RegisterSet.cpp:

(JSC::RegisterSet::llintBaselineCalleeSaveRegisters):

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• offlineasm/arm.rb:
• offlineasm/asm.rb:
• offlineasm/instructions.rb:

Source/WTF:

ARMv7-Thumb2/Linux by default.

• wtf/Platform.h:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jit/GPRInfo.h (modified) (1 diff)
• Source/JavaScriptCore/jit/RegisterSet.cpp (modified) (1 diff)
• Source/JavaScriptCore/llint/LowLevelInterpreter.asm (modified) (5 diffs)
• Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (modified) (4 diffs)
• Source/JavaScriptCore/offlineasm/arm.rb (modified) (6 diffs)
• Source/JavaScriptCore/offlineasm/asm.rb (modified) (4 diffs)
• Source/JavaScriptCore/offlineasm/instructions.rb (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Platform.h (modified) (1 diff)
• Source/cmake/WebKitFeatures.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2018-11-05  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        Enable LLInt on ARMv7/Linux
+        https://bugs.webkit.org/show_bug.cgi?id=191190
+
+        Reviewed by Yusuke Suzuki.
+
+        After enabling the new bytecode format in r237547, C_LOOP was
+        forced on all 32-bit platforms. Now enable LLInt again on
+        ARMv7-Thumb2/Linux by default.
+
+        * Source/cmake/WebKitFeatures.cmake:
+
 2018-11-05  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-11-05  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        Enable LLInt on ARMv7/Linux
+        https://bugs.webkit.org/show_bug.cgi?id=191190
+
+        Reviewed by Yusuke Suzuki.
+
+        After enabling the new bytecode format in r237547, C_LOOP was
+        forced on all 32-bit platforms. Now enable LLInt again on
+        ARMv7-Thumb2/Linux.
+
+        This adds a callee-saved register in ARMv7/Linux for the metadataTable and
+        stores/restores it on LLInt function calls. It also introduces the globaladdr-
+        instruction for the ARM-offlineasm to access the opcode-table.
+
+        * jit/GPRInfo.h:
+        * jit/RegisterSet.cpp:
+        (JSC::RegisterSet::llintBaselineCalleeSaveRegisters):
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+        * offlineasm/arm.rb:
+        * offlineasm/asm.rb:
+        * offlineasm/instructions.rb:
+
 2018-11-05  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/JavaScriptCore/jit/GPRInfo.h

@@ -551 +551 @@
 #endif
     static const GPRReg regT8 = ARMRegisters::r4;
+    static const GPRReg regCS0 = ARMRegisters::r11;
     // These registers match the baseline JIT.
     static const GPRReg callFrameRegister = ARMRegisters::fp;

trunk/Source/JavaScriptCore/jit/RegisterSet.cpp

@@ -237 +237 @@
 #endif
 #elif CPU(ARM_THUMB2)
+    result.set(GPRInfo::regCS0);
 #elif CPU(ARM_TRADITIONAL)
 #elif CPU(ARM64)

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -230 +230 @@
     const CalleeSaveSpaceAsVirtualRegisters = 4
 elsif C_LOOP
+    const CalleeSaveSpaceAsVirtualRegisters = 1
+elsif ARMv7
     const CalleeSaveSpaceAsVirtualRegisters = 1
 else
@@ -295 +297 @@
     if C_LOOP
         const metadataTable = csr3
+    elsif ARMv7
+        const metadataTable = csr0
+    else
+        error
     end
 end
@@ -713 +719 @@
     elsif ARM or ARMv7_TRADITIONAL
     elsif ARMv7
+        storep metadataTable, -4[cfr]
     elsif ARM64 or ARM64E
         emit "stp x27, x28, [x29, #-16]"
@@ -737 +744 @@
     elsif ARM or ARMv7_TRADITIONAL
     elsif ARMv7
+        loadp -4[cfr], metadataTable
     elsif ARM64 or ARM64E
         emit "ldp x25, x26, [x29, #-32]"
@@ -1187 +1195 @@
     end
 
-    if JSVALUE64 or C_LOOP
-        # FIXME: cleanup double load
-        # https://bugs.webkit.org/show_bug.cgi?id=190933
-        loadp CodeBlock::m_metadata[t1], metadataTable
-        loadp MetadataTable::m_buffer[metadataTable], metadataTable
-    end
+    # FIXME: cleanup double load
+    # https://bugs.webkit.org/show_bug.cgi?id=190933
+    loadp CodeBlock::m_metadata[t1], metadataTable
+    loadp MetadataTable::m_buffer[metadataTable], metadataTable
+
     if JSVALUE64
         move TagTypeNumber, tagTypeNumber

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -344 +344 @@
 end
 
-_handleUncaughtException:
+op(handleUncaughtException, macro()
     loadp Callee + PayloadOffset[cfr], t3
     andp MarkedBlockMask, t3
@@ -375 +375 @@
     functionEpilogue()
     ret
+end)
 
 macro doReturnFromHostFunction(extraStackSpace)
@@ -1939 +1940 @@
 
 
-commonOp(op_catch, macro() end, macro (size)
+commonOp(llint_op_catch, macro() end, macro (size)
     # This is where we end up from the JIT's throw trampoline (because the
     # machine code return address will be set to _llint_op_catch), and from
@@ -1953 +1954 @@
     restoreStackPointerAfterCall()
 
-    if C_LOOP
-        # restore metadataTable since we don't restore callee saves for CLoop during unwinding
-        loadp CodeBlock[cfr], t1
-        # FIXME: cleanup double load
-        # https://bugs.webkit.org/show_bug.cgi?id=190933
-        loadp CodeBlock::m_metadata[t1], metadataTable
-        loadp MetadataTable::m_buffer[metadataTable], metadataTable
-    end
+    # restore metadataTable since we don't restore callee saves for CLoop during unwinding
+    loadp CodeBlock[cfr], t1
+    # FIXME: cleanup double load
+    # https://bugs.webkit.org/show_bug.cgi?id=190933
+    loadp CodeBlock::m_metadata[t1], metadataTable
+    loadp MetadataTable::m_buffer[metadataTable], metadataTable
 
     loadi VM::targetInterpreterPCForThrow[t3], PC

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -39 +39 @@
 #  x9 => t5         (callee-save)
 # x10 =>            (callee-save scratch)
-# x11 => cfr        (ARM and ARMv7 traditional)
+# x11 => cfr, csr0  (callee-save, metadataTable)
 # x12 =>            (callee-save scratch)
 #  lr => lr
@@ -134 +134 @@
         when "cfr"
             isARMv7 ?  "r7" : "r11"
+        when "csr0"
+            "r11"
         when "lr"
             "lr"
@@ -274 +276 @@
 end
 
+def armLowerLabelReferences(list)
+    newList = []
+    list.each {
+        | node |
+        if node.is_a? Instruction
+            case node.opcode
+            when "leai", "leap", "leaq"
+                labelRef = node.operands[0]
+                if labelRef.is_a? LabelReference
+                    raise unless labelRef.offset == 0
+                    tmp = Tmp.new(node.codeOrigin, :gpr)
+                    newList << Instruction.new(codeOrigin, "globaladdr", [LabelReference.new(node.codeOrigin, labelRef.label), node.operands[1], tmp])
+                else
+                    newList << node
+                end
+            else
+                newList << node
+            end
+        else
+            newList << node
+        end
+    }
+    newList
+end
+
 class Sequence
     def getModifiedListARM
@@ -295 +322 @@
         result = riscLowerHardBranchOps(result)
         result = riscLowerShiftOps(result)
+        result = armLowerLabelReferences(result)
         result = riscLowerMalformedAddresses(result) {
             | node, address |
@@ -461 +489 @@
         when "loadb"
             $asm.puts "ldrb #{armFlippedOperands(operands)}"
-        when "loadbs"
+        when "loadbs", "loadbsp"
             $asm.puts "ldrsb.w #{armFlippedOperands(operands)}"
         when "storeb"
@@ -683 +711 @@
         when "clrbp"
             $asm.puts "bic #{operands[2].armOperand}, #{operands[0].armOperand}, #{operands[1].armOperand}"
+        when "globaladdr"
+            labelRef = operands[0]
+            dest = operands[1]
+            temp = operands[2]
+
+            uid = $asm.newUID
+            gotLabel = "L_offlineasm_arm_got_#{uid}"
+            offsetLabel = "L_offlineasm_arm_got_offset_#{uid}"
+
+            $asm.puts "ldr #{dest.armOperand}, #{gotLabel}"
+            $asm.puts "ldr #{temp.armOperand}, #{gotLabel}+4"
+            $asm.puts "#{offsetLabel}:"
+            $asm.puts "add #{dest.armOperand}, pc, #{dest.armOperand}"
+            $asm.puts "ldr #{dest.armOperand}, [#{dest.armOperand}, #{temp.armOperand}]"
+
+            offset = $activeBackend == "ARMv7" ? 4 : 8
+
+            $asm.deferNextLabelAction {
+                $asm.puts "#{gotLabel}:"
+                $asm.puts ".word _GLOBAL_OFFSET_TABLE_-(#{offsetLabel}+#{offset})"
+                $asm.puts ".word #{labelRef.asmLabel}(GOT)"
+            }
         else
             lowerDefault

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -52 +52 @@
         @numGlobalLabels = 0
         @deferredActions = []
+        @deferredNextLabelActions = []
         @count = 0
 
@@ -80 +81 @@
         end
         putsLastComment
-        @deferredActions.each {
+        (@deferredNextLabelActions + @deferredActions).each {
             | action |
             action.call()
@@ -90 +91 @@
     def deferAction(&proc)
         @deferredActions << proc
+    end
+
+    def deferNextLabelAction(&proc)
+        @deferredNextLabelActions << proc
     end
     
@@ -210 +215 @@
     def putsLabel(labelName, isGlobal)
         raise unless @state == :asm
+        @deferredNextLabelActions.each {
+            | action |
+            action.call()
+        }
+        @deferredNextLabelActions = []
         @numGlobalLabels += 1
         putsProcEndIfNeeded if $emitWinAsm and isGlobal

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -266 +266 @@
     [
      "clrbp",
-     "mvlbl"
+     "mvlbl",
+     "globaladdr"
     ]
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-11-05  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        Enable LLInt on ARMv7/Linux
+        https://bugs.webkit.org/show_bug.cgi?id=191190
+
+        Reviewed by Yusuke Suzuki.
+
+        After enabling the new bytecode format in r237547, C_LOOP was
+        forced on all 32-bit platforms. Now enable LLInt again on
+        ARMv7-Thumb2/Linux by default.
+
+        * wtf/Platform.h:
+
 2018-11-04  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -760 +760 @@
 #endif
 
-/* Force C_LOOP for 32-bit builds. */
+/* Disable JIT for 32-bit builds. */
 #if USE(JSVALUE32_64)
 #undef ENABLE_JIT
 #define ENABLE_JIT 0
+/* Force C_LOOP on all architectures but ARMv7-Thumb2/Linux. */
+#if !(CPU(ARM_THUMB2) && OS(LINUX))
 #undef ENABLE_C_LOOP
 #define ENABLE_C_LOOP 1
+#endif
 #endif
 

trunk/Source/cmake/WebKitFeatures.cmake

@@ -69 +69 @@
         set(ENABLE_C_LOOP_DEFAULT OFF)
         set(ENABLE_SAMPLING_PROFILER_DEFAULT ON)
+    elseif (WTF_CPU_ARM AND WTF_OS_UNIX)
+        set(ENABLE_JIT_DEFAULT OFF)
+        set(ENABLE_FTL_DEFAULT OFF)
+        set(USE_SYSTEM_MALLOC_DEFAULT OFF)
+        set(ENABLE_C_LOOP_DEFAULT OFF)
+        set(ENABLE_SAMPLING_PROFILER_DEFAULT OFF)
     else ()
         set(ENABLE_JIT_DEFAULT OFF)