From c9a025de53a156b4457f74f9a1517696979f514a Mon Sep 17 00:00:00 2001 From: Stephan Altmueller Date: Tue, 20 Feb 2018 10:05:14 -0500 Subject: Revert "Increase ninja thread count for Android build on Linux." also Revert "Increase ninja thread count for Windows builds." This reverts commit 98c4231592bfadbe92d906f707d28508c50b0c16. This reverts commit 50a808a518c895c956c6d30d07e1e81e5e7abddb. Bug: skia: Change-Id: I7cc50b0bec6e1ad9f9d971a5c88c029488bb80ed Reviewed-on: https://skia-review.googlesource.com/108504 Reviewed-by: Stephan Altmueller Reviewed-by: Kevin Lubick Commit-Queue: Stephan Altmueller --- .../Build-Debian9-Clang-arm-Release-Android_API26.json | 4 +--- .../Build-Debian9-Clang-arm-Release-Android_ASAN.json | 4 +--- .../Build-Debian9-Clang-arm64-Release-Android_ASAN.json | 4 +--- .../examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json | 4 +--- .../full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json | 4 +--- .../examples/full.expected/Build-Win-Clang-x86_64-Release.json | 4 +--- .../full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json | 4 +--- .../Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json | 4 +--- infra/bots/recipe_modules/flavor/gn_android_flavor.py | 7 +------ infra/bots/recipe_modules/flavor/gn_flavor.py | 3 --- 10 files changed, 9 insertions(+), 33 deletions(-) (limited to 'infra/bots/recipe_modules/flavor') diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json index 6b9f590dad..4a935a60a8 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json index a33b98d22f..4ec3463d65 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 7e50545220..23d27d727b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json index 58fbd480cc..609fa0796e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 000ec21e9a..c6e64880f9 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json index 2d5be8c5f6..28ec945aa8 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 74ccbbe378..bf08caa1a5 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json index ecb2aeff38..301fcd2878 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[START_DIR]/out/Debug_x64", - "-j", - "1000" + "[START_DIR]/out/Debug_x64" ], "cwd": "[START_DIR]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index a8afc93a9f..c5c3bbd4b0 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -389,11 +389,6 @@ if actual_freq != str(freq): args['extra_cflags'] = repr(extra_cflags).replace("'", '"') gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted(args.iteritems())) - ninja_args = ['-k', '0', '-C', self.out_dir] - - if self.m.vars.is_linux: - # TODO(dogben): Experiment with this setting for other builds. - ninja_args.extend(['-j', '1000']) gn = 'gn.exe' if 'Win' in os else 'gn' ninja = 'ninja.exe' if 'Win' in os else 'ninja' @@ -401,7 +396,7 @@ if actual_freq != str(freq): self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) self._run('gn gen', gn, 'gen', self.out_dir, '--args=' + gn_args) - self._run('ninja', *([ninja] + ninja_args)) + self._run('ninja', ninja, '-k', '0', '-C', self.out_dir) def install(self): self._adb('mkdir ' + self.device_dirs.resource_dir, diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index ee46b82a56..a8d63ee953 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -193,9 +193,6 @@ with open(sys.argv[1], 'w') as f: # only Goma warns about this. extra_cflags.append('-Wno-nonportable-include-path') ninja_args.extend(['-j', '2000']) - elif 'Win' in os: - # TODO(dogben): Experiment with this setting for other builds. - ninja_args.extend(['-j', '1000']) sanitize = '' for t in extra_tokens: -- cgit v1.2.3