Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initializes RBE in the build config runner #50543

Merged
merged 1 commit into from
Feb 12, 2024

Conversation

zanderso
Copy link
Member

@zanderso zanderso commented Feb 11, 2024

Unlike Goma, the local RBE server must be manually started and stopped between each ninja build.

This PR adds the startup and shutdown before and after ninja is run in the build config runner. It also removes the RBE startup logic from the gn script, which was the wrong place for it since there was no opportunity for it to shutdown the service. Removing this logic from the gn script will not affect CI since the recipes already do the right startup and shutdown, and logic in the gn script skipped the now deleted section of code.

@@ -1188,7 +1158,7 @@ def parse_args(args):

parser.add_argument(
'--trace-gn',
default=False,
default=True,
Copy link
Member Author

@zanderso zanderso Feb 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use this to debug the gn command being slow, and I believe there are no downsides to turning it on by default.

@@ -41,7 +41,7 @@ final class RunnerProgress extends RunnerEvent {
RunnerProgress(
super.name, super.command, super.timestamp,
this.what, this.completed, this.total, this.done,
) : percent = (completed * 1000) / total;
) : percent = (completed * 100) / total;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would have been exciting

Future<bool> _runNinja(RunnerEventHandler eventHandler) async {
final String ninjaPath = p.join(
engineSrcDir.path, 'flutter', 'third_party', 'ninja', 'ninja',
late final String _hostCpu = (){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might (here and below) be able to get away with a regular final

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried this. Since here and below the initializers access instance members like platform, they can't be regular final.

@zanderso zanderso merged commit 6b44f3d into flutter:main Feb 12, 2024
25 checks passed
@zanderso zanderso deleted the build-config-runner-rbe branch February 12, 2024 17:37
Comment on lines +291 to +300
late final String _hostCpu = (){
if (platform.isWindows) {
return platform.environment['PROCESSOR_ARCHITECTURE'] ?? 'x64';
}
final List<String> unameCommand = <String>['uname', '-m'];
final io.ProcessResult unameResult = processRunner.processManager.runSync(
unameCommand,
);
final String outDir = p.join(engineSrcDir.path, 'out', build.ninja.config);
final List<String> command = <String>[
ninjaPath,
'-C', outDir,
if (_isGomaOrRbe) ...<String>['-j', '200'],
...extraNinjaArgs,
...build.ninja.targets,
];
eventHandler(RunnerStart('${build.name}: ninja', command, DateTime.now()));
return unameResult.exitCode == 0 ? (unameResult.stdout as String).trim() : 'x64';
}();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd consider using Abi.current for this: https://api.dart.dev/stable/3.2.6/dart-ffi/Abi-class.html

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 12, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 12, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 12, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Feb 12, 2024
…143322)

flutter/engine@1c3ecee...a190775

2024-02-12 737941+loic-sharma@users.noreply.github.com [Windows] Make the view own its EGL surface (flutter/engine#50421)
2024-02-12 skia-flutter-autoroll@skia.org Roll Dart SDK from 5c9e79e66364 to dca13675e65e (1 revision) (flutter/engine#50559)
2024-02-12 1889916+miguelfrde@users.noreply.github.com [fuchsia] Update Inspect library usage (flutter/engine#50467)
2024-02-12 zanderso@users.noreply.github.com Initializes RBE in the build config runner (flutter/engine#50543)
2024-02-12 tugorez@users.noreply.github.com Rename [ViewFocusDirection.backwards] to [ViewFocusDirection.backward] (flutter/engine#50533)
2024-02-12 dnfield@google.com Refactor NDK helpers some more, add methods for SurfaceControl/Transaction, tests (flutter/engine#50540)
2024-02-12 30870216+gaaclarke@users.noreply.github.com [Impeller] deleted the old blur (flutter/engine#50470)
2024-02-12 kjlubick@users.noreply.github.com Update codec defines for Skia (flutter/engine#50554)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC chinmaygarde@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
auto-submit bot added a commit to flutter/flutter that referenced this pull request Feb 12, 2024
…isions) (#143322)" (#143338)

Reverts #143322

Initiated by: zanderso

Reason for reverting: The tree is red.

Original PR Author: engine-flutter-autoroll

Reviewed By: {fluttergithubbot}

This change reverts the following previous change:
Original Description:

flutter/engine@1c3ecee...a190775

2024-02-12 737941+loic-sharma@users.noreply.github.com [Windows] Make the view own its EGL surface (flutter/engine#50421)
2024-02-12 skia-flutter-autoroll@skia.org Roll Dart SDK from 5c9e79e66364 to dca13675e65e (1 revision) (flutter/engine#50559)
2024-02-12 1889916+miguelfrde@users.noreply.github.com [fuchsia] Update Inspect library usage (flutter/engine#50467)
2024-02-12 zanderso@users.noreply.github.com Initializes RBE in the build config runner (flutter/engine#50543)
2024-02-12 tugorez@users.noreply.github.com Rename [ViewFocusDirection.backwards] to [ViewFocusDirection.backward] (flutter/engine#50533)
2024-02-12 dnfield@google.com Refactor NDK helpers some more, add methods for SurfaceControl/Transaction, tests (flutter/engine#50540)
2024-02-12 30870216+gaaclarke@users.noreply.github.com [Impeller] deleted the old blur (flutter/engine#50470)
2024-02-12 kjlubick@users.noreply.github.com Update codec defines for Skia (flutter/engine#50554)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC chinmaygarde@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 13, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Feb 13, 2024
…sions) (#143380)

Manual roll Flutter Engine from 1c3ecee77350 to 920874bf2c1a (34 revisions)

Manual roll requested by jonahwilliams@google.com

Cannot build log URL because revision "920874bf2c1a" is invalid: Luci builds of "Linux Fuchsia FEMU" for 920874bf2c1a9ba2e9b7260b79ede8f1e26ea4f0 was FAILURE

2024-02-13 dnfield@google.com Do not use AChoreographer on 32 bit devices (flutter/engine#50586)
2024-02-13 zanderso@users.noreply.github.com Move libpng to //flutter/third_party/libpng (flutter/engine#50571)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from b150107d536d to aaed347b2dbb (2 revisions) (flutter/engine#50595)
2024-02-13 skia-flutter-autoroll@skia.org Roll Dart SDK from 8d3a8d85c883 to 105312b80125 (2 revisions) (flutter/engine#50593)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from d503bc9c6e46 to b150107d536d (1 revision) (flutter/engine#50591)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from a1d9b83034ac to d503bc9c6e46 (3 revisions) (flutter/engine#50587)
2024-02-13 30870216+gaaclarke@users.noreply.github.com [Impeller] cleaned up and removed golden test exceptions (flutter/engine#50572)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from 17d00f9241b3 to a1d9b83034ac (2 revisions) (flutter/engine#50582)
2024-02-13 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from RVHAIKU50ogkiV-Lj... to l6mWjvlO1xJg5ZFKK... (flutter/engine#50579)
2024-02-13 skia-flutter-autoroll@skia.org Roll Dart SDK from 94f7dec34cef to 8d3a8d85c883 (1 revision) (flutter/engine#50577)
2024-02-13 matanlurey@users.noreply.github.com Add Impeller runtime options to Android `scenario_app` (flutter/engine#50487)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from c464143dfaab to 17d00f9241b3 (1 revision) (flutter/engine#50576)
2024-02-13 skia-flutter-autoroll@skia.org Roll Skia from ecf2f622d0b3 to c464143dfaab (2 revisions) (flutter/engine#50574)
2024-02-12 jonahwilliams@google.com [Impeller] CommandPoolVK recycles command buffers too. (flutter/engine#50468)
2024-02-12 matanlurey@users.noreply.github.com Make `dart:ui#Paint` `final` to allow changes/disallow implementing. (flutter/engine#50557)
2024-02-12 robert.ancell@canonical.com Replace usage of an integer for GdkModifierType (flutter/engine#50481)
2024-02-12 robert.ancell@canonical.com Remove FlKeyEvent.dispose_origin and use GdkEvent type for origin (flutter/engine#50483)
2024-02-12 zanderso@users.noreply.github.com Move Linux impeller_unittests to linux_unopt (flutter/engine#50558)
2024-02-12 chinmaygarde@google.com [Impeller] Don't suppress outdated validation error. (flutter/engine#50568)
2024-02-12 chinmaygarde@google.com [Impeller] Remove references to moved impeller/image from README. (flutter/engine#50513)
2024-02-12 skia-flutter-autoroll@skia.org Roll Dart SDK from dca13675e65e to 94f7dec34cef (1 revision) (flutter/engine#50567)
2024-02-12 skia-flutter-autoroll@skia.org Roll Skia from f88eeb658358 to ecf2f622d0b3 (1 revision) (flutter/engine#50566)
2024-02-12 skia-flutter-autoroll@skia.org Roll Skia from 867c1e8390e2 to f88eeb658358 (5 revisions) (flutter/engine#50564)
2024-02-12 jason-simmons@users.noreply.github.com Roll vulkan-deps to 014f44e134a1de387791bffacc32ff9d8db71176 (flutter/engine#50515)
2024-02-12 skia-flutter-autoroll@skia.org Roll Skia from 4081496b7693 to 867c1e8390e2 (20 revisions) (flutter/engine#50562)
2024-02-12 jonahwilliams@google.com [Impeller] force render pass construction on all backends to ensure image layout is transitioned/render pass state setup. (flutter/engine#50539)
2024-02-12 737941+loic-sharma@users.noreply.github.com [Windows] Make the view own its EGL surface (flutter/engine#50421)
2024-02-12 skia-flutter-autoroll@skia.org Roll Dart SDK from 5c9e79e66364 to dca13675e65e (1 revision) (flutter/engine#50559)
2024-02-12 1889916+miguelfrde@users.noreply.github.com [fuchsia] Update Inspect library usage (flutter/engine#50467)
2024-02-12 zanderso@users.noreply.github.com Initializes RBE in the build config runner (flutter/engine#50543)
2024-02-12 tugorez@users.noreply.github.com Rename [ViewFocusDirection.backwards] to [ViewFocusDirection.backward] (flutter/engine#50533)
2024-02-12 dnfield@google.com Refactor NDK helpers some more, add methods for SurfaceControl/Transaction, tests (flutter/engine#50540)
2024-02-12 30870216+gaaclarke@users.noreply.github.com [Impeller] deleted the old blur (flutter/engine#50470)
2024-02-12 kjlubick@users.noreply.github.com Update codec defines for Skia (flutter/engine#50554)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from RVHAIKU50ogk to l6mWjvlO1xJg

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jonahwilliams@google.com,jsimmons@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants