Changeset 223202 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Oct 11, 2017, 12:33:48 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r223113 and r223121.
​https://bugs.webkit.org/show_bug.cgi?id=178182

Reintroduced 20% regression on Kraken (Requested by rniwa on
#webkit).

Reverted changesets:

"Enable gigacage on iOS"
​https://bugs.webkit.org/show_bug.cgi?id=177586
​https://trac.webkit.org/changeset/223113

"Use one virtual allocation for all gigacages and their
runways"
​https://bugs.webkit.org/show_bug.cgi?id=178050
​https://trac.webkit.org/changeset/223121

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLLowerDFGToB3.cpp (modified) (1 diff)
• jit/AssemblyHelpers.h (modified) (2 diffs)
• offlineasm/arm64.rb (modified) (3 diffs)
• offlineasm/asm.rb (modified) (2 diffs)
• offlineasm/instructions.rb (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-10-11  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r223113 and r223121.
+        https://bugs.webkit.org/show_bug.cgi?id=178182
+
+        Reintroduced 20% regression on Kraken (Requested by rniwa on
+        #webkit).
+
+        Reverted changesets:
+
+        "Enable gigacage on iOS"
+        https://bugs.webkit.org/show_bug.cgi?id=177586
+        https://trac.webkit.org/changeset/223113
+
+        "Use one virtual allocation for all gigacages and their
+        runways"
+        https://bugs.webkit.org/show_bug.cgi?id=178050
+        https://trac.webkit.org/changeset/223121
+
 2017-10-11  Michael Saboff  <[email protected]>
 

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -11995 +11995 @@
     LValue caged(Gigacage::Kind kind, LValue ptr)
     {
-        if (!Gigacage::isEnabled(kind))
+        if (!Gigacage::shouldBeEnabled())
             return ptr;
         

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

@@ -1315 +1315 @@
     {
 #if GIGACAGE_ENABLED
-        if (!Gigacage::isEnabled(kind))
+        if (!Gigacage::shouldBeEnabled())
             return;
         
@@ -1329 +1329 @@
     {
 #if GIGACAGE_ENABLED
-        if (!Gigacage::isEnabled(kind))
+        if (!Gigacage::shouldBeEnabled())
             return;
         

trunk/Source/JavaScriptCore/offlineasm/arm64.rb

@@ -261 +261 @@
 end
 
-def arm64LowerLabelReferences(list)
-    newList = []
-    list.each {
-        | node |
-        if node.is_a? Instruction
-            case node.opcode
-            when "loadi", "loadis", "loadp", "loadq", "loadb", "loadbs", "loadh", "loadhs"
-                labelRef = node.operands[0]
-                if labelRef.is_a? LabelReference
-                    tmp = Tmp.new(node.codeOrigin, :gpr)
-                    newList << Instruction.new(codeOrigin, "globaladdr", [LabelReference.new(node.codeOrigin, labelRef.label), tmp])
-                    newList << Instruction.new(codeOrigin, node.opcode, [Address.new(node.codeOrigin, tmp, Immediate.new(node.codeOrigin, labelRef.offset)), node.operands[1]])
-                else
-                    newList << node
-                end
-            else
-                newList << node
-            end
-        else
-            newList << node
-        end
-    }
-    newList
-end
-
 # Workaround for Cortex-A53 erratum (835769)
 def arm64CortexA53Fix835769(list)
@@ -322 +297 @@
         result = riscLowerShiftOps(result)
         result = arm64LowerMalformedLoadStoreAddresses(result)
-        result = arm64LowerLabelReferences(result)
         result = riscLowerMalformedAddresses(result) {
             | node, address |
@@ -931 +905 @@
             $asm.puts "nop"
             $asm.putStr("#endif")
-        when "globaladdr"
-            uid = $asm.newUID
-            $asm.puts "L_offlineasm_loh_adrp_#{uid}:"
-            $asm.puts "adrp #{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGE"
-            $asm.puts "L_offlineasm_loh_ldr_#{uid}:"
-            $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
-            $asm.deferAction {
-                $asm.puts ".loh AdrpLdrGot L_offlineasm_loh_adrp_#{uid}, L_offlineasm_loh_ldr_#{uid}"
-            }
         else
             lowerDefault

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -47 +47 @@
         @numLocalLabels = 0
         @numGlobalLabels = 0
-        @deferredActions = []
-        @count = 0
 
         @newlineSpacerState = :none
@@ -76 +74 @@
         end
         putsLastComment
-        @deferredActions.each {
-            | action |
-            action.call()
-        }
         @outp.puts "OFFLINE_ASM_END" if !$emitWinAsm
         @state = :cpp
-    end
-    
-    def deferAction(&proc)
-        @deferredActions << proc
-    end
-    
-    def newUID
-        @count += 1
-        @count
     end
     

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -268 +268 @@
     [
      "pcrtoaddr",   # Address from PC relative offset - adr instruction
-     "nopFixCortexA53Err835769", # nop on Cortex-A53 (nothing otherwise)
-     "globaladdr"
+     "nopFixCortexA53Err835769" # nop on Cortex-A53 (nothing otherwise)
     ]