[EFL] Enable FTL JIT by default on X86_64
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 11:38:10 +0000 (11:38 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 11:38:10 +0000 (11:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143822

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsEfl.cmake:

Tools:

* Scripts/build-jsc:
* Scripts/run-javascriptcore-tests:
* Scripts/webkitperl/FeatureList.pm:
* efl/jhbuild.modules:
* gtk/jhbuildrc:
* jhbuild/jhbuildrc_common.py:
(init):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/OptionsEfl.cmake
Tools/ChangeLog
Tools/Scripts/build-jsc
Tools/Scripts/run-javascriptcore-tests
Tools/Scripts/webkitperl/FeatureList.pm
Tools/efl/jhbuild.modules
Tools/gtk/jhbuildrc
Tools/jhbuild/jhbuildrc_common.py

index 4101153..4203a9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-20  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] Enable FTL JIT by default on X86_64
+        https://bugs.webkit.org/show_bug.cgi?id=143822
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2015-11-19  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r192667 and r192668.
index 811c9e5..33b61c1 100644 (file)
@@ -66,6 +66,12 @@ else ()
     set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
 endif ()
 
+if (WTF_CPU_X86_64)
+    set(ENABLE_FTL_DEFAULT ON)
+else ()
+    set(ENABLE_FTL_DEFAULT OFF)
+endif ()
+
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC OFF)
@@ -88,6 +94,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PUBLIC OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
index b7739b9..ad1c3a8 100644 (file)
@@ -1,3 +1,18 @@
+2015-11-20  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] Enable FTL JIT by default on X86_64
+        https://bugs.webkit.org/show_bug.cgi?id=143822
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Scripts/build-jsc:
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/webkitperl/FeatureList.pm:
+        * efl/jhbuild.modules:
+        * gtk/jhbuildrc:
+        * jhbuild/jhbuildrc_common.py:
+        (init):
+
 2015-11-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, install llvm-static on Fedora to fix build now FTL is enabled
index 466808d..6b6a4ae 100755 (executable)
@@ -40,7 +40,7 @@ sub writeCongrats();
 my $shouldRunStaticAnalyzer = 0;
 my $coverageSupport = 0;
 my $showHelp = 0;
-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK());
+my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl()));
 my $forceCLoop = 0;
 my $cli = 0;
 my $makeArgs = "";
index ce81fa0..d571a01 100755 (executable)
@@ -62,7 +62,7 @@ my $envVars = "";
 my $gmallocPath = undef;
 my $gmallocDefaultPath = "/usr/lib/libgmalloc.dylib";
 
-my $enableFTL = isAppleMacWebKit() || (isGtk() && isX86_64());
+my $enableFTL = isAppleMacWebKit() || isX86_64() && (isGtk() || isEfl());
 my $createTarball = 0;
 my $remoteHost = 0;
 my $remoteConfigFile;
index a5104e9..cdeb525 100644 (file)
@@ -458,7 +458,7 @@ my @features = (
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
 
     { option => "ftl-jit", desc => "Toggle FTLJIT support",
-      define => "ENABLE_FTL_JIT", default => (isGtk() && isX86_64()), value => \$ftlJITSupport },
+      define => "ENABLE_FTL_JIT", default => (isX86_64() && (isGtk() || isEfl())) , value => \$ftlJITSupport },
 );
 
 sub getFeatureOptionList()
index f0127d3..fb86290 100644 (file)
@@ -24,6 +24,9 @@
       <dep package="libseccomp"/>
       <dep package="atk"/>
       <dep package="openwebrtc"/>
+      <if condition-set="x86_64">
+        <dep package="llvm-3.6-for-X86_64"/>
+      </if>
     </dependencies>
   </metamodule>
 
index b9cddfd..0492139 100644 (file)
@@ -17,7 +17,6 @@
 
 import sys
 import os
-import platform
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
 import jhbuildrc_common
@@ -42,6 +41,3 @@ if use_lib64:
     os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib64', 'gallium'))
 else:
     os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib', 'gallium'))
-
-if 'x86_64' in platform.machine():
-    conditions.add('x86_64')
index cf78cee..a8a10a1 100644 (file)
@@ -19,6 +19,7 @@
 import multiprocessing
 import sys
 import os
+import platform
 
 
 script_dir = None
@@ -35,9 +36,9 @@ def top_level_path(*args):
     return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
 
 
-def init(jhbuildrc_globals, platform):
+def init(jhbuildrc_globals, jhbuild_platform):
 
-    __tools_directory = os.path.join(os.path.dirname(__file__), "../", platform)
+    __tools_directory = os.path.join(os.path.dirname(__file__), "../", jhbuild_platform)
     sys.path.insert(0, __tools_directory)
 
     jhbuildrc_globals["build_policy"] = 'updated'
@@ -49,16 +50,16 @@ def init(jhbuildrc_globals, platform):
         jhbuildrc_globals["moduleset"].extend(__extra_modulesets)
 
     __extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
-    jhbuildrc_globals["modules"] = ['webkit' + platform + '-testing-dependencies', ]
+    jhbuildrc_globals["modules"] = ['webkit' + jhbuild_platform + '-testing-dependencies', ]
     if __extra_modules != ['']:
         jhbuildrc_globals["modules"].extend(__extra_modules)
 
     if 'WEBKIT_OUTPUTDIR' in os.environ:
-        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Source'))
-        jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Root'))
+        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + jhbuild_platform.upper(), 'Source'))
+        jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + jhbuild_platform.upper(), 'Root'))
     else:
-        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Source'))
-        jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Root'))
+        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + jhbuild_platform.upper(), 'Source'))
+        jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + jhbuild_platform.upper(), 'Root'))
 
     jhbuildrc_globals["nonotify"] = True
     jhbuildrc_globals["notrayicon"] = True
@@ -86,3 +87,6 @@ def init(jhbuildrc_globals, platform):
     if 'JHBUILD_MIRROR' in os.environ:
         jhbuildrc_globals['dvcs_mirror_dir'] = os.environ['JHBUILD_MIRROR']
         jhbuildrc_globals['tarballdir'] = os.environ['JHBUILD_MIRROR']
+
+    if 'x86_64' in platform.machine():
+        jhbuildrc_globals['conditions'].add('x86_64')