Changeset 251966 in webkit

Timestamp:

Nov 2, 2019 1:12:38 PM (4 years ago)

Author:

rmorisset@apple.com

Message:

The offline assembler is wrong about which immediates are supported by and/or/xor on ARM64
​https://bugs.webkit.org/show_bug.cgi?id=203752

Reviewed by Tadeu Zagallo.

See ​https://dinfuehr.github.io/blog/encoding-of-immediate-values-on-aarch64/ for the details of which immediates are supported.
This patch is a minimal fix, ideally we should refactor all of the code dealing with immediates in risc.rb, but considering that I don't know ruby and this code is poorly/not tested, I went for the simplest possible fix.

• offlineasm/arm64.rb:
• offlineasm/mips.rb:
• offlineasm/risc.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/arm.rb (modified) (1 diff)
• offlineasm/arm64.rb (modified) (2 diffs)
• offlineasm/mips.rb (modified) (1 diff)
• offlineasm/risc.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-11-02  Robin Morisset  <rmorisset@apple.com>
+
+        The offline assembler is wrong about which immediates are supported by and/or/xor on ARM64
+        https://bugs.webkit.org/show_bug.cgi?id=203752
+
+        Reviewed by Tadeu Zagallo.
+
+        See https://dinfuehr.github.io/blog/encoding-of-immediate-values-on-aarch64/ for the details of which immediates are supported.
+        This patch is a minimal fix, ideally we should refactor all of the code dealing with immediates in risc.rb, but considering that I don't know ruby and this code is poorly/not tested, I went for the simplest possible fix.
+
+        * offlineasm/arm64.rb:
+        * offlineasm/mips.rb:
+        * offlineasm/risc.rb:
+
 2019-11-02  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -301 +301 @@
         result = riscLowerMalformedAddressesDouble(result)
         result = riscLowerMisplacedImmediates(result, ["storeb", "storei", "storep", "storeq"])
-        result = riscLowerMalformedImmediates(result, 0..0xff)
+        result = riscLowerMalformedImmediates(result, 0..0xff, 0..0x0ff)
         result = riscLowerMisplacedAddresses(result)
         result = riscLowerRegisterReuse(result)

trunk/Source/JavaScriptCore/offlineasm/arm64.rb

@@ -215 +215 @@
 class Immediate
     def arm64Operand(kind)
-        raise "Invalid immediate #{value} at #{codeOriginString}" if value < 0 or value > 4095
         "\##{value}"
     end
@@ -419 +418 @@
             end
         }
+
         result = riscLowerMisplacedImmediates(result, ["storeb", "storei", "storep", "storeq"])
-        result = riscLowerMalformedImmediates(result, 0..4095)
+
+        # The rules for which immediates are valid for and/or/xor instructions are fairly involved, see https://dinfuehr.github.io/blog/encoding-of-immediate-values-on-aarch64/
+        validLogicalImmediates = []
+        def rotate(value, n, size)
+            mask = (1 << size) - 1
+            shiftedValue = value << n
+            result = (shiftedValue & mask) | ((shiftedValue & ~mask) >> size)
+            return result
+        end
+        def replicate(value, size)
+            until size == 64 do
+                value = value | (value << size)
+                size *= 2
+            end
+            return value
+        end
+        size = 2
+        until size > 64 do
+            for numberOfOnes in 1..(size-1) do
+                for rotation in 0..(size-1) do
+                    immediate = 0;
+                    for i in 0..(numberOfOnes-1) do
+                        immediate = immediate*2 + 1
+                    end
+                    immediate = rotate(immediate, rotation, size)
+                    immediate = replicate(immediate, size)
+                    validLogicalImmediates << immediate
+                end
+            end
+            size *= 2
+        end
+        result = riscLowerMalformedImmediates(result, 0..4095, validLogicalImmediates)
+
         result = riscLowerMisplacedAddresses(result)
         result = riscLowerMalformedAddresses(result) {

trunk/Source/JavaScriptCore/offlineasm/mips.rb

@@ -730 +730 @@
         result = riscLowerMisplacedImmediates(result, ["storeb", "storei", "storep"])
         result = mipsLowerMisplacedImmediates(result)
-        result = riscLowerMalformedImmediates(result, -0x7fff..0x7fff)
+        result = riscLowerMalformedImmediates(result, -0x7fff..0x7fff, -0x7fff..0x7fff)
         result = mipsLowerMisplacedAddresses(result)
         result = riscLowerMisplacedAddresses(result)

trunk/Source/JavaScriptCore/offlineasm/risc.rb

@@ -363 +363 @@
 end
 
-def riscLowerMalformedImmediates(list, validImmediates)
+def riscLowerMalformedImmediates(list, validImmediates, validLogicalImmediates)
     newList = []
     list.each {
@@ -396 +396 @@
                     newList << node.riscLowerMalformedImmediatesRecurse(newList, validImmediates)
                 end
+            when "ori", "orh", "orp", "oris", "xori", "xorp", "andi", "andp"
+                newList << node.riscLowerMalformedImmediatesRecurse(newList, validLogicalImmediates)
             else
                 newList << node.riscLowerMalformedImmediatesRecurse(newList, validImmediates)