Title: [165818] trunk
Revision
165818
Author
[email protected]
Date
2014-03-18 10:59:15 -0700 (Tue, 18 Mar 2014)

Log Message

More FTL enabling.

Source/_javascript_Core: 

Rubber stamped by Dan Bernstein and Mark Hahnenberg.

* Configurations/FeatureDefines.xcconfig:
* ftl/FTLCompile.cpp:
(JSC::FTL::compile):

Source/WebCore: 

Rubber stamped by Dan Bernstein and Mark Hahnenberg.

No new tests.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac: 

Rubber stamped by Dan Bernstein.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2: 

Rubber stamped by Dan Bernstein.

* Configurations/FeatureDefines.xcconfig:

Source/WTF: 

Rubber stamped by Dan Bernstein and Mark Hahnenberg.

* wtf/Platform.h:

Tools: 

Rubber stamped by Dan Bernstein.

* Tools/Scripts/build-webkit:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (165817 => 165818)


--- trunk/Source/_javascript_Core/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,13 @@
+2014-03-18  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein and Mark Hahnenberg.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * ftl/FTLCompile.cpp:
+        (JSC::FTL::compile):
+
 2014-03-17  Michael Saboff  <[email protected]>
 
         V8 regexp spends most of its time in operationGetById

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (165817 => 165818)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2014-03-18 17:59:15 UTC (rev 165818)
@@ -219,6 +219,8 @@
 ENABLE_FTL_JIT_macosx_1080 = ;
 ENABLE_FTL_JIT_macosx_1090 = ;
 ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 

Modified: trunk/Source/_javascript_Core/ftl/FTLCompile.cpp (165817 => 165818)


--- trunk/Source/_javascript_Core/ftl/FTLCompile.cpp	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/_javascript_Core/ftl/FTLCompile.cpp	2014-03-18 17:59:15 UTC (rev 165818)
@@ -499,7 +499,10 @@
             &state, mmAllocateCodeSection, mmAllocateDataSection, mmApplyPermissions, mmDestroy);
     
         LLVMExecutionEngineRef engine;
-    
+        
+        if (isARM64())
+            llvm->SetTarget(state.module, "arm64-apple-ios");
+        
         if (llvm->CreateMCJITCompilerForModule(&engine, state.module, &options, sizeof(options), &error)) {
             dataLog("FATAL: Could not create LLVM execution engine: ", error, "\n");
             CRASH();

Modified: trunk/Source/WTF/ChangeLog (165817 => 165818)


--- trunk/Source/WTF/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WTF/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,11 @@
+2014-03-18  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein and Mark Hahnenberg.
+
+        * wtf/Platform.h:
+
 2014-03-17  Darin Adler  <[email protected]>
 
         Remove most uses of deprecatedCharacter in WTF

Modified: trunk/Source/WTF/wtf/Platform.h (165817 => 165818)


--- trunk/Source/WTF/wtf/Platform.h	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WTF/wtf/Platform.h	2014-03-18 17:59:15 UTC (rev 165818)
@@ -666,6 +666,12 @@
 #define ENABLE_FTL_JIT 0
 #endif
 
+/* The FTL is disabled on the iOS simulator, mostly for simplicity. */
+#if PLATFORM(IOS_SIMULATOR)
+#undef ENABLE_FTL_JIT
+#define ENABLE_FTL_JIT 0
+#endif
+
 /* If possible, try to enable the LLVM disassembler. This is optional and we can
    fall back on UDis86 if necessary. */
 #if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))

Modified: trunk/Source/WebCore/ChangeLog (165817 => 165818)


--- trunk/Source/WebCore/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebCore/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,13 @@
+2014-03-18  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein and Mark Hahnenberg.
+
+        No new tests.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-03-18  Brent Fulgham  <[email protected]>
 
         TextTrackRegion Not Implemented

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (165817 => 165818)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2014-03-18 17:59:15 UTC (rev 165818)
@@ -219,6 +219,8 @@
 ENABLE_FTL_JIT_macosx_1080 = ;
 ENABLE_FTL_JIT_macosx_1090 = ;
 ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 

Modified: trunk/Source/WebKit/mac/ChangeLog (165817 => 165818)


--- trunk/Source/WebKit/mac/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,11 @@
+2014-03-17  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-03-17  Andy Estes  <[email protected]>
 
         Remove staging code added for <http://webkit.org/b/129358> [iOS] Support network state notification using CPNetworkObserver

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (165817 => 165818)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2014-03-18 17:59:15 UTC (rev 165818)
@@ -219,6 +219,8 @@
 ENABLE_FTL_JIT_macosx_1080 = ;
 ENABLE_FTL_JIT_macosx_1090 = ;
 ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 

Modified: trunk/Source/WebKit2/ChangeLog (165817 => 165818)


--- trunk/Source/WebKit2/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,11 @@
+2014-03-17  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-03-17  Simon Fraser  <[email protected]>
 
         Renable pagination mode in WK2 MiniBrowser

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (165817 => 165818)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2014-03-18 17:59:15 UTC (rev 165818)
@@ -219,6 +219,8 @@
 ENABLE_FTL_JIT_macosx_1080 = ;
 ENABLE_FTL_JIT_macosx_1090 = ;
 ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 

Modified: trunk/Tools/ChangeLog (165817 => 165818)


--- trunk/Tools/ChangeLog	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Tools/ChangeLog	2014-03-18 17:59:15 UTC (rev 165818)
@@ -1,3 +1,11 @@
+2014-03-17  Filip Pizlo  <[email protected]>
+
+        More FTL enabling.
+
+        Rubber stamped by Dan Bernstein.
+
+        * Tools/Scripts/build-webkit:
+
 2014-03-17  Simon Fraser  <[email protected]>
 
         Renable pagination mode in WK2 MiniBrowser

Modified: trunk/Tools/Scripts/build-webkit (165817 => 165818)


--- trunk/Tools/Scripts/build-webkit	2014-03-18 17:57:19 UTC (rev 165817)
+++ trunk/Tools/Scripts/build-webkit	2014-03-18 17:59:15 UTC (rev 165818)
@@ -230,15 +230,13 @@
     } else {
         push @projects, ("Source/WebKit2");
         
-        if ($hasFTLJIT) {
-            my @copyLibrariesArgs = (
-                "perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
-                "--sdk", xcodeSDK(), "--llvm", "--prefer-system-llvm",
-                "--llvm-subdirectory", "internal-llvm", productDir()
-            );
-            print(join(" ", @copyLibrariesArgs) . "\n");
-            (system(@copyLibrariesArgs) == 0) or die;
-        }
+        my @copyLibrariesArgs = (
+            "perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
+            "--sdk", xcodeSDK(), "--llvm", "--prefer-system-llvm",
+            "--llvm-subdirectory", "internal-llvm", productDir()
+        );
+        print(join(" ", @copyLibrariesArgs) . "\n");
+        (system(@copyLibrariesArgs) == 0) or die;
     }
 
     # Build Tools needed for Apple ports
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to