Title: [222160] trunk/Tools
- Revision
- 222160
- Author
- [email protected]
- Date
- 2017-09-18 09:54:44 -0700 (Mon, 18 Sep 2017)
Log Message
build-webkit spawns fewer subprocesses than ninja uses by default
https://bugs.webkit.org/show_bug.cgi?id=177057
Reviewed by Alex Christensen.
* Scripts/build-webkit:
By default, ninja will parallelize over (cores + 2) jobs. build-webkit
specifies -j(cores), which overrides this. Remove our override if building
with ninja; just let it do its own thing. In my testing, this minor
change is the difference between ~10% idle CPU time and 0.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222159 => 222160)
--- trunk/Tools/ChangeLog 2017-09-18 16:53:33 UTC (rev 222159)
+++ trunk/Tools/ChangeLog 2017-09-18 16:54:44 UTC (rev 222160)
@@ -1,3 +1,16 @@
+2017-09-18 Tim Horton <[email protected]>
+
+ build-webkit spawns fewer subprocesses than ninja uses by default
+ https://bugs.webkit.org/show_bug.cgi?id=177057
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/build-webkit:
+ By default, ninja will parallelize over (cores + 2) jobs. build-webkit
+ specifies -j(cores), which overrides this. Remove our override if building
+ with ninja; just let it do its own thing. In my testing, this minor
+ change is the difference between ~10% idle CPU time and 0.
+
2017-09-18 Lucas Forschler <[email protected]>
Land a patch to verify svn->git update is working.
Modified: trunk/Tools/Scripts/build-webkit (222159 => 222160)
--- trunk/Tools/Scripts/build-webkit 2017-09-18 16:53:33 UTC (rev 222159)
+++ trunk/Tools/Scripts/build-webkit 2017-09-18 16:54:44 UTC (rev 222160)
@@ -239,9 +239,13 @@
}
if (isCMakeBuild() && !isAnyWindows()) {
+ if (!canUseNinja()) {
+ # By default we build using all of the available CPUs.
+ # Ninja will automatically determine the number of jobs to run in parallel,
+ # so don't override the number of jobs if building with Ninja.
+ $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
+ }
- # By default we build using all of the available CPUs.
- $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
my $maxCPULoad = maxCPULoad() if $makeArgs !~ /-l\s*\d+\.?\d*/;
$makeArgs .= " -l" . maxCPULoad() if defined $maxCPULoad;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
