From 8969c65a42cffe71326bd1a2b74996526031c7ae Mon Sep 17 00:00:00 2001 From: Jamie Nicol Date: Mon, 29 Jan 2024 15:04:16 +0000 Subject: [PATCH] Bug 1865886. Add aarch64 instrumented jobs. r=geckoview-reviewers,glandium,m_kato Differential Revision: https://phabricator.services.mozilla.com/D199256 --- .../android-aarch64/profile-generate | 6 +++ taskcluster/ci/instrumented-build/kind.yml | 54 +++++++++++++++++++ .../64_aarch64_profile_generate.py | 8 +++ .../mozharness/mozilla/building/buildbase.py | 1 + 4 files changed, 69 insertions(+) create mode 100644 mobile/android/config/mozconfigs/android-aarch64/profile-generate create mode 100644 testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_profile_generate.py diff --git a/mobile/android/config/mozconfigs/android-aarch64/profile-generate b/mobile/android/config/mozconfigs/android-aarch64/profile-generate new file mode 100644 index 000000000000..dc04beed700a --- /dev/null +++ b/mobile/android/config/mozconfigs/android-aarch64/profile-generate @@ -0,0 +1,6 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly" + +mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0" + +ac_add_options --enable-profile-generate=cross +ac_add_options --disable-tests diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index 5f18f5887670..178aae530dfb 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -280,6 +280,60 @@ jobs: - sysroot-x86_64-linux-gnu - sysroot-wasm32-wasi + android-aarch64-shippable/opt: + description: "Android 5.0 AArch64 PGO instrumented" + index: + product: mobile + job-name: instrumented-android-aarch64 + shipping-product: fennec + treeherder: + platform: android-5-0-aarch64/pgo + worker-type: b-linux-gcp + worker: + docker-image: {in-tree: android-build} + env: + GRADLE_USER_HOME: "/builds/worker/checkouts/gecko/mobile/android/gradle/dotgradle-offline" + TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest" + artifacts: + - name: public/build + path: /builds/worker/artifacts/ + type: directory + - name: public/build/geckoview-androidTest.apk + path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk + type: file + - name: public/build/geckoview-test_runner.apk + path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk + type: file + - name: public/build/geckoview-test_runner.aab + path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab + type: file + - name: public/build/geckoview_example.apk + path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk + type: file + - name: public/build/geckoview_example.aab + path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab + type: file + run: + config: + - builds/releng_base_android_64_builds.py + custom-build-variant-cfg: aarch64-profile-generate + tooltool-downloads: internal + fetches: + toolchain: + - android-gradle-dependencies + - android-ndk-linux + - android-sdk-linux + - linux64-jdk + - linux64-clang + - linux64-rust-android + - linux64-rust-size + - linux64-cbindgen + - linux64-dump_syms + - linux64-nasm + - linux64-node + - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi + win32-shippable/opt: description: "Win32 Shippable PGO Instrumented" index: diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_profile_generate.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_profile_generate.py new file mode 100644 index 000000000000..9dae6f4344a8 --- /dev/null +++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_profile_generate.py @@ -0,0 +1,8 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "stage_platform": "android-aarch64", + "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/profile-generate", +} diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 94a4765a24e6..777bd1e84ece 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -330,6 +330,7 @@ class BuildOptionParser(object): "aarch64-pgo": path_base + "%s_aarch64_pgo.py", "aarch64-debug": path_base + "%s_aarch64_debug.py", "aarch64-lite-debug": path_base + "%s_aarch64_debug_lite.py", + "aarch64-profile-generate": path_base + "%s_aarch64_profile_generate.py", "android-geckoview-docs": path_base + "%s_geckoview_docs.py", "valgrind": path_base + "%s_valgrind.py", }