<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192682] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192682">192682</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-20 03:38:10 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:
Tools:
* Scripts/build-jsc:
* Scripts/run-javascriptcore-tests:
* Scripts/webkitperl/FeatureList.pm:
* efl/jhbuild.modules:
* gtk/jhbuildrc:
* jhbuild/jhbuildrc_common.py:
(init):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
<li><a href="#trunkToolsgtkjhbuildrc">trunk/Tools/gtk/jhbuildrc</a></li>
<li><a href="#trunkToolsjhbuildjhbuildrc_commonpy">trunk/Tools/jhbuild/jhbuildrc_common.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/ChangeLog 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-11-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r192667 and r192668.
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -66,6 +66,12 @@
</span><span class="cx"> set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (WTF_CPU_X86_64)
+ set(ENABLE_FTL_DEFAULT ON)
+else ()
+ set(ENABLE_FTL_DEFAULT OFF)
+endif ()
+
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC OFF)
</span><span class="lines">@@ -88,6 +94,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PUBLIC OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/ChangeLog 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-11-19 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, install llvm-static on Fedora to fix build now FTL is enabled
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/Scripts/build-jsc 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span><del>-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK());
</del><ins>+my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl()));
</ins><span class="cx"> my $forceCLoop = 0;
</span><span class="cx"> my $cli = 0;
</span><span class="cx"> my $makeArgs = "";
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> my $gmallocPath = undef;
</span><span class="cx"> my $gmallocDefaultPath = "/usr/lib/libgmalloc.dylib";
</span><span class="cx">
</span><del>-my $enableFTL = isAppleMacWebKit() || (isGtk() && isX86_64());
</del><ins>+my $enableFTL = isAppleMacWebKit() || isX86_64() && (isGtk() || isEfl());
</ins><span class="cx"> my $createTarball = 0;
</span><span class="cx"> my $remoteHost = 0;
</span><span class="cx"> my $remoteConfigFile;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
</span><span class="cx">
</span><span class="cx"> { option => "ftl-jit", desc => "Toggle FTLJIT support",
</span><del>- define => "ENABLE_FTL_JIT", default => (isGtk() && isX86_64()), value => \$ftlJITSupport },
</del><ins>+ define => "ENABLE_FTL_JIT", default => (isX86_64() && (isGtk() || isEfl())) , value => \$ftlJITSupport },
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> sub getFeatureOptionList()
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/efl/jhbuild.modules 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> <dep package="libseccomp"/>
</span><span class="cx"> <dep package="atk"/>
</span><span class="cx"> <dep package="openwebrtc"/>
</span><ins>+ <if condition-set="x86_64">
+ <dep package="llvm-3.6-for-X86_64"/>
+ </if>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> </metamodule>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuildrc (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuildrc 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/gtk/jhbuildrc 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -17,7 +17,6 @@
</span><span class="cx">
</span><span class="cx"> import sys
</span><span class="cx"> import os
</span><del>-import platform
</del><span class="cx">
</span><span class="cx"> sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
</span><span class="cx"> import jhbuildrc_common
</span><span class="lines">@@ -42,6 +41,3 @@
</span><span class="cx"> os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib64', 'gallium'))
</span><span class="cx"> else:
</span><span class="cx"> os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib', 'gallium'))
</span><del>-
-if 'x86_64' in platform.machine():
- conditions.add('x86_64')
</del></span></pre></div>
<a id="trunkToolsjhbuildjhbuildrc_commonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jhbuild/jhbuildrc_common.py (192681 => 192682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jhbuild/jhbuildrc_common.py 2015-11-20 09:33:23 UTC (rev 192681)
+++ trunk/Tools/jhbuild/jhbuildrc_common.py 2015-11-20 11:38:10 UTC (rev 192682)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> import multiprocessing
</span><span class="cx"> import sys
</span><span class="cx"> import os
</span><ins>+import platform
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> script_dir = None
</span><span class="lines">@@ -35,9 +36,9 @@
</span><span class="cx"> return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
</span><span class="cx">
</span><span class="cx">
</span><del>-def init(jhbuildrc_globals, platform):
</del><ins>+def init(jhbuildrc_globals, jhbuild_platform):
</ins><span class="cx">
</span><del>- __tools_directory = os.path.join(os.path.dirname(__file__), "../", platform)
</del><ins>+ __tools_directory = os.path.join(os.path.dirname(__file__), "../", jhbuild_platform)
</ins><span class="cx"> sys.path.insert(0, __tools_directory)
</span><span class="cx">
</span><span class="cx"> jhbuildrc_globals["build_policy"] = 'updated'
</span><span class="lines">@@ -49,16 +50,16 @@
</span><span class="cx"> jhbuildrc_globals["moduleset"].extend(__extra_modulesets)
</span><span class="cx">
</span><span class="cx"> __extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
</span><del>- jhbuildrc_globals["modules"] = ['webkit' + platform + '-testing-dependencies', ]
</del><ins>+ jhbuildrc_globals["modules"] = ['webkit' + jhbuild_platform + '-testing-dependencies', ]
</ins><span class="cx"> if __extra_modules != ['']:
</span><span class="cx"> jhbuildrc_globals["modules"].extend(__extra_modules)
</span><span class="cx">
</span><span class="cx"> if 'WEBKIT_OUTPUTDIR' in os.environ:
</span><del>- 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'))
</del><ins>+ 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'))
</ins><span class="cx"> else:
</span><del>- 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'))
</del><ins>+ 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'))
</ins><span class="cx">
</span><span class="cx"> jhbuildrc_globals["nonotify"] = True
</span><span class="cx"> jhbuildrc_globals["notrayicon"] = True
</span><span class="lines">@@ -86,3 +87,6 @@
</span><span class="cx"> if 'JHBUILD_MIRROR' in os.environ:
</span><span class="cx"> jhbuildrc_globals['dvcs_mirror_dir'] = os.environ['JHBUILD_MIRROR']
</span><span class="cx"> jhbuildrc_globals['tarballdir'] = os.environ['JHBUILD_MIRROR']
</span><ins>+
+ if 'x86_64' in platform.machine():
+ jhbuildrc_globals['conditions'].add('x86_64')
</ins></span></pre>
</div>
</div>
</body>
</html>