Changeset 169092 in webkit

Timestamp:

May 19, 2014, 6:53:56 PM (12 years ago)

Author:

fpizlo@apple.com

Message:

Take care of some ARM64 test failures
​https://bugs.webkit.org/show_bug.cgi?id=133090

Reviewed by Geoffrey Garen.

PerformanceTests/SunSpider:

• profiler-test.yaml: Skip these on not-x86.

Source/JavaScriptCore:

Constant blinding on ARM64 cannot use the scratch register.

• assembler/MacroAssembler.h:

(JSC::MacroAssembler::convertInt32ToDouble):
(JSC::MacroAssembler::branchPtr):
(JSC::MacroAssembler::storePtr):
(JSC::MacroAssembler::store64):

• assembler/MacroAssemblerARM64.h:

(JSC::MacroAssemblerARM64::scratchRegisterForBlinding):

Tools:

• Scripts/run-jsc-stress-tests: Make it easier to conditionally skip things.

Location:

trunk

Files:

• PerformanceTests/SunSpider/ChangeLog (modified) (1 diff)
• PerformanceTests/SunSpider/profiler-test.yaml (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/assembler/MacroAssembler.h (modified) (4 diffs)
• Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-stress-tests (modified) (5 diffs)

trunk/PerformanceTests/SunSpider/ChangeLog

@@ +1 @@
+2014-05-19  Filip Pizlo  <fpizlo@apple.com>
+
+        Take care of some ARM64 test failures
+        https://bugs.webkit.org/show_bug.cgi?id=133090
+
+        Reviewed by Geoffrey Garen.
+
+        * profiler-test.yaml: Skip these on not-x86.
+
 2014-03-14  Maciej Stachowiak  <mjs@apple.com>
 

trunk/PerformanceTests/SunSpider/profiler-test.yaml

@@ -1 @@
-# Copyright (C) 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 
 - path: tests/sunspider-1.0
-  cmd: runProfiler
+  cmd: |
+      if $architecture =~ /x86/
+          runProfiler
+      else
+          skip
+      end

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-05-19  Filip Pizlo  <fpizlo@apple.com>
+
+        Take care of some ARM64 test failures
+        https://bugs.webkit.org/show_bug.cgi?id=133090
+
+        Reviewed by Geoffrey Garen.
+        
+        Constant blinding on ARM64 cannot use the scratch register.
+
+        * assembler/MacroAssembler.h:
+        (JSC::MacroAssembler::convertInt32ToDouble):
+        (JSC::MacroAssembler::branchPtr):
+        (JSC::MacroAssembler::storePtr):
+        (JSC::MacroAssembler::store64):
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::scratchRegisterForBlinding):
+
 2014-05-19  Tanay C  <tanay.c@samsung.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

@@ -1141 +1141 @@
     void convertInt32ToDouble(Imm32 imm, FPRegisterID dest)
     {
-        if (shouldBlind(imm)) {
+        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
             RegisterID scratchRegister = scratchRegisterForBlinding();
             loadXorBlindedConstant(xorBlindConstant(imm), scratchRegister);
@@ -1177 +1177 @@
     Jump branchPtr(RelationalCondition cond, RegisterID left, ImmPtr right)
     {
-        if (shouldBlind(right)) {
+        if (shouldBlind(right) && haveScratchRegisterForBlinding()) {
             RegisterID scratchRegister = scratchRegisterForBlinding();
             loadRotationBlindedConstant(rotationBlindConstant(right), scratchRegister);
@@ -1187 +1187 @@
     void storePtr(ImmPtr imm, Address dest)
     {
-        if (shouldBlind(imm)) {
+        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
             RegisterID scratchRegister = scratchRegisterForBlinding();
             loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);
@@ -1197 +1197 @@
     void store64(Imm64 imm, Address dest)
     {
-        if (shouldBlind(imm)) {
+        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
             RegisterID scratchRegister = scratchRegisterForBlinding();
             loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h

@@ -2409 +2409 @@
     }
 
-    RegisterID scratchRegisterForBlinding() { return getCachedDataTempRegisterIDAndInvalidate(); }
+    RegisterID scratchRegisterForBlinding()
+    {
+        // We *do not* have a scratch register for blinding.
+        RELEASE_ASSERT_NOT_REACHED();
+        return getCachedDataTempRegisterIDAndInvalidate();
+    }
 
     static bool canJumpReplacePatchableBranchPtrWithPatch() { return false; }

trunk/Tools/ChangeLog

@@ +1 @@
+2014-05-19  Filip Pizlo  <fpizlo@apple.com>
+
+        Take care of some ARM64 test failures
+        https://bugs.webkit.org/show_bug.cgi?id=133090
+
+        Reviewed by Geoffrey Garen.
+
+        * Scripts/run-jsc-stress-tests: Make it easier to conditionally skip things.
+
 2014-05-19  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -177 +177 @@
 end
 
+# Try to determine architecture. Return nil on failure.
+def machOArchitectureCode
+    otoolLines = `otool -aSfh #{Shellwords.shellescape($jscPath.to_s)}`.split("\n")
+    otoolLines.each_with_index {
+        | value, index |
+        if value =~ /magic/ and value =~ /cputype/
+            return otoolLines[index + 1].split[1].to_i
+        end
+    }
+    $stderr.puts "Warning: unable to determine architecture."
+    nil
+end
+
+def determineArchitecture
+    code = machOArchitectureCode
+    return nil unless code
+    is64BitFlag = 0x01000000
+    case code
+    when 7
+        "x86"
+    when 7 | is64BitFlag
+        "x86-64"
+    when 12
+        "arm"
+    when 12 | is64BitFlag
+        "arm64"
+    else
+        $stderr.puts "Warning: unable to determine architecture from code: #{code}"
+        nil
+    end
+end
+
+$architecture = determineArchitecture
+
 $numFailures = 0
 
@@ -479 +513 @@
 
 def addRunCommand(kind, command, outputHandler, errorHandler)
+    $didAddRunCommand = true
     plan = Plan.new($benchmarkDirectory, command, baseOutputName(kind), outputHandler, errorHandler)
     if $numProcessors > 1 and $runCommandOptions[:isSlow]
@@ -491 +526 @@
 # returns false, in which case you're supposed to add your own run commands.
 def parseRunCommands
-    didRun = false
+    oldDidAddRunCommand = $didAddRunCommand
+    $didAddRunCommand = false
 
     Dir.chdir($outputDir) {
@@ -507 +543 @@
                 next unless doesMatch
                 eval $~.post_match
-                didRun = true
             }
         }
     }
 
-    didRun
+    result = $didAddRunCommand
+    $didAddRunCommand = result or oldDidAddRunCommand
+    result
 end
 
@@ -798 +835 @@
 
 def skip
+    $didAddRunCommand = true
     puts "Skipping #{$collectionName}/#{$benchmark}"
 end