[macOS] Generate universal gen_snapshots #53524

cbracken · 2024-06-24T05:45:17Z

This reverts commit ac4c31a (#52913).
This relands commit 4e33c10 (#52885).

Previously, the gen_snapshot_arm64 and gen_snapshot_x64 binaries used by the tool were all built for x64 architecture. As such, developers building apps with Flutter rely on Rosetta translation with every build.

This refactors the gen_snapshot build rules on macOS hosts to consistently produce gen_snapshot_arm64 and gen_snapshot_x64 binaries with the target architecture of the build but with as universal binaries with both host architectures.

arm64 host build

Prior to this patch we emitted:

gen_snapshot_arm64 (arch: x64, target_arch: simarm64)

After this patch, we emit:

artifacts_x64/gen_snapshot_arm64 (arch: x64, target_arch: simarm64)
artifacts_arm64/gen_snapshot_arm64 (arch: arm64, target_arch: arm64)
gen_snapshot_arm64 (universal binary composed of both of the above)

x64 host build

Prior to this patch we emitted:

gen_snapshot_x64 (arch: x64, target_arch: x64)

After this patch, we emit:

artifacts_x64/gen_snapshot_x64 (arch: x64, target_arch: x64)
artifacts_arm64/gen_snapshot_x64 (arch: arm64, target_arch: simx64)
gen_snapshot_x64 (universal binary composed of both of the above)

Note that host builds on macOS currently default to a host architecture of x64 (can be overridden via --force-mac-arm64) regardless of host architecture and thus, the build itself relies on Rosetta translation when invoked on Apple Silicon arm64 hardware. This is to ensure a consistent build in CI regardless of bot architecture. See:

engine/tools/gn

Lines 502 to 505 in 6fa734d

    
           # TODO(cbracken): 
        
           # https://github.com/flutter/flutter/issues/103386 
        
           if get_host_os() == 'mac' and not args.force_mac_arm64: 
        
             gn_args['host_cpu'] = 'x64'

Issue: flutter/flutter#101138
Issue: flutter/flutter#69157

Related issue: flutter/flutter#103386

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
I listed at least one issue that this PR fixes in the description above.
I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
I'm pretty sure something infra-related will go wrong with this reland, but I'm still not quite sure what it is.
I updated/added relevant documentation (doc comments with ///).
I signed the CLA.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

This reverts commit ac4c31a. (flutter#52913) This relands commit 4e33c10. (flutter#52885) Previously, the `gen_snapshot_arm64` and `gen_snapshot_x64` binaries used by the tool were all built for x64 architecture. As such, developers building apps with Flutter rely on Rosetta translation with every build. This refactors the gen_snapshot build rules on macOS hosts to consistently produce `gen_snapshot_arm64` and `gen_snapshot_x64` binaries with the target architecture of the build but with as universal binaries with both host architectures. Prior to this patch we emitted: * gen_snapshot_arm64 (arch: x64, target_arch: simarm64) After this patch, we emit: * artifacts_x64/gen_snapshot_arm64 (arch: x64, target_arch: simarm64) * artifacts_arm64/gen_snapshot_arm64 (arch: arm64, target_arch: arm64) * gen_snapshot_arm64 (universal binary composed of both of the above) Prior to this patch we emitted: * gen_snapshot_x64 (arch: x64, target_arch: x64) After this patch, we emit: * artifacts_x64/gen_snapshot_x64 (arch: x64, target_arch: x64) * artifacts_arm64/gen_snapshot_x64 (arch: arm64, target_arch: simx64) * gen_snapshot_x64 (universal binary composed of both of the above) Note that host builds on macOS currently default to a host architecture of x64 (can be overridden via `--force-mac-arm64`) regardless of host architecture and thus, the build itself relies on Rosetta translation when invoked on Apple Silicon arm64 hardware. This is to ensure a consistent build in CI regardless of bot architecture. See: https://github.com/flutter/engine/blob/6fa734d686888a39add026a2a98d6ec311c23efb/tools/gn#L502-L505 Issue: flutter/flutter#101138 Issue: flutter/flutter#69157 Related issue: flutter/flutter#103386

flutter-dashboard · 2024-06-24T05:45:20Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

stuartmorgan · 2024-06-24T13:27:37Z

test-exempt: configuration change

)

jmagman · 2024-06-24T23:40:05Z

Passed in post-submit with longer timeout: https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20mac_host_engine/11165/overview

)

…150762) flutter/engine@be7db94...afa7ce1 2024-06-25 skia-flutter-autoroll@skia.org Roll Dart SDK from bb18127b2a8e to b5fc85cfcf1b (1 revision) (flutter/engine#53552) 2024-06-25 skia-flutter-autoroll@skia.org Roll Skia from 5feca3095719 to 335200e57c26 (1 revision) (flutter/engine#53549) 2024-06-25 skia-flutter-autoroll@skia.org Roll Dart SDK from c187d4b3ec88 to bb18127b2a8e (1 revision) (flutter/engine#53547) 2024-06-25 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from _6HNhJ6G59VMceKoN... to WUN7NQK04NjF9fRmf... (flutter/engine#53545) 2024-06-25 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Re-re-land "Upgrade all[most] androidx dependencies to latest" (#53532)" (flutter/engine#53546) 2024-06-25 bdero@google.com Bump impeller-cmake-example (flutter/engine#53538) 2024-06-24 skia-flutter-autoroll@skia.org Roll Skia from e20c8b0bac0c to 5feca3095719 (1 revision) (flutter/engine#53544) 2024-06-24 ditman@gmail.com [web] Reland "Fix focus management for text fields (#51009)" (flutter/engine#53537) 2024-06-24 skia-flutter-autoroll@skia.org Roll Dart SDK from 5df89347bddf to c187d4b3ec88 (1 revision) (flutter/engine#53542) 2024-06-24 chris@bracken.jp [macOS] Generate universal gen_snapshots (flutter/engine#53524) 2024-06-24 34871572+gmackall@users.noreply.github.com Re-re-land "Upgrade all[most] androidx dependencies to latest" (flutter/engine#53532) 2024-06-24 skia-flutter-autoroll@skia.org Roll Skia from 1948fd53e280 to e20c8b0bac0c (1 revision) (flutter/engine#53540) 2024-06-24 skia-flutter-autoroll@skia.org Roll Skia from 0fa58b6ddba0 to 1948fd53e280 (2 revisions) (flutter/engine#53536) 2024-06-24 skia-flutter-autoroll@skia.org Roll Skia from ea84df425483 to 0fa58b6ddba0 (3 revisions) (flutter/engine#53535) 2024-06-24 30870216+gaaclarke@users.noreply.github.com [Impeller] added a fallback that will make sure the blur fragment shader doesn't overflow (flutter/engine#53466) 2024-06-24 jonnywang@google.com [fuchsia] Update Fuchsia API level to 19 (flutter/engine#53494) 2024-06-24 skia-flutter-autoroll@skia.org Roll Dart SDK from 95470b2cac1f to 5df89347bddf (1 revision) (flutter/engine#53534) 2024-06-24 skia-flutter-autoroll@skia.org Roll Skia from f6b4344d73cc to ea84df425483 (1 revision) (flutter/engine#53531) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from _6HNhJ6G59VM to WUN7NQK04NjF 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 jimgraham@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

cbracken requested review from jmagman and vashworth June 24, 2024 05:45

jmagman approved these changes Jun 24, 2024

View reviewed changes

jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 24, 2024

auto-submit bot merged commit 552ca5b into flutter:main Jun 24, 2024
29 checks passed

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Flutter Engine from be7db94196fe to 1fb20a297302 (10 revisions) flutter/flutter#150738

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

a067ced

)

jmagman mentioned this pull request Jun 24, 2024

Build macOS desktop gen_snapshot_arm64 as arm64 binary to run natively on Apple Silicon flutter/flutter#101138

Closed

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Flutter Engine from be7db94196fe to 63c240384b63 (11 revisions) flutter/flutter#150740

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

1fc2bd0

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from 6884e83c13a1 to 40a81fc1eafe (4 revisions) flutter/flutter#150745

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

9c0883f

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 6991653cbe27 (13 revisions) flutter/flutter#150747

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

5142ef5

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 77462b536202 (15 revisions) flutter/flutter#150752

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

e497d75

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to f39b5ab11594 (16 revisions) flutter/flutter#150753

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

0054476

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 4bb4c1c2b5a6 (17 revisions) flutter/flutter#150756

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

90a3edd

)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to afa7ce19bca8 (18 revisions) flutter/flutter#150762

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

552ca5bc9 [macOS] Generate universal gen_snapshots (flutter/engine#53524

9c51939

)

f1sh1918 mentioned this pull request Jun 26, 2024

Fix ios builds due to circle ci mac image deprecation digitalfabrik/entitlementcard#1511

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[macOS] Generate universal gen_snapshots #53524

[macOS] Generate universal gen_snapshots #53524

	# TODO(cbracken):
	# https://github.com/flutter/flutter/issues/103386
	if get_host_os() == 'mac' and not args.force_mac_arm64:
	gn_args['host_cpu'] = 'x64'

[macOS] Generate universal gen_snapshots #53524

[macOS] Generate universal gen_snapshots #53524

Conversation

arm64 host build

x64 host build

Pre-launch Checklist