Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe0fa7fd authored by Phil Burk's avatar Phil Burk Committed by Presubmit Automerger Backend
Browse files

[automerge] aaudio: Fix parsing of power commands 2p: 257cbe7d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17156900

Change-Id: I1133d8d4c2f8203a651ca7f223e62a26e94bf11b
parents 73d4c0de 257cbe7d

media/libaaudio/scripts/measure_device_power.py

+5 −5
Original line number Original line Diff line number Diff line
@@ -225,13 +225,13 @@ def measureEnergyForCommands(fileName): 
        line = fp.readline()

        line = fp.readline()

        while line:

        while line:

            command = line.strip()

            command = line.strip()

            if command.endswith('\\'):

            if command.startswith("#"):

                command = command[:-1].strip() # remove \\:

                runCommand(command)

            elif command.startswith("#"):

                # ignore comment

                # ignore comment

                print((command + "\n"))

                print((command + "\n"))

                comment = command

                comment = command[1:].strip() # remove leading '#'

            elif command.endswith('\\'):

                command = command[:-1].strip() # remove \\

                runCommand(command)

            elif command:

            elif command:

                report = averageEnergyForCommand(command, DEFAULT_NUM_ITERATIONS)

                report = averageEnergyForCommand(command, DEFAULT_NUM_ITERATIONS)

                finalReport += comment + ", " + command + ", " + formatEnergyData(report) + "\n"

                finalReport += comment + ", " + command + ", " + formatEnergyData(report) + "\n"

media/libaaudio/scripts/synthmark_tests.txt

0 → 100644
+45 −0
Original line number Original line Diff line number Diff line 
# Measure energy consumption with synthmark.



# ADPF <400 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 400 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# ADPF <500 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 500 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# ADPF <600 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 600 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# None

adb shell synthmark -tj -n1 -N50 -B2 -z0

adb shell synthmark -tj -n1 -N75 -B2 -z0

adb shell synthmark -tj -n1 -N100 -B2 -z0



# uclamp

# adb root \

# adb shell synthmark -tj -n1 -N75 -B2 -u1



# steady

# adb shell synthmark -tj -n75 -B2 -u0



# CPU affinity

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c1

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c4

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c6



# steady + affinity

# adb shell synthmark -tj -n75 -B2 -u0 -c1

# adb shell synthmark -tj -n75 -B2 -u0 -c4

# adb shell synthmark -tj -n75 -B2 -u0 -c6