sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-04 20:32:36 +01:00
Code Issues Releases Wiki Activity

Responding to review comments

Browse Source 
Responding to review comments 1

Responding to review comments 2
This commit is contained in:
scojac01
2025-04-11 18:43:55 +01:00
committed by Marc Bonnici
parent 24f9af84af
commit cc9a3e0d0b
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wa/workloads/antutu/__init__.py
View File

@@ -15,6 +15,7 @@
import re import re
import os import os
import time import time
from wa import ApkUiautoWorkload, Workload, WorkloadError, Parameter, ApkFile, File from wa import ApkUiautoWorkload, Workload, WorkloadError, Parameter, ApkFile, File
@@ -145,7 +146,7 @@ class Antutu(ApkUiautoWorkload):
result = float('NaN') result = float('NaN')
entry = regex.pattern.rsplit(None, 1)[0] entry = regex.pattern.rsplit(None, 1)[0]
context.add_metric(entry, result, lower_is_better=False) context.add_metric(entry, result, lower_is_better=False)
#Calculate group scores if 'CPU' in entry: #Calculate group scores if 'CPU' in entry:
if 'CPU' in entry: if 'CPU' in entry:
cpu.append(result) cpu.append(result)
cpu_result = sum(cpu) cpu_result = sum(cpu)
@@ -197,8 +198,7 @@ class AntutuBDP(Workload):
Known working version: 10.4.3-domesticAndroidFullBdp Known working version: 10.4.3-domesticAndroidFullBdp
''' '''
package_name = 'com.antutu.ABenchMark' package_name = 'com.antutu.ABenchMark'
test_dir = '/sdcard/Android/data/com.antutu/ABenchMark/files/.antutu/' activity = 'com.android.module.app.ui.start.ABenchMarkStart --ez isExternal true --es whereTo "test"'
result_file = '/sdcard/Documents/antutu/last_result.json'
def initialize(self, context): def initialize(self, context):
super(AntutuBDP, self).initialize(context) super(AntutuBDP, self).initialize(context)
@@ -210,24 +210,27 @@ class AntutuBDP(Workload):
self.target.execute('am force-stop {}'.format(self.package_name)) self.target.execute('am force-stop {}'.format(self.package_name))
#Copy the settings.xml to the test dir #Copy the settings.xml to the test dir
settings_xml = context.get_resource(File(self, 'settings.xml')) settings_xml = context.get_resource(File(self, 'settings.xml'))
self.target.push(settings_xml, self.test_dir) test_dir = os.path.join(self.target.external_storage_app_dir, 'com.antutu/ABenchMark/files/.antutu/')
self.target.push(settings_xml, test_dir)
#Ensure the orientation is set to portrait #Ensure the orientation is set to portrait
self.target.set_rotation(0) self.target.set_rotation(0)
#Remove any pre-existing test results #Remove any pre-existing test results
self.target.execute('rm {}'.format(self.result_file)) result_file = os.path.join(self.target.external_storage, 'Documents/antutu/last_result.json')
if self.target.file_exists(result_file):
self.target.execute('rm {}'.format(result_file))
def run(self, context): def run(self, context):
super(AntutuBDP, self).run(context) super(AntutuBDP, self).run(context)
#Launch the tests #Launch the tests
activity = 'com.android.module.app.ui.start.ABenchMarkStart --ez isExternal true --es whereTo "test"' self.target.execute('am start -n {}/{}'.format(self.package_name, self.activity))
self.target.execute('am start -n {}/{}'.format(self.package_name, activity)) #Wait 10 minutes, then begin polling every 30s for the test result to appear
#Wait 10 minutres, then begin polling every 30s for the test result to appear
self.logger.debug("Waiting 10 minutes before starting to poll for the results file.") self.logger.debug("Waiting 10 minutes before starting to poll for the results file.")
time.sleep(600) time.sleep(600)
#Poll for another 15 minutes, 20 minutes total before timing out #Poll for another 15 minutes, 20 minutes total before timing out
result_file = os.path.join(self.target.external_storage, 'Documents/antutu/last_result.json')
end_time = time.time() + 900 end_time = time.time() + 900
while time.time() < end_time: while time.time() < end_time:
if self.target.file_exists(self.result_file): if self.target.file_exists(result_file):
self.logger.debug("Result file found.") self.logger.debug("Result file found.")
return True return True
time.sleep(30) time.sleep(30)
@@ -238,5 +241,12 @@ class AntutuBDP(Workload):
def update_output(self, context): def update_output(self, context):
super(AntutuBDP, self).update_output(context) super(AntutuBDP, self).update_output(context)
output_file = os.path.join(context.output_directory, 'antutu_results.json') output_file = os.path.join(context.output_directory, 'antutu_results.json')
self.target.pull(self.result_file, output_file) result_file = os.path.join(self.target.external_storage, 'Documents/antutu/last_result.json')
self.target.pull(result_file, output_file)
context.add_artifact('antutu_result', output_file, kind='data', description='Antutu output from target') context.add_artifact('antutu_result', output_file, kind='data', description='Antutu output from target')
def teardown(self, context):
super(AntutuBDP, self).teardown(context)
#Remove the test results file
result_file = os.path.join(self.target.external_storage, 'Documents/antutu/last_result.json')
self.target.execute('rm {}'.format(result_file))