Bug 1767488 - run a51 in aarch64 in parallel to arm7 and turn off g5 duplication. r=sparky,perftest-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D145456

taskcluster/ci/condprof/kind.yml

@@ -180,7 +180,7 @@ jobs:
             product: firefox
             job-name: condprof-g5-fenix
         dependencies:
-            build: build-linux64-shippable/opt
+            build: build-android-arm-shippable/opt
         fetches:
             build:
                 - artifact: target.condprof.tests.tar.gz
@@ -214,7 +214,7 @@ jobs:
             platform: android-hw-a51-11-0-arm7/opt
         index:
             product: firefox
-            job-name: condprof-a51-geckoview_example
+            job-name: condprof-a51-arm7-geckoview_example
         dependencies:
             build: build-android-arm-shippable/opt
         fetches:
@@ -250,9 +250,81 @@ jobs:
             platform: android-hw-a51-11-0-arm7/opt
         index:
             product: firefox
-            job-name: condprof-a51-fenix
+            job-name: condprof-a51-arm7-fenix
         dependencies:
-            build: build-linux64-shippable/opt
+            build: build-android-arm-shippable/opt
+        fetches:
+            build:
+                - artifact: target.condprof.tests.tar.gz
+            toolchain:
+                - linux64-geckodriver
+        run:
+            run-as-root: true
+            command: >-
+                curl -L -o target.apk https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/mobile.v2.fenix.nightly.latest.armeabi-v7a/artifacts/public/build/armeabi-v7a/target.apk &&
+                adb install -r target.apk &&
+                rm -rf target.apk &&
+                python3 virtualenv/virtualenv.py . &&
+                bin/python3 condprof/main.py
+                --force-new
+                --geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+                --device-name a51
+                --firefox org.mozilla.fenix
+                --scenario settled
+                ../../archive
+        worker:
+            artifacts:
+                - name: public/condprof
+                  path: archive
+                  type: directory
+    android-hw-a51-11-0-aarch64-geckoview:
+        worker-type: t-bitbar-gw-perf-a51
+        description: Creates or update conditioned profiles on GeckoView+A51
+        run-on-projects: []  # bug 1765348
+        treeherder:
+            symbol: condprof(geckoview)
+            platform: android-hw-a51-11-0-aarch64/opt
+        index:
+            product: firefox
+            job-name: condprof-a51-aarch64-geckoview_example
+        dependencies:
+            build: build-android-aarch64-shippable/opt
+        fetches:
+            build:
+                - artifact: en-US/target.condprof.tests.tar.gz
+                - artifact: geckoview_example.apk
+                  extract: false
+            toolchain:
+                - linux64-geckodriver
+        run:
+            run-as-root: true
+            command: >-
+                adb install -r $MOZ_FETCHES_DIR/geckoview_example.apk &&
+                python3 virtualenv/virtualenv.py . &&
+                bin/python3 condprof/main.py
+                --force-new
+                --geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+                --device-name a51
+                --firefox org.mozilla.geckoview_example
+                --scenario settled
+                ../../archive
+        worker:
+            artifacts:
+                - name: public/condprof
+                  path: archive
+                  type: directory
+    android-hw-a51-11-0-aarch64-fenix:
+        worker-type: t-bitbar-gw-perf-a51
+        description: Creates or update conditioned profiles on Fenix+A51
+        run-on-projects: []  # bug 1765348
+        treeherder:
+            symbol: condprof(fenix)
+            platform: android-hw-a51-11-0-aarch64/opt
+        index:
+            product: firefox
+            job-name: condprof-a51-aarch64-fenix
+        dependencies:
+            build: build-android-aarch64-shippable/opt
         fetches:
             build:
                 - artifact: target.condprof.tests.tar.gz

taskcluster/ci/perftest/android.yml

@@ -32,6 +32,14 @@ hw-a51:
         symbol: perftest-a51
     platform: android-hw-a51-11-0-arm7-shippable/opt
 
+# TODO: is this right?
+hw-a51-aarch64:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run ./mach perftest on a Samsung Galaxy a51
+    treeherder:
+        symbol: perftest-a51
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+
 hw-p2:
     worker-type: t-bitbar-gw-perf-p2
     description: Run ./mach perftest on a Pixel 2
@@ -99,6 +107,36 @@ hw-a51-view-fenix:
             --output $MOZ_FETCHES_DIR/../artifacts
             testing/performance/perftest_android_view.js
 
+hw-a51-aarch64-view-fenix:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run VIEW perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(view-fenix)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+        batch: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.fenix
+            --android-activity org.mozilla.fenix.IntentReceiverActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --perfherder-metrics name:processLaunchToNavStart,shouldAlert:True
+            --android-install-apk fenix_nightly_arm64_v8a
+            --hooks testing/performance/hooks_android_view.py
+            --perfherder
+            --perfherder-app fenix
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --browsertime-iterations 25
+            --output $MOZ_FETCHES_DIR/../artifacts
+            testing/performance/perftest_android_view.js
+
 hw-p2-view-fenix:
     worker-type: t-bitbar-gw-perf-p2
     description: Run VIEW perftest on Fenix on a Pixel2
@@ -188,6 +226,35 @@ hw-a51-view-gv:
             --output $MOZ_FETCHES_DIR/../artifacts
             testing/performance/perftest_android_view.js
 
+hw-a51-aarch64-view-gv:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run VIEW perftest on GV on a Samsung A51
+    treeherder:
+        symbol: perftest(view-gv)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.geckoview_example
+            --android-activity org.mozilla.geckoview_example.GeckoViewActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --perfherder-metrics processLaunchToNavStart
+            --android-install-apk gve_nightly_aarch64
+            --hooks testing/performance/hooks_android_view.py
+            --perfherder
+            --perfherder-app geckoview
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --browsertime-iterations 14
+            --output $MOZ_FETCHES_DIR/../artifacts
+            testing/performance/perftest_android_view.js
+
 hw-p2-view-gv:
     worker-type: t-bitbar-gw-perf-p2
     description: Run VIEW perftest on GV on a Pixel 2
@@ -282,6 +349,38 @@ hw-a51-main-fenix:
             --browsertime-iterations 14
             testing/performance/perftest_android_main.js
 
+hw-a51-aarch64-main-fenix:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run main (home activity) perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(main-fenix)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.fenix
+            --android-activity .App
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --androidlog
+            --androidlog-first-timestamp ".*Start proc.*org\.mozilla\..*\..*App.*"
+            --androidlog-second-timestamp ".*Fully drawn.*org\.mozilla\..*"
+            --androidlog-subtest-name "MAIN"
+            --android-install-apk fenix_nightly_arm64_v8a
+            --hooks testing/performance/hooks_android_main.py
+            --perfherder
+            --perfherder-app fenix
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --browsertime-iterations 14
+            testing/performance/perftest_android_main.js
+
 hw-p2-main-fenix:
     worker-type: t-bitbar-gw-perf-p2
     description: Run main (home activity) perftest on Fenix on a Pixel 2
@@ -373,6 +472,35 @@ hw-a51-perfstats-gv:
             --hooks testing/performance/hooks_perfstats.py
             testing/performance/perftest_perfstats.js
 
+hw-a51-aarch64-perfstats-gv:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on GeckoView on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-gv)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.geckoview_example
+            --android-activity org.mozilla.geckoview_example.GeckoViewActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk gve_nightly_aarch64
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app geckoview
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
 hw-p2-perfstats-gv:
     worker-type: t-bitbar-gw-perf-p2
     description: Run PerfStats pageload test on GeckoView on a Pixel 2
@@ -460,6 +588,35 @@ hw-a51-perfstats-fenix:
             --hooks testing/performance/hooks_perfstats.py
             testing/performance/perftest_perfstats.js
 
+hw-a51-aarch64-perfstats-fenix:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-fenix)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.fenix
+            --android-activity org.mozilla.fenix.IntentReceiverActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk fenix_nightly_arm64_v8a
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app fenix
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
 hw-p2-perfstats-fenix:
     worker-type: t-bitbar-gw-perf-p2
     description: Run PerfStats perftest on Fenix on a Pixel2

taskcluster/ci/test/browsertime-mobile.yml

@@ -318,7 +318,10 @@ browsertime-unity-webgl-mobile:
                 by-test-platform:
                     android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central, mozilla-release]
                     default: []
-    max-run-time: 900
+    max-run-time:
+        by-test-platform:
+            anrdroid-hw-a51.*: 1500
+            default: 900
     mozharness:
         extra-options:
             - --test=unity-webgl

taskcluster/ci/test/test-platforms.yml

@@ -353,7 +353,7 @@ android-em-7.0-x86_64-qr/debug-isolated-process:
 android-hw-g5-7-0-arm7-qr/opt:
     build-platform: android-arm/opt
     test-sets:
-        - android-hw-browsertime
+        - android-hw-browsertime-g5
         - android-hw-browsertime-power
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
@@ -361,7 +361,7 @@ android-hw-g5-7-0-arm7-qr/opt:
 android-hw-g5-7-0-arm7-shippable-qr/opt:
     build-platform: android-arm-shippable/opt
     test-sets:
-        - android-hw-browsertime
+        - android-hw-browsertime-g5
         - android-hw-browsertime-power
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
@@ -386,6 +386,24 @@ android-hw-a51-11-0-arm7-shippable-qr/opt:
 #        - android-hw-arm7-raptor-cpu-memory
 #        - android-hw-arm7-raptor-cpu-memory-power
 
+android-hw-a51-11-0-aarch64-qr/opt:
+    build-platform: android-aarch64/opt
+    test-sets:
+        - android-hw-browsertime-a51
+#        - android-hw-browsertime
+#        - android-hw-browsertime-power
+#        - android-hw-arm7-raptor-cpu-memory
+#        - android-hw-arm7-raptor-cpu-memory-power
+
+android-hw-a51-11-0-aarch64-shippable-qr/opt:
+    build-platform: android-aarch64-shippable/opt
+    test-sets:
+        - android-hw-browsertime-a51
+#        - android-hw-browsertime
+#        - android-hw-browsertime-power
+#        - android-hw-arm7-raptor-cpu-memory
+#        - android-hw-arm7-raptor-cpu-memory-power
+
 # android-hw-p2-8-0 Google Pixel 2 Android 8.0
 
 android-hw-p2-8-0-arm7-qr/opt:

taskcluster/ci/test/test-sets.yml

@@ -452,6 +452,10 @@ android-hw-browsertime-a51:
     - browsertime-unity-webgl-mobile
     # not live, or tp6 proper
 
+android-hw-browsertime-g5:
+    - browsertime-tp6m
+    - browsertime-tp6m-live
+
 android-hw-browsertime:
     - browsertime-tp6m
     - browsertime-tp6m-essential

taskcluster/gecko_taskgraph/try_option_syntax.py

@@ -124,6 +124,7 @@ UNITTEST_PLATFORM_PRETTY_NAMES = {
     "x64": ["linux64", "linux64-asan", "linux1804-64", "linux1804-64-asan"],
     "Android 7.0 Moto G5 32bit": ["android-hw-g5-7.0-arm7"],
     "Android 7.0 Samsung A51 32bit": ["android-hw-a51-11.0-arm7"],
+    "Android 7.0 Samsung A51 64bit": ["android-hw-a51-11.0-aarch64"],
     "Android 8.0 Google Pixel 2 32bit": ["android-hw-p2-8.0-arm7"],
     "Android 8.0 Google Pixel 2 64bit": ["android-hw-p2-8.0-android-aarch64"],
     "10.14": ["macosx1014-64"],