Changeset 167958 in webkit

Timestamp:

Apr 29, 2014 3:02:00 PM (4 years ago)

Author:

fpizlo@apple.com

Message:

Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
​https://bugs.webkit.org/show_bug.cgi?id=112840

Rubber stamped by Geoffrey Garen.

Source/JavaScriptCore:

• Configurations/FeatureDefines.xcconfig:

Source/WebCore:
It already has a lot of tests.

• Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

• Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

• Configurations/FeatureDefines.xcconfig:

Tools:

• Scripts/build-jsc: Enable it on Mac.
• Scripts/build-webkit: Enable it on Mac.
• Scripts/export-llvm-build: Make it slightly easier to export the build if you've done a "make install".

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-jsc (modified) (2 diffs)
• Tools/Scripts/build-webkit (modified) (3 diffs)
• Tools/Scripts/export-llvm-build (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-29  Filip Pizlo  <fpizlo@apple.com>
+
+        Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
+        https://bugs.webkit.org/show_bug.cgi?id=112840
+
+        Rubber stamped by Geoffrey Garen.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-04-29  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ -236 +236 @@
 
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
-ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FTL_JIT_macosx_1080 = ;
-ENABLE_FTL_JIT_macosx_1090 = ;
-ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphonesimulator = ;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-29  Filip Pizlo  <fpizlo@apple.com>
+
+        Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
+        https://bugs.webkit.org/show_bug.cgi?id=112840
+
+        Rubber stamped by Geoffrey Garen.
+
+        It already has a lot of tests.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-04-29  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

@@ -236 +236 @@
 
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
-ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FTL_JIT_macosx_1080 = ;
-ENABLE_FTL_JIT_macosx_1090 = ;
-ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphonesimulator = ;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-29  Filip Pizlo  <fpizlo@apple.com>
+
+        Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
+        https://bugs.webkit.org/show_bug.cgi?id=112840
+
+        Rubber stamped by Geoffrey Garen.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-04-29  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

@@ -236 +236 @@
 
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
-ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FTL_JIT_macosx_1080 = ;
-ENABLE_FTL_JIT_macosx_1090 = ;
-ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphonesimulator = ;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-29  Filip Pizlo  <fpizlo@apple.com>
+
+        Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
+        https://bugs.webkit.org/show_bug.cgi?id=112840
+
+        Rubber stamped by Geoffrey Garen.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-04-29  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

@@ -236 +236 @@
 
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
-ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FTL_JIT_macosx_1080 = ;
-ENABLE_FTL_JIT_macosx_1090 = ;
-ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphonesimulator = ;

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-29  Filip Pizlo  <fpizlo@apple.com>
+
+        Use LLVM as a backend for the fourth-tier DFG JIT (a.k.a. the FTL JIT)
+        https://bugs.webkit.org/show_bug.cgi?id=112840
+
+        Rubber stamped by Geoffrey Garen.
+
+        * Scripts/build-jsc: Enable it on Mac.
+        * Scripts/build-webkit: Enable it on Mac.
+        * Scripts/export-llvm-build: Make it slightly easier to export the build if you've done a "make install".
+
 2014-04-28  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/Scripts/build-jsc

@@ -38 +38 @@
 my $coverageSupport = 0;
 my $showHelp = 0;
-my $ftlJIT = 0;
+my $ftlJIT = isAppleWebKit();
 my $forceCLoop = 0;
 my $cli = 0;
@@ -90 +90 @@
 
 if (isAppleMacWebKit()) {
-    if ($ftlJIT) {
-        push @options, "ENABLE_FTL_JIT=ENABLE_FTL_JIT";
+    if (!$ftlJIT) {
+        push @options, "ENABLE_FTL_JIT=";
     }
     if ($forceCLoop) {

trunk/Tools/Scripts/build-webkit

@@ -179 +179 @@
 
 my @options = ();
-my $hasFTLJIT = 0;
 
 if (isAppleMacWebKit()) {
@@ -192 +191 @@
     foreach (@features) {
         my $option = option($_->{define}, ${$_->{value}}, $_->{default});
-        $hasFTLJIT = 1 if ($_->{define} eq "ENABLE_FTL_JIT") and (${$_->{value}});
         push @options, $option unless $option eq "";
     }
@@ -223 +221 @@
 
         # Copy library and header from WebKitLibraries to a findable place in the product directory.
-        my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi");
-        if ($hasFTLJIT) {
-            push @copyLibrariesArgs, "--llvm";
-        }
-        push @copyLibrariesArgs, productDir();
+        my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", "--llvm", productDir());
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;

trunk/Tools/Scripts/export-llvm-build

@@ -49 +49 @@
 $llvmBinary = Pathname.new("./llvm/Release")
 $llvmSource = Pathname.new("./llvm")
+$prefix = nil
 $compression = "bzip2"
 
@@ -64 +65 @@
     puts "--llvm-source      (-s)   Change which LLVM source directory to use."
     puts "                          Default is #{$llvmSource}."
+    puts "--prefix           (-p)   Use an \"installed\" LLVM with the given prefix."
     puts "--compression             Change what compression to do. Can be one of gzip,"
     puts "                          bzip2, or none."
@@ -76 +78 @@
                ['--llvm-binary', '-B', GetoptLong::REQUIRED_ARGUMENT],
                ['--llvm-source', '-s', GetoptLong::REQUIRED_ARGUMENT],
+               ['--prefix', '-p', GetoptLong::REQUIRED_ARGUMENT],
                ['--compression', GetoptLong::REQUIRED_ARGUMENT]).each {
     | opt, arg |
@@ -91 +94 @@
     when '--llvm-source'
         $llvmSource = Pathname.new(arg)
+    when '--prefix'
+        $prefix = Pathname.new(arg)
     when '--compression'
         $compression = arg
@@ -111 +116 @@
         raise "Bad choice of compression."
     end
+end
+
+if $prefix
+    $llvmBinary = $prefix
+    $llvmBuild = $prefix
+    $llvmSource = $prefix
 end