Added option to re-open files to poller.

Some times a sysfs/debug fs will only generate a value on open. Subsequent seek/read will not vield any new values. This patch adds the option to reopen all files on each read.

.github/workflows/main.yml

@@ -13,13 +13,13 @@ on:
 
 jobs:
   Run-Linters-and-Tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.7
+    - name: Set up Python 3.8.18
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8.18
     - name: git-bash
       uses: pkg-src/github-action-git-bash@v1.1
     - name: Install dependencies
@@ -39,10 +39,10 @@ jobs:
         nosetests
 
   Execute-Test-Workload-and-Process:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7.17, 3.8.18, 3.9.21, 3.10.16, 3.13.2]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -64,10 +64,10 @@ jobs:
         cd /tmp && wa process -f -p csv idle_workload
 
   Test-WA-Commands:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7.17, 3.8.18, 3.9.21, 3.10.16, 3.13.2]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

.readthedocs.yml

@@ -13,10 +13,16 @@ sphinx:
 # Build the docs in additional formats such as PDF and ePub
 formats: all
 
-# Set the version of Python and requirements required to build your docs
+
+# Configure the build environment
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Ensure doc dependencies are installed before building
 python:
-   version: 3.8
    install:
-      - method: setuptools
-        path: .
       - requirements: doc/requirements.txt
+      - method: pip
+        path: .

dev_scripts/pylint_plugins.py

@@ -32,17 +32,11 @@ def transform(mod):
                 if b'pylint:' in text[0]:
                     msg = 'pylint directive found on the first line of {}; please move to below copyright header'
                     raise RuntimeError(msg.format(mod.name))
-                if sys.version_info[0] == 3:
-                    char = chr(text[0][0])
-                else:
-                    char = text[0][0]
+                char = chr(text[0][0])
                 if text[0].strip() and char != '#':
                     msg = 'first line of {} is not a comment; is the copyright header missing?'
                     raise RuntimeError(msg.format(mod.name))
-                if sys.version_info[0] == 3:
-                    text[0] = '# pylint: disable={}'.format(','.join(errors)).encode('utf-8')
-                else:
-                    text[0] = '# pylint: disable={}'.format(','.join(errors))
+                text[0] = '# pylint: disable={}'.format(','.join(errors)).encode('utf-8')
                 mod.file_bytes = b'\n'.join(text)
 
                 # This is what *should* happen, but doesn't work.

doc/requirements.txt

@@ -4,3 +4,4 @@ pandas
 sphinx_rtd_theme==1.0.0
 sphinx==4.2
 docutils<0.18
+devlib @ git+https://github.com/ARM-software/devlib@master

doc/source/conf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 ARM Limited
+# Copyright 2023 ARM Limited
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -68,7 +68,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'wa'
-copyright = u'2018, ARM Limited'
+copyright = u'2023, ARM Limited'
 author = u'ARM Limited'
 
 # The version info for the project you're documenting, acts as replacement for

doc/source/user_information/user_guide.rst

@@ -373,6 +373,7 @@ below:
             device: generic_android
             device_config:
                 adb_server: null
+                adb_port: null
                 big_core: null
                 core_clusters: null
                 core_names: null
@@ -399,6 +400,7 @@ below:
                 no_install: false
                 report: true
                 report_on_target: false
+                mode: write-to-memory
             csv:
                 extra_columns: null
                 use_all_classifiers: false

doc/source/user_information/user_reference/agenda.rst

@@ -45,6 +45,7 @@ An example agenda can be seen here:
             no_install: false
             report: true
             report_on_target: false
+            mode: write-to-disk
         csv:                    # Provide config for the csv augmentation
             use_all_classifiers: true
 

doc/source/user_information/user_reference/runtime_parameters.rst

@@ -33,6 +33,7 @@ states.
                   iterations: 1
                   runtime_parameters:
                         screen_on: false
+                        unlock_screen: 'vertical'
                 - name: benchmarkpi
                   iterations: 1
         sections:
@@ -208,6 +209,13 @@ Android Specific Runtime Parameters
 :screen_on: A ``boolean`` to specify whether the devices screen should be
     turned on. Defaults to ``True``.
 
+:unlock_screen: A ``String`` to specify how the devices screen should be
+    unlocked. Unlocking screen is disabled by default. ``vertical``, ``diagonal``
+    and ``horizontal`` are the supported values (see :meth:`devlib.AndroidTarget.swipe_to_unlock`).
+    Note that unlocking succeeds when no passcode is set. Since unlocking screen
+    requires turning on the screen, this option overrides value of ``screen_on``
+    option.
+
 .. _setting-sysfiles:
 
 Setting Sysfiles

requirements.txt

@@ -1,18 +1,18 @@
 bcrypt==4.0.1
-certifi==2022.12.7
+certifi==2024.7.4
 cffi==1.15.1
 charset-normalizer==3.1.0
 colorama==0.4.6
-cryptography==40.0.2
+cryptography==43.0.1
 devlib==1.3.4
 future==0.18.3
-idna==3.4
+idna==3.7
 Louie-latest==1.3.1
 lxml==4.9.2
 nose==1.3.7
 numpy==1.24.3
 pandas==2.0.1
-paramiko==3.1.0
+paramiko==3.4.0
 pexpect==4.8.0
 ptyprocess==0.7.0
 pycparser==2.21
@@ -21,10 +21,10 @@ pyserial==3.5
 python-dateutil==2.8.2
 pytz==2023.3
 PyYAML==6.0
-requests==2.29.0
+requests==2.32.0
 scp==0.14.5
 six==1.16.0
 tzdata==2023.3
-urllib3==1.26.15
+urllib3==1.26.19
 wlauto==3.3.1
 wrapt==1.15.0

setup.py

@@ -79,6 +79,7 @@ params = dict(
     license='Apache v2',
     maintainer='ARM Architecture & Technology Device Lab',
     maintainer_email='workload-automation@arm.com',
+    python_requires='>= 3.7',
     setup_requires=[
         'numpy<=1.16.4; python_version<"3"',
         'numpy; python_version>="3"',

wa/commands/create.py

@@ -23,7 +23,6 @@ import re
 import uuid
 import getpass
 from collections import OrderedDict
-from distutils.dir_util import copy_tree  # pylint: disable=no-name-in-module, import-error
 
 from devlib.utils.types import identifier
 try:
@@ -43,6 +42,24 @@ from wa.utils.misc import (ensure_directory_exists as _d, capitalize,
 from wa.utils.postgres import get_schema, POSTGRES_SCHEMA_DIR
 from wa.utils.serializer import yaml
 
+if sys.version_info >= (3, 8):
+    def copy_tree(src, dst):
+        from shutil import copy, copytree  # pylint: disable=import-outside-toplevel
+        copytree(
+            src,
+            dst,
+            # dirs_exist_ok=True only exists in Python >= 3.8
+            dirs_exist_ok=True,
+            # Align with devlib and only copy the content without metadata
+            copy_function=copy
+        )
+else:
+    def copy_tree(src, dst):
+        # pylint: disable=import-outside-toplevel, redefined-outer-name
+        from distutils.dir_util import copy_tree
+        # Align with devlib and only copy the content without metadata
+        copy_tree(src, dst, preserve_mode=False, preserve_times=False)
+
 
 TEMPLATES_DIR = os.path.join(os.path.dirname(__file__), 'templates')
 

wa/commands/revent.py

@@ -25,10 +25,6 @@ from wa.framework.target.manager import TargetManager
 from wa.utils.revent import ReventRecorder
 
 
-if sys.version_info[0] == 3:
-    raw_input = input  # pylint: disable=redefined-builtin
-
-
 class RecordCommand(Command):
 
     name = 'record'
@@ -137,11 +133,11 @@ class RecordCommand(Command):
     def record(self, revent_file, name, output_path):
         msg = 'Press Enter when you are ready to record {}...'
         self.logger.info(msg.format(name))
-        raw_input('')
+        input('')
         self.revent_recorder.start_record(revent_file)
         msg = 'Press Enter when you have finished recording {}...'
         self.logger.info(msg.format(name))
-        raw_input('')
+        input('')
         self.revent_recorder.stop_record()
 
         if not os.path.isdir(output_path):

wa/commands/show.py

@@ -73,11 +73,8 @@ class ShowCommand(Command):
 
         if which('pandoc'):
             p = Popen(['pandoc', '-f', 'rst', '-t', 'man'], stdin=PIPE, stdout=PIPE, stderr=PIPE)
-            if sys.version_info[0] == 3:
-                output, _ = p.communicate(rst_output.encode(sys.stdin.encoding))
-                output = output.decode(sys.stdout.encoding)
-            else:
-                output, _ = p.communicate(rst_output)
+            output, _ = p.communicate(rst_output.encode(sys.stdin.encoding))
+            output = output.decode(sys.stdout.encoding)
 
             # Make sure to double escape back slashes
             output = output.replace('\\', '\\\\\\')

wa/commands/templates/uiauto/uiauto_workload_template/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/framework/configuration/parsers.py

@@ -238,20 +238,47 @@ def _load_file(filepath, error_name):
     return raw, includes
 
 
+def _config_values_from_includes(filepath, include_path, error_name):
+    source_dir = os.path.dirname(filepath)
+    included_files = []
+
+    if isinstance(include_path, str):
+        include_path = os.path.expanduser(os.path.join(source_dir, include_path))
+
+        replace_value, includes = _load_file(include_path, error_name)
+
+        included_files.append(include_path)
+        included_files.extend(includes)
+    elif isinstance(include_path, list):
+        replace_value = {}
+
+        for path in include_path:
+            include_path = os.path.expanduser(os.path.join(source_dir, path))
+
+            sub_replace_value, includes = _load_file(include_path, error_name)
+            for key, val in sub_replace_value.items():
+                replace_value[key] = merge_config_values(val, replace_value.get(key, None))
+
+            included_files.append(include_path)
+            included_files.extend(includes)
+    else:
+        message = "{} does not contain a valid {} structure; value for 'include#' must be a string or a list"
+        raise ConfigError(message.format(filepath, error_name))
+
+    return replace_value, included_files
+
+
 def _process_includes(raw, filepath, error_name):
     if not raw:
         return []
 
-    source_dir = os.path.dirname(filepath)
     included_files = []
     replace_value = None
 
     if hasattr(raw, 'items'):
         for key, value in raw.items():
             if key == 'include#':
-                include_path = os.path.expanduser(os.path.join(source_dir, value))
-                included_files.append(include_path)
-                replace_value, includes = _load_file(include_path, error_name)
+                replace_value, includes = _config_values_from_includes(filepath, value, error_name)
                 included_files.extend(includes)
             elif hasattr(value, 'items') or isiterable(value):
                 includes = _process_includes(value, filepath, error_name)

wa/framework/getters.py

@@ -244,10 +244,7 @@ class Http(ResourceGetter):
                                              response.status_code,
                                              response.reason))
             return {}
-        if sys.version_info[0] == 3:
-            content = response.content.decode('utf-8')
-        else:
-            content = response.content
+        content = response.content.decode('utf-8')
         return json.loads(content)
 
     def download_asset(self, asset, owner_name):

wa/framework/instrument.py

@@ -98,7 +98,6 @@ and the code to clear these file goes in teardown method. ::
 
 """
 
-import sys
 import logging
 import inspect
 from collections import OrderedDict
@@ -325,10 +324,7 @@ def install(instrument, context):
         if not callable(attr):
             msg = 'Attribute {} not callable in {}.'
             raise ValueError(msg.format(attr_name, instrument))
-        if sys.version_info[0] == 3:
-            argspec = inspect.getfullargspec(attr)
-        else:
-            argspec = inspect.getargspec(attr)  # pylint: disable=deprecated-method
+        argspec = inspect.getfullargspec(attr)
         arg_num = len(argspec.args)
         # Instrument callbacks will be passed exactly two arguments: self
         # (the instrument instance to which the callback is bound) and

wa/framework/output.py

@@ -39,7 +39,8 @@ from wa.framework.run import RunState, RunInfo
 from wa.framework.target.info import TargetInfo
 from wa.framework.version import get_wa_version_with_commit
 from wa.utils.doc import format_simple_table
-from wa.utils.misc import touch, ensure_directory_exists, isiterable, format_ordered_dict
+from wa.utils.misc import (touch, ensure_directory_exists, isiterable,
+                           format_ordered_dict, safe_extract)
 from wa.utils.postgres import get_schema_versions
 from wa.utils.serializer import write_pod, read_pod, Podable, json
 from wa.utils.types import enum, numeric
@@ -854,7 +855,7 @@ class DatabaseOutput(Output):
     def _read_dir_artifact(self, artifact):
         artifact_path = tempfile.mkdtemp(prefix='wa_')
         with tarfile.open(fileobj=self.conn.lobject(int(artifact.path), mode='b'), mode='r|gz') as tar_file:
-            tar_file.extractall(artifact_path)
+            safe_extract(tar_file, artifact_path)
         self.conn.commit()
         return artifact_path
 

wa/framework/plugin.py

@@ -18,8 +18,6 @@
 import os
 import sys
 import inspect
-import imp
-import string
 import logging
 from collections import OrderedDict, defaultdict
 from itertools import chain
@@ -32,16 +30,10 @@ from wa.framework.exception import (NotFoundError, PluginLoaderError, TargetErro
                                     ValidationError, ConfigError, HostError)
 from wa.utils import log
 from wa.utils.misc import (ensure_directory_exists as _d, walk_modules, load_class,
-                           merge_dicts_simple, get_article)
+                           merge_dicts_simple, get_article, import_path)
 from wa.utils.types import identifier
 
 
-if sys.version_info[0] == 3:
-    MODNAME_TRANS = str.maketrans(':/\\.', '____')
-else:
-    MODNAME_TRANS = string.maketrans(':/\\.', '____')
-
-
 class AttributeCollection(object):
     """
     Accumulator for plugin attribute objects (such as Parameters or Artifacts).
@@ -384,7 +376,7 @@ class TargetedPlugin(Plugin):
 
     """
 
-    suppoted_targets = []
+    supported_targets = []
     parameters = [
         Parameter('cleanup_assets', kind=bool,
                   global_alias='cleanup_assets',
@@ -398,8 +390,8 @@ class TargetedPlugin(Plugin):
 
     @classmethod
     def check_compatible(cls, target):
-        if cls.suppoted_targets:
-            if target.os not in cls.suppoted_targets:
+        if cls.supported_targets:
+            if target.os not in cls.supported_targets:
                 msg = 'Incompatible target OS "{}" for {}'
                 raise TargetError(msg.format(target.os, cls.name))
 
@@ -622,24 +614,30 @@ class PluginLoader(object):
             self.logger.debug('Checking path %s', path)
             if os.path.isfile(path):
                 self._discover_from_file(path)
-            for root, _, files in os.walk(path, followlinks=True):
-                should_skip = False
-                for igpath in ignore_paths:
-                    if root.startswith(igpath):
-                        should_skip = True
-                        break
-                if should_skip:
-                    continue
-                for fname in files:
-                    if os.path.splitext(fname)[1].lower() != '.py':
+            elif os.path.exists(path):
+                for root, _, files in os.walk(path, followlinks=True):
+                    should_skip = False
+                    for igpath in ignore_paths:
+                        if root.startswith(igpath):
+                            should_skip = True
+                            break
+                    if should_skip:
                         continue
-                    filepath = os.path.join(root, fname)
-                    self._discover_from_file(filepath)
+                    for fname in files:
+                        if os.path.splitext(fname)[1].lower() != '.py':
+                            continue
+                        filepath = os.path.join(root, fname)
+                        self._discover_from_file(filepath)
+            elif not os.path.isabs(path):
+                try:
+                    for module in walk_modules(path):
+                        self._discover_in_module(module)
+                except Exception: # NOQA pylint: disable=broad-except
+                    pass
 
     def _discover_from_file(self, filepath):
         try:
-            modname = os.path.splitext(filepath[1:])[0].translate(MODNAME_TRANS)
-            module = imp.load_source(modname, filepath)
+            module = import_path(filepath)
             self._discover_in_module(module)
         except (SystemExit, ImportError) as e:
             if self.keep_going:

wa/framework/target/descriptor.py

@@ -198,6 +198,12 @@ COMMON_TARGET_PARAMS = [
               description='''
               A regex that matches the shell prompt on the target.
               '''),
+
+    Parameter('max_async', kind=int, default=50,
+        description='''
+            The maximum number of concurent asynchronous connections to the
+            target maintained at any time.
+            '''),
 ]
 
 COMMON_PLATFORM_PARAMS = [
@@ -302,6 +308,11 @@ CONNECTION_PARAMS = {
             description="""
             ADB server to connect to.
             """),
+        Parameter(
+            'adb_port', kind=int,
+            description="""
+            ADB port to connect to.
+            """),
         Parameter(
             'poll_transfers', kind=bool,
             default=True,
@@ -333,6 +344,12 @@ CONNECTION_PARAMS = {
             the destination size to appear the same over one or more sample
             periods, causing improper transfer cancellation.
             """),
+        Parameter(
+            'adb_as_root', kind=bool,
+            default=False,
+            description="""
+            Specify whether the adb server should be started in root mode.
+            """)
     ],
     SshConnection: [
         Parameter(

wa/framework/target/runtime_config.py

@@ -878,6 +878,11 @@ class AndroidRuntimeConfig(RuntimeConfig):
         if value is not None:
             obj.config['screen_on'] = value
 
+    @staticmethod
+    def set_unlock_screen(obj, value):
+        if value is not None:
+            obj.config['unlock_screen'] = value
+
     def __init__(self, target):
         self.config = defaultdict(dict)
         super(AndroidRuntimeConfig, self).__init__(target)
@@ -930,6 +935,16 @@ class AndroidRuntimeConfig(RuntimeConfig):
                     Specify whether the device screen should be on
                     """)
 
+            param_name = 'unlock_screen'
+            self._runtime_params[param_name] = \
+                RuntimeParameter(
+                    param_name, kind=str,
+                    default=None,
+                    setter=self.set_unlock_screen,
+                    description="""
+                    Specify how the device screen should be unlocked (e.g., vertical)
+                    """)
+
     def check_target(self):
         if self.target.os != 'android' and self.target.os != 'chromeos':
             raise ConfigError('Target does not appear to be running Android')
@@ -940,6 +955,7 @@ class AndroidRuntimeConfig(RuntimeConfig):
         pass
 
     def commit(self):
+        # pylint: disable=too-many-branches
         if 'airplane_mode' in self.config:
             new_airplane_mode = self.config['airplane_mode']
             old_airplane_mode = self.target.get_airplane_mode()
@@ -964,13 +980,20 @@ class AndroidRuntimeConfig(RuntimeConfig):
 
         if 'brightness' in self.config:
             self.target.set_brightness(self.config['brightness'])
+
         if 'rotation' in self.config:
             self.target.set_rotation(self.config['rotation'])
+
         if 'screen_on' in self.config:
             if self.config['screen_on']:
                 self.target.ensure_screen_is_on()
             else:
                 self.target.ensure_screen_is_off()
 
+        if self.config.get('unlock_screen'):
+            self.target.ensure_screen_is_on()
+            if self.target.is_screen_locked():
+                self.target.swipe_to_unlock(self.config['unlock_screen'])
+
     def clear(self):
         self.config = {}

wa/framework/uiauto/app/build.gradle

@@ -11,8 +11,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
 }

wa/framework/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
 
     // NOTE: Do not place your application dependencies here; they belong

wa/framework/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/framework/version.py

@@ -21,9 +21,9 @@ from subprocess import Popen, PIPE
 
 VersionTuple = namedtuple('Version', ['major', 'minor', 'revision', 'dev'])
 
-version = VersionTuple(3, 3, 1, '')
+version = VersionTuple(3, 4, 0, 'dev1')
 
-required_devlib_version = VersionTuple(1, 3, 3, '')
+required_devlib_version = VersionTuple(1, 4, 0, 'dev3')
 
 
 def format_version(v):
@@ -57,7 +57,4 @@ def get_commit():
     p.wait()
     if p.returncode:
         return None
-    if sys.version_info[0] == 3 and isinstance(std, bytes):
-        return std[:8].decode(sys.stdout.encoding or 'utf-8')
-    else:
-        return std[:8]
+    return std[:8].decode(sys.stdout.encoding or 'utf-8')

wa/framework/workload.py

@@ -23,7 +23,7 @@ except ImportError:
     from pipes import quote
 
 
-from wa.utils.android import get_cacheable_apk_info
+from wa.utils.android import get_cacheable_apk_info, build_apk_launch_command
 from wa.framework.plugin import TargetedPlugin, Parameter
 from wa.framework.resource import (ApkFile, ReventFile,
                                    File, loose_version_matching,
@@ -180,6 +180,7 @@ class ApkWorkload(Workload):
     activity = None
     view = None
     clear_data_on_reset = True
+    apk_arguments = {}
 
     # Set this to True to mark that this workload requires the target apk to be run
     # for initialisation purposes before the main run is performed.
@@ -289,7 +290,8 @@ class ApkWorkload(Workload):
                                   clear_data_on_reset=self.clear_data_on_reset,
                                   activity=self.activity,
                                   min_version=self.min_version,
-                                  max_version=self.max_version)
+                                  max_version=self.max_version,
+                                  apk_arguments=self.apk_arguments)
 
     def validate(self):
         if self.min_version and self.max_version:
@@ -686,7 +688,7 @@ class PackageHandler(object):
     def __init__(self, owner, install_timeout=300, version=None, variant=None,
                  package_name=None, strict=False, force_install=False, uninstall=False,
                  exact_abi=False, prefer_host_package=True, clear_data_on_reset=True,
-                 activity=None, min_version=None, max_version=None):
+                 activity=None, min_version=None, max_version=None, apk_arguments=None):
         self.logger = logging.getLogger('apk')
         self.owner = owner
         self.target = self.owner.target
@@ -709,6 +711,7 @@ class PackageHandler(object):
         self.apk_version = None
         self.logcat_log = None
         self.error_msg = None
+        self.apk_arguments = apk_arguments
 
     def initialize(self, context):
         self.resolve_package(context)
@@ -853,11 +856,10 @@ class PackageHandler(object):
         self.apk_version = host_version
 
     def start_activity(self):
-        if not self.activity:
-            cmd = 'am start -W {}'.format(self.apk_info.package)
-        else:
-            cmd = 'am start -W -n {}/{}'.format(self.apk_info.package,
-                                                self.activity)
+
+        cmd = build_apk_launch_command(self.apk_info.package, self.activity,
+                                       self.apk_arguments)
+
         output = self.target.execute(cmd)
         if 'Error:' in output:
             # this will dismiss any error dialogs
@@ -943,7 +945,7 @@ class TestPackageHandler(PackageHandler):
     def setup(self, context):
         self.initialize_package(context)
 
-        words = ['am', 'instrument']
+        words = ['am', 'instrument', '--user', '0']
         if self.raw:
             words.append('-r')
         if self.wait:

wa/instruments/misc.py

@@ -37,7 +37,7 @@ from wa import Instrument, Parameter, very_fast
 from wa.framework.exception import ConfigError
 from wa.framework.instrument import slow
 from wa.utils.diff import diff_sysfs_dirs, diff_interrupt_files
-from wa.utils.misc import as_relative
+from wa.utils.misc import as_relative, safe_extract
 from wa.utils.misc import ensure_file_directory_exists as _f
 from wa.utils.misc import ensure_directory_exists as _d
 from wa.utils.types import list_of_strings
@@ -162,7 +162,7 @@ class SysfsExtractor(Instrument):
             self.target.execute('chmod 0777 {}'.format(on_device_tarball), as_root=True)
             self.target.pull(on_device_tarball, on_host_tarball)
             with tarfile.open(on_host_tarball, 'r:gz') as tf:
-                tf.extractall(context.output_directory)
+                safe_extract(tf, context.output_directory)
             self.target.remove(on_device_tarball)
             os.remove(on_host_tarball)
 

wa/instruments/perf.py

@@ -31,7 +31,7 @@ class PerfInstrument(Instrument):
 
     name = 'perf'
     description = """
-    Perf is a Linux profiling with performance counters.
+    Perf is a Linux profiling tool with performance counters.
     Simpleperf is an Android profiling tool with performance counters.
 
     It is highly recomended to use perf_type = simpleperf when using this instrument
@@ -109,6 +109,10 @@ class PerfInstrument(Instrument):
                   description="""
                   always install perf binary even if perf is already present on the device.
                   """),
+        Parameter('validate_pmu_events', kind=bool, default=True,
+                  description="""
+                  Query the hardware capabilities to verify the specified PMU events.
+                  """),
     ]
 
     def __init__(self, target, **kwargs):
@@ -137,7 +141,8 @@ class PerfInstrument(Instrument):
                                        self.run_report_sample,
                                        self.report_sample_options,
                                        self.labels,
-                                       self.force_install)
+                                       self.force_install,
+                                       self.validate_pmu_events)
 
     def setup(self, context):
         self.outdir = os.path.join(context.output_directory, self.perf_type)
@@ -259,7 +264,9 @@ class PerfInstrument(Instrument):
             line_num = 0
             for row in readCSV:
                 if 'Performance counter statistics' not in row and 'Total test time' not in row:
-                    classifiers = {'scaled from(%)': row[len(row) - 2].replace('(', '').replace(')', '').replace('%', '')}
+                    classifiers = {}
+                    if '%' in row:
+                        classifiers['scaled from(%)'] = row[len(row) - 2].replace('(', '').replace(')', '').replace('%', '')
                     context.add_metric('{}_{}'.format(label, row[1]), row[0], 'count', classifiers=classifiers)
                 line_num += 1
 
@@ -276,10 +283,12 @@ class PerfInstrument(Instrument):
                     tmp_line = line.strip()
                     count, metric = tmp_line.split(' ')[0], tmp_line.split(' ')[2]
                     count = float(count) if "." in count else int(count.replace(',', ''))
-                    scaled_percentage = line.split('(')[1].strip().replace(')', '').replace('%', '')
-                    scaled_percentage = int(scaled_percentage)
+                    classifiers = {}
+                    if '%' in line:
+                        scaled_percentage = line.split('(')[1].strip().replace(')', '').replace('%', '')
+                        classifiers['scaled from(%)'] = int(scaled_percentage)
                     metric = '{}_{}'.format(label, metric)
-                    context.add_metric(metric, count, units, classifiers={'scaled from(%)': scaled_percentage})
+                    context.add_metric(metric, count, units, classifiers=classifiers)
 
     def _process_simpleperf_record_output(self, context):
         for host_file in os.listdir(self.outdir):

wa/instruments/perfetto.py

@@ -0,0 +1,101 @@
+#    Copyright 2023 ARM Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os
+
+from devlib import PerfettoCollector
+
+from wa import Instrument, Parameter
+from wa.framework.instrument import very_slow, is_installed
+from wa.framework.exception import InstrumentError
+
+OUTPUT_PERFETTO_TRACE = 'devlib-trace.perfetto-trace'
+PERFETTO_CONFIG_FILE = 'config.pbtx'
+
+
+class PerfettoInstrument(Instrument):
+    name = 'perfetto'
+    description = """
+        perfetto is an instrument that interacts with Google's Perfetto tracing
+        infrastructure.
+
+        From Perfetto's website:
+        Perfetto is a production-grade open-source stack for performance instrumentation and trace analysis.
+        It offers services and libraries for recording system-level and app-level traces, native + java heap profiling,
+        a library for analyzing traces using SQL and a web-based UI to visualize and explore multi-GB traces.
+
+        The instrument either requires Perfetto to be present on the target device or the standalone tracebox binary
+        to be built from source and included in devlib's Package Bin directory.
+        For more information, consult the PerfettoCollector documentation in devlib.
+
+        More information can be found on https://perfetto.dev/
+    """
+
+    parameters = [
+        Parameter('config', kind=str, mandatory=True,
+                  description="""
+                  Path to the Perfetto trace config file.
+
+                  All the Perfetto-specific tracing configuration should be done inside
+                  that file. This config option should just take a full
+                  filesystem path to where the config can be found.
+                  """),
+        Parameter('force_tracebox', kind=bool, default=False,
+                  description="""
+                  Install tracebox even if traced is already running on the target device.
+                  If set to true, the tracebox binary needs to be placed in devlib's Package Bin directory.
+                  """)
+    ]
+
+    def __init__(self, target, **kwargs):
+        super(PerfettoInstrument, self).__init__(target, **kwargs)
+        self.collector = None
+
+    def initialize(self, context):  # pylint: disable=unused-argument
+        self.target_config = self.target.path.join(self.target.working_directory, PERFETTO_CONFIG_FILE)
+        # push the config file to target
+        self.target.push(self.config, self.target_config)
+        collector_params = dict(
+            config=self.target_config,
+            force_tracebox=self.force_tracebox
+        )
+        self.collector = PerfettoCollector(self.target, **collector_params)
+
+    @very_slow
+    def start(self, context):  # pylint: disable=unused-argument
+        self.collector.start()
+
+    @very_slow
+    def stop(self, context):  # pylint: disable=unused-argument
+        self.collector.stop()
+
+    def update_output(self, context):
+        self.logger.info('Extracting Perfetto trace from target...')
+        outfile = os.path.join(context.output_directory, OUTPUT_PERFETTO_TRACE)
+        self.collector.set_output(outfile)
+        self.collector.get_data()
+        context.add_artifact('perfetto-bin', outfile, 'data')
+
+    def teardown(self, context):  # pylint: disable=unused-argument
+        self.target.remove(self.collector.target_output_file)
+
+    def finalize(self, context):  # pylint: disable=unused-argument
+        self.target.remove(self.target_config)
+
+    def validate(self):
+        if is_installed('trace-cmd'):
+            raise InstrumentError('perfetto cannot be used at the same time as trace-cmd')
+        if not os.path.isfile(self.config):
+            raise InstrumentError('perfetto config file not found at "{}"'.format(self.config))

wa/instruments/poller/__init__.py

@@ -59,6 +59,12 @@ class FilePoller(Instrument):
                   Whether or not the poller will be run as root. This should be
                   used when the file you need to poll can only be accessed by root.
                   """),
+        Parameter('reopen', kind=bool, default=False,
+                  description="""
+                  When enabled files will be re-opened with each read. This is
+                  useful for some sysfs/debugfs entries that only generate a
+                  value when opened.
+                  """),
     ]
 
     def validate(self):
@@ -91,13 +97,17 @@ class FilePoller(Instrument):
         if self.align_with_ftrace:
             marker_option = '-m'
             signal.connect(self._adjust_timestamps, signal.AFTER_JOB_OUTPUT_PROCESSED)
-        self.command = '{} -t {} {} -l {} {} > {} 2>{}'.format(target_poller,
-                                                               self.sample_interval * 1000,
-                                                               marker_option,
-                                                               ','.join(self.labels),
-                                                               ' '.join(self.files),
-                                                               self.target_output_path,
-                                                               self.target_log_path)
+        reopen_option = ''
+        if self.reopen:
+            reopen_option = '-r'
+        self.command = '{} {} -t {} {} -l {} {} > {} 2>{}'.format(target_poller,
+                                                                  reopen_option,
+                                                                  self.sample_interval * 1000,
+                                                                  marker_option,
+                                                                  ','.join(self.labels),
+                                                                  ' '.join(self.files),
+                                                                  self.target_output_path,
+                                                                  self.target_log_path)
 
     def start(self, context):
         self.target.kick_off(self.command, as_root=self.as_root)

wa/instruments/poller/poller.c

@@ -77,9 +77,10 @@ int main(int argc, char ** argv) {
     char *labels;
     int labelCount = 0;
     int should_write_marker = 0;
+    int reopen_files = 0;
     int ret;
 
-    static char usage[] = "usage: %s [-h] [-m] [-t INTERVAL] FILE [FILE ...]\n"
+    static char usage[] = "usage: %s [-h] [-m] [-r] [-t INTERVAL] FILE [FILE ...]\n"
                           "polls FILE(s) every INTERVAL microseconds and outputs\n"
                           "the results in CSV format including a timestamp to STDOUT\n"
                           "\n"
@@ -87,6 +88,7 @@ int main(int argc, char ** argv) {
                           "    -m     Insert a marker into ftrace at the time of the first\n"
                           "           sample. This marker may be used to align the timestamps\n"
                           "           produced by the poller with those of ftrace events.\n"
+                          "    -r     Reopen files on each read (needed for some sysfs/debugfs files)\n"
                           "    -t     The polling sample interval in microseconds\n"
                           "           Defaults to 1000000 (1 second)\n"
                           "    -l     Comma separated list of labels to use in the CSV\n"
@@ -94,7 +96,7 @@ int main(int argc, char ** argv) {
 
 
     //Handling command line arguments
-    while ((c = getopt(argc, argv, "hmt:l:")) != -1)
+    while ((c = getopt(argc, argv, "hmrt:l:")) != -1)
     {
         switch(c) {
             case 'h':
@@ -104,7 +106,10 @@ int main(int argc, char ** argv) {
                 break;
             case 'm':
                 should_write_marker = 1;
-		break;
+                break;
+            case 'r':
+                reopen_files = 1;
+                break;
             case 't':
                 interval = (useconds_t)atoi(optarg);
                 break;
@@ -184,7 +189,20 @@ int main(int argc, char ** argv) {
         time_float += ((double)current_time.tv_nsec)/1000/1000/1000;
         printf("%f", time_float);
         for (i = 0; i < num_files; i++) {
-            lseek(files_to_poll[i].fd, 0, SEEK_SET);
+            if (reopen_files) {
+                // Close and reopen the file to get fresh data
+                close(files_to_poll[i].fd);
+                files_to_poll[i].fd = open(files_to_poll[i].path, O_RDONLY);
+                if (files_to_poll[i].fd == -1) {
+                    fprintf(stderr, "WARNING: Could not reopen \"%s\", got: %s\n",
+                            files_to_poll[i].path, strerror(errno));
+                    printf(",");
+                    continue;
+                }
+            } else {
+                lseek(files_to_poll[i].fd, 0, SEEK_SET);
+            }
+
             bytes_read = read(files_to_poll[i].fd, buf, 1024);
 
             if (bytes_read < 0) {

wa/instruments/trace_cmd.py

@@ -22,7 +22,7 @@ from devlib import FtraceCollector
 
 from wa import Instrument, Parameter
 from wa.framework import signal
-from wa.framework.instrument import very_slow
+from wa.framework.instrument import very_slow, is_installed
 from wa.framework.exception import InstrumentError
 from wa.utils.types import list_of_strings
 from wa.utils.misc import which
@@ -125,6 +125,13 @@ class TraceCmdInstrument(Instrument):
                   value by going down from the specified size in
                   ``buffer_size_step`` intervals.
                   """),
+        Parameter('top_buffer_size', kind=int, default=None,
+                  global_alias='trace_top_buffer_size',
+                  description="""
+                  The same as buffer_size except it sets the size of the
+                  top-level buffer instead of the devlib one. If left unset,
+                  it will default to the same as the devlib buffer size.
+                  """),
         Parameter('buffer_size_step', kind=int, default=1000,
                   global_alias='trace_buffer_size_step',
                   description="""
@@ -155,6 +162,13 @@ class TraceCmdInstrument(Instrument):
                             installed on the host (the one in your
                             distribution's repos may be too old).
                   """),
+        Parameter('mode', kind=str, default='write-to-memory',
+                  allowed_values=['write-to-disk', 'write-to-memory'],
+                  description="""
+                  Specifies whether collected traces should be saved in memory or disk.
+                  Extensive workloads may hit out of memory issue. Hence, write-to-disk
+                  mode can help in such cases.
+                  """),
     ]
 
     def __init__(self, target, **kwargs):
@@ -168,6 +182,7 @@ class TraceCmdInstrument(Instrument):
             events=self.events,
             functions=self.functions,
             buffer_size=self.buffer_size,
+            top_buffer_size=self.top_buffer_size,
             buffer_size_step=1000,
             automark=False,
             autoreport=True,
@@ -175,6 +190,7 @@ class TraceCmdInstrument(Instrument):
             no_install=self.no_install,
             strict=False,
             report_on_target=False,
+            mode=self.mode,
         )
         if self.report and self.report_on_target:
             collector_params['autoreport'] = True
@@ -207,12 +223,14 @@ class TraceCmdInstrument(Instrument):
         if not self.collector:
             return
         self.logger.info('Extracting trace from target...')
-        outfile = os.path.join(context.output_directory, 'trace.dat')
+        outfile = os.path.join(context.output_directory, OUTPUT_TRACE_FILE)
+
         self.collector.set_output(outfile)
         self.collector.get_data()
         context.add_artifact('trace-cmd-bin', outfile, 'data')
         if self.report:
-            textfile = os.path.join(context.output_directory, 'trace.txt')
+            textfile = os.path.join(context.output_directory, OUTPUT_TEXT_FILE)
+
             if not self.report_on_target:
                 self.collector.report(outfile, textfile)
             context.add_artifact('trace-cmd-txt', textfile, 'export')
@@ -227,6 +245,8 @@ class TraceCmdInstrument(Instrument):
     def validate(self):
         if self.report and not self.report_on_target and not which('trace-cmd'):
             raise InstrumentError('trace-cmd is not in PATH; is it installed?')
+        if is_installed('perfetto'):
+            raise InstrumentError('trace-cmd cannot be used at the same time as perfetto')
 
     def mark_start(self, context):
         if self.is_enabled:

wa/utils/android.py

@@ -16,6 +16,7 @@
 import logging
 import os
 from datetime import datetime
+from shlex import quote
 
 from devlib.utils.android import ApkInfo as _ApkInfo
 
@@ -196,3 +197,29 @@ def get_cacheable_apk_info(path):
 
 
 apk_info_cache = ApkInfoCache()
+
+
+def build_apk_launch_command(package, activity=None, apk_args=None):
+    args_string = ''
+    if apk_args:
+        for k, v in apk_args.items():
+            if isinstance(v, str):
+                arg = '--es'
+                v = quote(v)
+            elif isinstance(v, float):
+                arg = '--ef'
+            elif isinstance(v, bool):
+                arg = '--ez'
+            elif isinstance(v, int):
+                arg = '--ei'
+            else:
+                raise ValueError('Unable to encode {} {}'.format(v, type(v)))
+
+            args_string = '{} {} {} {}'.format(args_string, arg, k, v)
+
+    if not activity:
+        cmd = 'am start -W {} {}'.format(package, args_string)
+    else:
+        cmd = 'am start -W -n {}/{} {}'.format(package, activity, args_string)
+
+    return cmd

wa/utils/misc.py

@@ -21,10 +21,12 @@ Miscellaneous functions that don't fit anywhere else.
 
 import errno
 import hashlib
-import imp
+import importlib
+import inspect
 import logging
 import math
 import os
+import pathlib
 import random
 import re
 import shutil
@@ -39,13 +41,14 @@ from functools import reduce  # pylint: disable=redefined-builtin
 from operator import mul
 from tempfile import gettempdir, NamedTemporaryFile
 from time import sleep
-if sys.version_info[0] == 3:
-    from io import StringIO
-else:
-    from io import BytesIO as StringIO
+from io import StringIO
 # pylint: disable=wrong-import-position,unused-import
 from itertools import chain, cycle
-from distutils.spawn import find_executable  # pylint: disable=no-name-in-module, import-error
+
+try:
+    from shutil import which as find_executable
+except ImportError:
+    from distutils.spawn import find_executable  # pylint: disable=no-name-in-module, import-error
 
 from dateutil import tz
 
@@ -56,7 +59,7 @@ from devlib.utils.misc import (ABI_MAP, check_output, walk_modules,
                                normalize, convert_new_lines, get_cpu_mask, unique,
                                isiterable, getch, as_relative, ranges_to_list, memoized,
                                list_to_ranges, list_to_mask, mask_to_list, which,
-                               to_identifier)
+                               to_identifier, safe_extract, LoadSyntaxError)
 
 check_output_logger = logging.getLogger('check_output')
 
@@ -234,7 +237,12 @@ def load_class(classpath):
     """Loads the specified Python class. ``classpath`` must be a fully-qualified
     class name (i.e. namspaced under module/package)."""
     modname, clsname = classpath.rsplit('.', 1)
-    return getattr(__import__(modname), clsname)
+    mod = importlib.import_module(modname)
+    cls = getattr(mod, clsname)
+    if isinstance(cls, type):
+        return cls
+    else:
+        raise ValueError(f'The classpath "{classpath}" does not point at a class: {cls}')
 
 
 def get_pager():
@@ -285,7 +293,7 @@ def get_article(word):
               in all case; e.g. this will return ``"a hour"``.
 
     """
-    return'an' if word[0] in 'aoeiu' else 'a'
+    return 'an' if word[0] in 'aoeiu' else 'a'
 
 
 def get_random_string(length):
@@ -293,80 +301,52 @@ def get_random_string(length):
     return ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(length))
 
 
-class LoadSyntaxError(Exception):
+def import_path(filepath, module_name=None):
+    """
+    Programmatically import the given Python source file under the name
+    ``module_name``. If ``module_name`` is not provided, a stable name based on
+    ``filepath`` will be created. Note that this module name cannot be relied
+    on, so don't make write import statements assuming this will be stable in
+    the future.
+    """
+    if not module_name:
+        path = pathlib.Path(filepath).resolve()
+        id_ = to_identifier(str(path))
+        module_name = f'wa._user_import.{id_}'
 
-    def __init__(self, message, filepath, lineno):
-        super(LoadSyntaxError, self).__init__(message)
-        self.filepath = filepath
-        self.lineno = lineno
-
-    def __str__(self):
-        message = 'Syntax Error in {}, line {}:\n\t{}'
-        return message.format(self.filepath, self.lineno, self.message)
+    try:
+        return sys.modules[module_name]
+    except KeyError:
+        spec = importlib.util.spec_from_file_location(module_name, filepath)
+        module = importlib.util.module_from_spec(spec)
+        try:
+            sys.modules[module_name] = module
+            spec.loader.exec_module(module)
+        except BaseException:
+            sys.modules.pop(module_name, None)
+            raise
+        else:
+            # We could return the "module" object, but that would not take into
+            # account any manipulation the module did on sys.modules when
+            # executing. To be consistent with the import statement, re-lookup
+            # the module name.
+            return sys.modules[module_name]
 
 
-RAND_MOD_NAME_LEN = 30
-
-
-def load_struct_from_python(filepath=None, text=None):
+def load_struct_from_python(filepath):
     """Parses a config structure from a .py file. The structure should be composed
     of basic Python types (strings, ints, lists, dicts, etc.)."""
-    if not (filepath or text) or (filepath and text):
-        raise ValueError('Exactly one of filepath or text must be specified.')
+
     try:
-        if filepath:
-            modname = to_identifier(filepath)
-            mod = imp.load_source(modname, filepath)
-        else:
-            modname = get_random_string(RAND_MOD_NAME_LEN)
-            while modname in sys.modules:  # highly unlikely, but...
-                modname = get_random_string(RAND_MOD_NAME_LEN)
-            mod = imp.new_module(modname)
-            exec(text, mod.__dict__)  # pylint: disable=exec-used
-        return dict((k, v)
-                    for k, v in mod.__dict__.items()
-                    if not k.startswith('_'))
+        mod = import_path(filepath)
     except SyntaxError as e:
         raise LoadSyntaxError(e.message, filepath, e.lineno)
-
-
-def load_struct_from_yaml(filepath=None, text=None):
-    """Parses a config structure from a .yaml file. The structure should be composed
-    of basic Python types (strings, ints, lists, dicts, etc.)."""
-
-    # Import here to avoid circular imports
-    # pylint: disable=wrong-import-position,cyclic-import, import-outside-toplevel
-    from wa.utils.serializer import yaml
-
-    if not (filepath or text) or (filepath and text):
-        raise ValueError('Exactly one of filepath or text must be specified.')
-    try:
-        if filepath:
-            with open(filepath) as fh:
-                return yaml.load(fh)
-        else:
-            return yaml.load(text)
-    except yaml.YAMLError as e:
-        lineno = None
-        if hasattr(e, 'problem_mark'):
-            lineno = e.problem_mark.line  # pylint: disable=no-member
-        raise LoadSyntaxError(e.message, filepath=filepath, lineno=lineno)
-
-
-def load_struct_from_file(filepath):
-    """
-    Attempts to parse a Python structure consisting of basic types from the specified file.
-    Raises a ``ValueError`` if the specified file is of unkown format; ``LoadSyntaxError`` if
-    there is an issue parsing the file.
-
-    """
-    extn = os.path.splitext(filepath)[1].lower()
-    if extn in ('.py', '.pyc', '.pyo'):
-        return load_struct_from_python(filepath)
-    elif extn == '.yaml':
-        return load_struct_from_yaml(filepath)
     else:
-        raise ValueError('Unknown format "{}": {}'.format(extn, filepath))
+        return {
+            k: v
+            for k, v in inspect.getmembers(mod)
+            if not k.startswith('_')
+        }
 
 
 def open_file(filepath):

wa/utils/types.py

@@ -29,19 +29,14 @@ import os
 import re
 import numbers
 import shlex
-import sys
 from bisect import insort
-if sys.version_info[0] == 3:
-    from urllib.parse import quote, unquote  # pylint: disable=no-name-in-module, import-error
-    from past.builtins import basestring  # pylint: disable=redefined-builtin
-    long = int  # pylint: disable=redefined-builtin
-else:
-    from urllib import quote, unquote  # pylint: disable=no-name-in-module
+from urllib.parse import quote, unquote  # pylint: disable=no-name-in-module, import-error
 # pylint: disable=wrong-import-position
 from collections import defaultdict
 from collections.abc import MutableMapping
 from functools import total_ordering
 
+from past.builtins import basestring  # pylint: disable=redefined-builtin
 from future.utils import with_metaclass
 
 from devlib.utils.types import identifier, boolean, integer, numeric, caseless_string
@@ -710,8 +705,6 @@ class ParameterDict(dict):
             prefix = 'f'
         elif isinstance(obj, bool):
             prefix = 'b'
-        elif isinstance(obj, long):
-            prefix = 'i'
         elif isinstance(obj, int):
             prefix = 'i'
         elif obj is None:
@@ -792,10 +785,7 @@ class ParameterDict(dict):
         return (key, self._decode(value))
 
     def iter_encoded_items(self):
-        if sys.version_info[0] == 3:
-            return dict.items(self)
-        else:
-            return dict.iteritems(self)
+        return dict.items(self)
 
     def get_encoded_value(self, name):
         return dict.__getitem__(self, name)

wa/workloads/adobereader/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext: 'aar')
 }
 
 repositories {

wa/workloads/adobereader/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/adobereader/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/aitutu/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext: 'aar')
 }
 
 repositories {

wa/workloads/aitutu/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/aitutu/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/androbench/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext: 'aar')
 }
 
 repositories {

wa/workloads/androbench/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/androbench/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/antutu/uiauto/app/build.gradle

@@ -27,11 +27,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/antutu/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/applaunch/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/applaunch/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/applaunch/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/benchmarkpi/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/benchmarkpi/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/benchmarkpi/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+

wa/workloads/chrome/uiauto/app/build.gradle

@@ -19,11 +19,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext: 'aar')
 }
 
 repositories {

wa/workloads/chrome/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/chrome/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/drarm/__init__.py

@@ -0,0 +1,112 @@
+#    Copyright 2023 ARM Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+import os
+import pandas as pd
+from wa import ApkWorkload, Parameter
+from devlib.exception import TargetStableCalledProcessError
+
+
+class DrArm(ApkWorkload):
+
+    name = 'drarm'
+    package_names = ['com.Arm.DrArm']
+    activity = 'com.unity3d.player.UnityPlayerActivity'
+    view = "SurfaceView[com.Arm.DrArm/com.unity3d.player.UnityPlayerActivity](BLAST)"
+    install_timeout = 200
+    description = """
+    Dr. Arm’s Amazing Adventures is a “Souls-Like” Mobile Action Role Playing Game developed at Arm.
+    """
+
+    parameters = [
+        Parameter('timeout', kind=int, default=126,
+                  description='The amount of time the game should run for'),
+        Parameter('auto_demo', kind=bool, default=False,
+                  description='Start the demo automatically'),
+        Parameter('show_fps', kind=bool, default=False,
+                  description='Show the FPS count window in-game'),
+        Parameter('adpf', kind=bool, default=True,
+                  description='Enable ADPF'),
+        Parameter('adpf_auto', kind=bool, default=True,
+                  description='Enable automatic ADPF mode'),
+        Parameter('adpf_logging', kind=bool, default=False,
+                  description='Enable ADPF logging'),
+        Parameter('verbose_log', kind=bool, default=False,
+                  description='Emit reported stats as debug logs'),
+        Parameter('adpf_interventions', kind=bool, default=True,
+                  description='Enable ADPF interventions'),
+        Parameter('target_vsyncs', kind=int, default=1,
+                  description='the number of vsyncs to target to a frame (1 = current display rate)'),
+        Parameter('target_framerate', kind=int, default=None,
+                  description='Target framerate for the application'),
+        Parameter('fps_report_file', kind=str, default=None,
+                  description='File name that the ADPF FPS report should use.'),
+        Parameter('fixed_time_step', kind=float, default=None,
+                  description='Time, in seconds, that should be used in advancing the simulation'),
+    ]
+
+    @property
+    def apk_arguments(self):
+        args = {
+            'showFPS': int(self.show_fps),
+            'doAdpf': int(self.adpf),
+            'adpfMode': int(self.adpf_auto),
+            'adpfLogging': int(self.adpf_logging),
+            'verboseLog': int(self.verbose_log),
+            'adpfInterventions': int(self.adpf_interventions),
+            'targetVsyncs': self.target_vsyncs,
+            'autoDemo': int(self.auto_demo),
+        }
+
+        if self.target_framerate is not None:
+            args['targetFramerate'] = self.target_framerate
+
+        if self.fixed_time_step is not None:
+            args['fixedTimeStep'] = self.fixed_time_step
+
+        if self.fps_report_file is not None:
+            args['fpsReportFileName'] = self.fps_report_file
+
+        return args
+
+    def run(self, context):
+        self.target.sleep(self.timeout)
+
+    def update_output(self, context):
+        super(DrArm, self).update_output(context)
+        outfile_glob = self.target.path.join(
+            self.target.external_storage_app_dir, self.apk.package, 'files', '*.csv'
+        )
+
+        try:
+            ls_output = self.target.execute('ls {}'.format(outfile_glob))
+        except TargetStableCalledProcessError:
+            self.logger.warning('Failed to find the ADPF report file.')
+            return
+
+        on_target_output_files = [f.strip() for f in ls_output.split('\n') if f]
+
+        self.logger.info('Extracting the ADPF FPS report from target...')
+        for file in on_target_output_files:
+            host_output_file = os.path.join(context.output_directory, os.path.basename(file))
+            self.target.pull(file, host_output_file)
+            context.add_artifact('adpf', host_output_file, kind='data',
+                                 description='ADPF report log in CSV format.')
+
+            adpf_df = pd.read_csv(host_output_file)
+            if not adpf_df.empty:
+                context.add_metric('Average FPS', round(adpf_df['average fps'].mean(), 2))
+                context.add_metric('Frame count', int(adpf_df['# frame count'].iloc[-1]))

wa/workloads/geekbench/__init__.py

@@ -1,4 +1,4 @@
-#    Copyright 2013-2018 ARM Limited
+#    Copyright 2013-2025 ARM Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@ import tempfile
 import json
 from collections import defaultdict
 
-from wa import ApkUiautoWorkload, Parameter
+from wa import Workload, ApkUiautoWorkload, Parameter
 from wa.framework.exception import ConfigError, WorkloadError
 from wa.utils.misc import capitalize
-from wa.utils.types import version_tuple
+from wa.utils.types import version_tuple, list_or_integer
+from wa.utils.exec_control import once
 
 
 class Geekbench(ApkUiautoWorkload):
@@ -370,3 +371,233 @@ class GeekbenchCorproate(Geekbench):  # pylint: disable=too-many-ancestors
 
 def namemify(basename, i):
     return basename + (' {}'.format(i) if i else '')
+
+
+class GeekbenchCmdline(Workload):
+
+    name = "geekbench_cli"
+    description = "Workload for running command line version Geekbench"
+
+    gb6_workloads = {
+        # Single-Core and Multi-Core
+        101: 'File Compression',
+        102: 'Navigation',
+        103: 'HTML5 Browser',
+        104: 'PDF Renderer',
+        105: 'Photo Library',
+        201: 'Clang',
+        202: 'Text Processing',
+        203: 'Asset Compression',
+        301: 'Object Detection',
+        402: 'Object Remover',
+        403: 'HDR',
+        404: 'Photo Filter',
+        501: 'Ray Tracer',
+        502: 'Structure from Motion',
+        # OpenCL and Vulkan
+        303: 'Face Detection',
+        406: 'Edge Detection',
+        407: 'Gaussian Blur',
+        503: 'Feature Matching',
+        504: 'Stereo Matching',
+        601: 'Particle Physics',
+        # Single-Core, Multi-Core, OpenCL, and Vulkan
+        302: 'Background Blur',
+        401: 'Horizon Detection',
+    }
+
+    gb5_workloads = {
+        # Single-Core and Multi-Core
+        101: 'AES-XTS',
+        201: 'Text Compression',
+        202: 'Image Compression',
+        203: 'Navigation',
+        204: 'HTML5',
+        205: 'SQLite',
+        206: 'PDF Rendering',
+        207: 'Text Rendering',
+        208: 'Clang',
+        209: 'Camera',
+        301: 'N-Body Physics',
+        302: 'Rigid Body Physics',
+        307: 'Image Inpainting',
+        308: 'HDR',
+        309: 'Ray Tracing',
+        310: 'Structure from Motion',
+        312: 'Speech Recognition',
+        313: 'Machine Learning',
+        # OpenCL and Vulkan
+        220: 'Sobel',
+        221: 'Canny',
+        222: 'Stereo Matching',
+        230: 'Histogram Equalization',
+        304: 'Depth of Field',
+        311: 'Feature Matching',
+        320: 'Particle Physics',
+        321: 'SFFT',
+        # Single-Core, Multi-Core, OpenCL, and Vulkan
+        303: 'Gaussian Blur',
+        305: 'Face Detection',
+        306: 'Horizon Detection',
+    }
+
+    binary_name = 'geekbench_aarch64'
+
+    allowed_extensions = ['json', 'csv', 'xml', 'html', 'text']
+
+    parameters = [
+        Parameter('cpumask', kind=str, default='',
+                  description='CPU mask used by taskset.'),
+        Parameter('section', kind=int, default=1, allowed_values=[1, 4, 9],
+                  description="""Run the specified sections. It should be 1 for CPU benchmarks,
+                  4 for OpenCL benchmarks and 9 for Vulkan benchmarks."""),
+        Parameter('upload', kind=bool, default=False,
+                  description='Upload results to Geekbench Browser'),
+        Parameter('is_single_core', kind=bool, default=True,
+                  description='Run workload in single-core or multi-core mode.'),
+        Parameter('workload', kind=list_or_integer, default=301,
+                  description='Specify workload to run'),
+        Parameter('iterations', kind=int, default=5,
+                  description='Number of iterations'),
+        Parameter('workload_gap', kind=int, default=2000,
+                  description='N milliseconds gap between workloads'),
+        Parameter('output_file', kind=str, default='gb_cli.json',
+                  description=f"""Specify the name of the output results file.
+                  If it is not specified, the output file will be generated as a JSON file.
+                  It can be {', '.join(allowed_extensions)} files."""),
+        Parameter('timeout', kind=int, default=2000,
+                  description='The test timeout in ms. It should be long for 1000 iterations.'),
+        Parameter('version', kind=str, default='6.3.0',
+                  description='Specifies which version of the Geekbench should run.'),
+    ]
+
+    def __init__(self, target, **kwargs):
+        super(GeekbenchCmdline, self).__init__(target, **kwargs)
+        self.target_result_json = None
+        self.host_result_json = None
+        self.workloads = self.gb6_workloads
+        self.params = ''
+        self.output = ''
+        self.target_exec_directory = ''
+        self.tar_file_src = ''
+        self.tar_file_dst = ''
+        self.file_exists = False
+
+    def init_resources(self, context):
+        """
+        Retrieves necessary files to run the benchmark in TAR format.
+        WA will look for `gb_cli_artifacts_<version>.tar` file to deploy them to the
+        working directory. If there is no specified version, it will look for version
+        6.3.0 by default.
+        """
+        self.deployable_assets = [''.join(['gb_cli_artifacts', '_', self.version, '.tar'])]
+
+        # Create an executables directory
+        self.target_exec_directory = self.target.path.join(self.target.executables_directory, f'gb_cli-{self.version}')
+        self.target.execute("mkdir -p {}".format(self.target_exec_directory))
+
+        # Source and Destination paths for the artifacts tar file
+        self.tar_file_src = self.target.path.join(self.target.working_directory, self.deployable_assets[0])
+        self.tar_file_dst = self.target.path.join(self.target_exec_directory, self.deployable_assets[0])
+        # Check the tar file if it already exists
+        if self.target.file_exists(self.tar_file_dst):
+            self.file_exists = True
+        else:
+            # Get the assets file
+            super(GeekbenchCmdline, self).init_resources(context)
+
+    @once
+    def initialize(self, context):
+        if self.version[0] == '5':
+            self.workloads = self.gb5_workloads
+        # If the tar file does not exist in the target, deploy the assets
+        if not self.file_exists:
+            super(GeekbenchCmdline, self).initialize(context)
+            # Move the tar file to the executables directory
+            self.target.execute(
+                '{} mv {} {}'.format(
+                    self.target.busybox, self.tar_file_src, self.tar_file_dst))
+            # Extract the tar file
+            self.target.execute(
+                '{} tar -xf {} -C {}'.format(
+                    self.target.busybox, self.tar_file_dst, self.target_exec_directory))
+
+    def setup(self, context):
+        super(GeekbenchCmdline, self).setup(context)
+
+        self.params = ''
+
+        self.params += '--section {} '.format(self.section)
+        if self.section == 1:
+            self.params += '--single-core ' if self.is_single_core else '--multi-core '
+
+        self.params += '--upload ' if self.upload else '--no-upload '
+
+        known_workloads = '\n'.join("{}: {}".format(k, v) for k, v in self.workloads.items())
+        if any([t not in self.workloads.keys() for t in self.workload]):
+            msg = 'Unknown workload(s) specified. Known workloads: {}'
+            raise ValueError(msg.format(known_workloads))
+
+        self.params += '--workload {} '.format(''.join("{},".format(i) for i in self.workload))
+
+        if self.iterations:
+            self.params += '--iterations {} '.format(self.iterations)
+
+        if self.workload_gap:
+            self.params += '--workload-gap {} '.format(self.workload_gap)
+
+        extension = os.path.splitext(self.output_file)[1][1:]
+        if self.output_file and extension not in self.allowed_extensions:
+            msg = f"No allowed extension specified. Allowed extensions: {', '.join(self.allowed_extensions)}"
+            raise ValueError(msg)
+        elif self.output_file:
+            # Output results file with the given name and extension
+            self.target_result_json = os.path.join(self.target_exec_directory, self.output_file)
+            self.params += '--export-{} {}'.format(extension, self.target_result_json)
+            self.host_result_json = os.path.join(context.output_directory, self.output_file)
+        else:
+            # The output file is not specified
+            self.target_result_json = os.path.join(self.target_exec_directory, self.output_file)
+            self.params += '--save {}'.format(self.target_result_json)
+            self.host_result_json = os.path.join(context.output_directory, self.output_file)
+
+    def run(self, context):
+        super(GeekbenchCmdline, self).run(context)
+        taskset = f"taskset {self.cpumask}" if self.cpumask else ""
+        binary = self.target.path.join(self.target_exec_directory, self.binary_name)
+        cmd = '{} {} {}'.format(taskset, binary, self.params)
+
+        try:
+            self.output = self.target.execute(cmd, timeout=self.timeout, as_root=True)
+        except KeyboardInterrupt:
+            self.target.killall(self.binary_name)
+            raise
+
+    def update_output(self, context):
+        super(GeekbenchCmdline, self).update_output(context)
+        if not self.output:
+            return
+        for workload in self.workload:
+            scores = []
+            matches = re.findall(self.workloads[workload] + '(.+\d)', self.output)
+            for match in matches:
+                scores.append(int(re.search(r'\d+', match).group(0)))
+            if self.section == 4:
+                context.add_metric("OpenCL Score " + self.workloads[workload], scores[0])
+            elif self.section == 9:
+                context.add_metric("Vulkan Score " + self.workloads[workload], scores[0])
+            else:
+                context.add_metric("Single-Core Score " + self.workloads[workload], scores[0])
+                if not self.is_single_core:
+                    context.add_metric("Multi-Core Score " + self.workloads[workload], scores[1])
+
+    def extract_results(self, context):
+        # Extract results on the target
+        super(GeekbenchCmdline, self).extract_results(context)
+        self.target.pull(self.target_result_json, self.host_result_json)
+        context.add_artifact('GeekbenchCmdline_results', self.host_result_json, kind='raw')
+
+    @once
+    def finalize(self, context):
+        if self.cleanup_assets:
+            self.target.remove(self.target_exec_directory)

wa/workloads/gfxbench/uiauto/app/build.gradle

@@ -27,11 +27,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/gfxbench/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/gfxbench/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/glbenchmark/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/glbenchmark/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/glbenchmark/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/gmail/uiauto/app/build.gradle

@@ -27,11 +27,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/gmail/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/googlemaps/uiauto/app/build.gradle

@@ -19,11 +19,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext: 'aar')
 }
 
 repositories {

wa/workloads/googlemaps/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/googlemaps/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/googlephotos/uiauto/app/build.gradle

@@ -27,11 +27,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/googlephotos/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/googlephotos/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/googleplaybooks/uiauto/app/build.gradle

@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    compile(name: 'uiauto', ext:'aar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/googleplaybooks/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/googleplaybooks/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/googleslides/uiauto/app/build.gradle

@@ -21,12 +21,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support.test:rules:0.5'
     // Using older version of uitautomator as the latest version can't find canvas elements.
-    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
-    compile(name: 'uiauto', ext:'aar')
+    implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+    implementation(name: 'uiauto', ext:'aar')
 }
 
 repositories {

wa/workloads/googleslides/uiauto/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

wa/workloads/googleslides/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

wa/workloads/jankbench/__init__.py

@@ -223,8 +223,7 @@ class JankbenchRunMonitor(threading.Thread):
                 ready, _, _ = select.select([proc.stdout, proc.stderr], [], [], 2)
                 if ready:
                     line = ready[0].readline()
-                    if sys.version_info[0] == 3:
-                        line = line.decode(sys.stdout.encoding, 'replace')
+                    line = line.decode(sys.stdout.encoding, 'replace')
                     if self.regex.search(line):
                         self.run_ended.set()
         proc.terminate()

wa/workloads/meabo/__init__.py

@@ -256,10 +256,7 @@ class Meabo(Workload):
 
         outfile = os.path.join(context.output_directory, 'meabo-output.txt')
         with open(outfile, 'wb') as wfh:
-            if sys.version_info[0] == 3:
-                wfh.write(self.output.encode('utf-8'))
-            else:
-                wfh.write(self.output)
+            wfh.write(self.output.encode('utf-8'))
         context.add_artifact('meabo-output', outfile, kind='raw')
 
         cur_phase = 0