OSDN Git Service

android-x86/system-extras.git
4 years agoMerge "simpleperf: fix pmu event tests." am: 0b0c2c9862 am: f043c4b15e
Automerger Merge Worker [Fri, 20 Dec 2019 21:19:20 +0000 (21:19 +0000)]
Merge "simpleperf: fix pmu event tests." am: 0b0c2c9862 am: f043c4b15e

Change-Id: Ia8ce30bf1c4acee739eec58c952f507e8fd986c2

4 years agoMerge "simpleperf: fix pmu event tests."
Yabin Cui [Fri, 20 Dec 2019 21:01:21 +0000 (13:01 -0800)]
Merge "simpleperf: fix pmu event tests."
am: 0b0c2c9862

Change-Id: I5d1abc8f96ae7e822512b4741f5a1343264fa9d7

4 years agoMerge "simpleperf: fix pmu event tests."
Treehugger Robot [Fri, 20 Dec 2019 20:51:51 +0000 (20:51 +0000)]
Merge "simpleperf: fix pmu event tests."

4 years agosimpleperf: fix pmu event tests.
Yabin Cui [Fri, 20 Dec 2019 19:01:58 +0000 (11:01 -0800)]
simpleperf: fix pmu event tests.

Bug: none
Test: run simpleperf_unit_test in shell and root.
Change-Id: I9745b9cdaf4ad2c0c0d867442d53e94d68c33806

4 years agoMerge "simpleperf: Suport "pmu" type events in list command" am: f556af4808 am: 3df9b...
Automerger Merge Worker [Fri, 20 Dec 2019 18:20:17 +0000 (18:20 +0000)]
Merge "simpleperf: Suport "pmu" type events in list command" am: f556af4808 am: 3df9b303ed

Change-Id: I1f0741d1dfc23d4584584069122d6b555744cbf2

4 years agoMerge "simpleperf: Use PMU's cpumask if available" am: 30c9870e95 am: c4aa110fa2
Automerger Merge Worker [Fri, 20 Dec 2019 18:20:08 +0000 (18:20 +0000)]
Merge "simpleperf: Use PMU's cpumask if available" am: 30c9870e95 am: c4aa110fa2

Change-Id: Ib0928d52f1a2d4e83c0f0867437ba3102f55ecaf

4 years agoMerge changes I626b8146,Ibdf1180e am: 7e9bdd2a75 am: 4caac7405b
Automerger Merge Worker [Fri, 20 Dec 2019 18:19:01 +0000 (18:19 +0000)]
Merge changes I626b8146,Ibdf1180e am: 7e9bdd2a75 am: 4caac7405b

Change-Id: Iea8289fc14a0080d0f88596d4d5dfed042b927f6

4 years agoMerge "simpleperf: Suport "pmu" type events in list command"
Namhyung Kim [Fri, 20 Dec 2019 18:03:49 +0000 (10:03 -0800)]
Merge "simpleperf: Suport "pmu" type events in list command"
am: f556af4808

Change-Id: If2e406931e3f32756f76451c445a3a5e8f2862ab

4 years agoMerge "simpleperf: Use PMU's cpumask if available"
Namhyung Kim [Fri, 20 Dec 2019 18:03:30 +0000 (10:03 -0800)]
Merge "simpleperf: Use PMU's cpumask if available"
am: 30c9870e95

Change-Id: I5de955705001ba7a48edf46cbf24255e7aaf4153

4 years agoMerge changes I626b8146,Ibdf1180e
Namhyung Kim [Fri, 20 Dec 2019 18:03:02 +0000 (10:03 -0800)]
Merge changes I626b8146,Ibdf1180e
am: 7e9bdd2a75

Change-Id: I698086434bda8c22369065149437a148b1dd9471

4 years agoMerge "simpleperf: Suport "pmu" type events in list command"
Treehugger Robot [Fri, 20 Dec 2019 17:57:49 +0000 (17:57 +0000)]
Merge "simpleperf: Suport "pmu" type events in list command"

4 years agoMerge "simpleperf: Use PMU's cpumask if available"
Treehugger Robot [Fri, 20 Dec 2019 17:57:36 +0000 (17:57 +0000)]
Merge "simpleperf: Use PMU's cpumask if available"

4 years agoMerge changes I626b8146,Ibdf1180e
Treehugger Robot [Fri, 20 Dec 2019 17:57:27 +0000 (17:57 +0000)]
Merge changes I626b8146,Ibdf1180e

* changes:
  simpleperf: move GetCpusFromString() to utils.cpp
  simpleperf: Support event_source bus event types

4 years agosimpleperf: Suport "pmu" type events in list command
Namhyung Kim [Tue, 17 Dec 2019 14:26:34 +0000 (23:26 +0900)]
simpleperf: Suport "pmu" type events in list command

Support low-level PMU counters to be listed using "pmu" argument.

Test: run simpleperf_unit_test
Change-Id: I7bc8251a4fa12bae82142b71afa70c359ad24d40
Signed-off-by: Namhyung Kim <namhyung@google.com>
4 years agosimpleperf: Use PMU's cpumask if available
Namhyung Kim [Tue, 3 Dec 2019 02:57:18 +0000 (11:57 +0900)]
simpleperf: Use PMU's cpumask if available

Some PMU events only support profiling from dedicated cpus.  For those
events there are cpumask files in the /sys/bus/event_source/devices/<PMU>
directory.  So override the cpu setting for them.

Test: manually tested with a PMU has the cpumask file
Change-Id: I5e50a7d6f88cb0bc80b45e774cf048116698b3de
Signed-off-by: Namhyung Kim <namhyung@google.com>
4 years agosimpleperf: move GetCpusFromString() to utils.cpp
Namhyung Kim [Tue, 17 Dec 2019 08:15:02 +0000 (17:15 +0900)]
simpleperf: move GetCpusFromString() to utils.cpp

Move the GetCpusFromString() to utils.cpp so that it can be used by
event parsing code in event_type.cpp.

No functional change intended.

Test: build test only
Change-Id: I626b8146f90bf8bb161ce8574bcf70f6600c8ad3

4 years agosimpleperf: Support event_source bus event types
Namhyung Kim [Wed, 23 Oct 2019 03:37:34 +0000 (12:37 +0900)]
simpleperf: Support event_source bus event types

The perf_event subsystem exports available PMUs and their events under
/sys/bus/event_source/devices directory.  This patch supports those
events using 'pmu/event/' format like in the mainline perf tool.

The "event" part above might have multiple terms if supported by PMU.
In that case PMU would have "format" directory for available terms.
They would be seperated by comma, so the enclosing "/"s are needed to
group those terms for an event.

But currently all PMUs seem to support a single term only so I left
the parser to split events by comma and match the whole string
(including "/"s).

For example you can use cpu-cycles events like below:

  # simpleperf stat -a -e armv8_pmuv3/cpu_cycles/ sleep 1
  Performance counter statistics:

    986,481,766  armv8_pmuv3/cpu_cycles/   #   (100%)

  Total test time: 1.007272 seconds.

Test: build and run simpleperf_unit_test
Change-Id: Ibdf1180e58d190f8108cdc8d8a096e6323b2a6f3

4 years agoMerge "simpleperf: move to llvm binutils." am: 72f8dd3e98 am: e4bb8737e6
Automerger Merge Worker [Thu, 19 Dec 2019 22:55:27 +0000 (22:55 +0000)]
Merge "simpleperf: move to llvm binutils." am: 72f8dd3e98 am: e4bb8737e6

Change-Id: I093867b252fe0692a68f48a0fc56f2dc09760f79

4 years agoMerge "simpleperf: move to llvm binutils."
Yabin Cui [Thu, 19 Dec 2019 22:39:25 +0000 (14:39 -0800)]
Merge "simpleperf: move to llvm binutils."
am: 72f8dd3e98

Change-Id: I202016056b6a28f2436506807b657e605ce0222a

4 years agoMerge "simpleperf: move to llvm binutils."
Yabin Cui [Thu, 19 Dec 2019 22:34:40 +0000 (22:34 +0000)]
Merge "simpleperf: move to llvm binutils."

4 years agosimpleperf: move to llvm binutils.
Yabin Cui [Thu, 19 Dec 2019 22:22:28 +0000 (14:22 -0800)]
simpleperf: move to llvm binutils.

Bug: none
Test: run test.py TestTools*.
Change-Id: I9fcbb559ea4cb52e1ac79f3a7aa801a1d7e94dce

4 years agoMerge changes Ie4aef1bd,I1bfc9323 am: 4516ec3d4f am: 3b4df486d3
Automerger Merge Worker [Thu, 19 Dec 2019 21:18:50 +0000 (21:18 +0000)]
Merge changes Ie4aef1bd,I1bfc9323 am: 4516ec3d4f am: 3b4df486d3

Change-Id: I4e0da174e59e0426867c8130db76fe091828a4ba

4 years agoMerge changes Ie4aef1bd,I1bfc9323
Tianjie Xu [Thu, 19 Dec 2019 21:05:48 +0000 (13:05 -0800)]
Merge changes Ie4aef1bd,I1bfc9323
am: 4516ec3d4f

Change-Id: I0c16075f308cb4d960f9a23bdad70263687e9ee2

4 years agoMerge changes Ie4aef1bd,I1bfc9323
Tianjie Xu [Thu, 19 Dec 2019 20:42:03 +0000 (20:42 +0000)]
Merge changes Ie4aef1bd,I1bfc9323

* changes:
  Add sha1 support for hashtree
  Add test to parse verity data

4 years agoAdd sha1 support for hashtree
Tianjie Xu [Mon, 2 Dec 2019 20:55:33 +0000 (12:55 -0800)]
Add sha1 support for hashtree

AVB format uses sha1 as the hash algorithm when computing the hash of
each block. This cl adds the support to use either sha1 or sha256 in
the hashtree_info struct. It also moves some helper functions as the member
function of the struct.

Bug: 144388532
Test: unit tests pass
Change-Id: Ie4aef1bdd8fa89240f7c6f83fcb2e33f47a468cb

4 years agoAdd test to parse verity data
Tianjie Xu [Thu, 21 Nov 2019 18:25:17 +0000 (10:25 -0800)]
Add test to parse verity data

Add a unittest to load and verify a VB1.0 image.

Bug: 144388532
Test: unittest pass
Change-Id: I1bfc93239a6696c58e9220864009759a2468e136

4 years agoMerge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag." am: ca98e449a9...
Automerger Merge Worker [Wed, 18 Dec 2019 16:14:12 +0000 (16:14 +0000)]
Merge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag." am: ca98e449a9 am: 834d80cf52

Change-Id: I6cd41e4998636868c0245f5d76871908af412508

4 years agoMerge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."
David Anderson [Wed, 18 Dec 2019 16:03:03 +0000 (08:03 -0800)]
Merge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."
am: ca98e449a9

Change-Id: Id822e04a596ef5f84c954e2315aa82fbf193eec9

4 years agoMerge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."
David Anderson [Wed, 18 Dec 2019 15:42:44 +0000 (15:42 +0000)]
Merge "partition_tools: Add support for the VIRTUAL_AB_DEVICE flag."

4 years agoMerge "libfscrypt: Use <linux/fscrypt.h> from Bionic" am: b577ab32de am: 7f9fd3a254
Automerger Merge Worker [Tue, 17 Dec 2019 17:56:24 +0000 (17:56 +0000)]
Merge "libfscrypt: Use <linux/fscrypt.h> from Bionic" am: b577ab32de am: 7f9fd3a254

Change-Id: I458adf2fc70d873ca209591619bfa7c8deaedbf6

4 years agoMerge "lpdump: Use unsigned value for shift" am: 2fbd5d87b2 am: 788487dc95
Automerger Merge Worker [Tue, 17 Dec 2019 17:56:12 +0000 (17:56 +0000)]
Merge "lpdump: Use unsigned value for shift" am: 2fbd5d87b2 am: 788487dc95

Change-Id: I75dd029328c4c97431a84ffade7afd96e61ec850

4 years agoMerge "libfscrypt: Use <linux/fscrypt.h> from Bionic"
Eric Biggers [Tue, 17 Dec 2019 17:41:44 +0000 (09:41 -0800)]
Merge "libfscrypt: Use <linux/fscrypt.h> from Bionic"
am: b577ab32de

Change-Id: Ib47499363e48552148c8038a09f2d232506a2cf1

4 years agoMerge "lpdump: Use unsigned value for shift"
Greg Kaiser [Tue, 17 Dec 2019 17:41:18 +0000 (09:41 -0800)]
Merge "lpdump: Use unsigned value for shift"
am: 2fbd5d87b2

Change-Id: I911e9b35b991216c9aacf93901bf49a518ef0a1e

4 years agoMerge "libfscrypt: Use <linux/fscrypt.h> from Bionic"
Eric Biggers [Tue, 17 Dec 2019 17:35:39 +0000 (17:35 +0000)]
Merge "libfscrypt: Use <linux/fscrypt.h> from Bionic"

4 years agoMerge "lpdump: Use unsigned value for shift"
Treehugger Robot [Tue, 17 Dec 2019 17:34:27 +0000 (17:34 +0000)]
Merge "lpdump: Use unsigned value for shift"

4 years agolpdump: Use unsigned value for shift
Greg Kaiser [Tue, 17 Dec 2019 13:43:47 +0000 (05:43 -0800)]
lpdump: Use unsigned value for shift

Shifting a signed 32-bit value by 31 bits is implementation-defined
behavior.  While our toolchains are most probably doing the
expected thing, we make this an unsigned value out of paranoia.

Test: TreeHugger
Change-Id: I551fcf1ac7a27ebd7c1365cd6a9df7267f569c44

4 years agolibfscrypt: Use <linux/fscrypt.h> from Bionic
Eric Biggers [Tue, 17 Dec 2019 00:02:23 +0000 (16:02 -0800)]
libfscrypt: Use <linux/fscrypt.h> from Bionic

aosp/1184798 has updated the kernel headers to android-mainline, so we
no longer need to manually declare the declarations for v2 policies, nor
do we need to manually declare FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64.

Also replace the FS_* constants with their new FSCRYPT_* names.  This
doesn't change the numerical values; it just changes the names.

Test: build and 'atest libfscrypt_unit_test'
Bug: None
Change-Id: I03ce177923bfa9e0fecbbdbf1718fbf1c17176d9

4 years agoMerge "lpmake: Use an enum class for option codes." am: 35692b0400 am: c6302fd6f3
Automerger Merge Worker [Mon, 16 Dec 2019 20:55:24 +0000 (20:55 +0000)]
Merge "lpmake: Use an enum class for option codes." am: 35692b0400 am: c6302fd6f3

Change-Id: Ibc29022413e1cdb4da7c110767fbef523ab7d2be

4 years agoMerge "lpmake: Use an enum class for option codes."
David Anderson [Mon, 16 Dec 2019 20:39:00 +0000 (12:39 -0800)]
Merge "lpmake: Use an enum class for option codes."
am: 35692b0400

Change-Id: I23a6b3243808ac6cae79b4b6af068bf0a4ce7799

4 years agoMerge "lpmake: Use an enum class for option codes."
David Anderson [Mon, 16 Dec 2019 20:31:06 +0000 (20:31 +0000)]
Merge "lpmake: Use an enum class for option codes."

4 years agoMerge "lpdump: Add support for the metadata flags field." am: d2290d8d36 am: 506941e086
Automerger Merge Worker [Mon, 16 Dec 2019 17:53:34 +0000 (17:53 +0000)]
Merge "lpdump: Add support for the metadata flags field." am: d2290d8d36 am: 506941e086

Change-Id: Iff6b68028397d5b9898de3e76c8f90e81972e024

4 years agoMerge "lpdump: Add support for the metadata flags field."
David Anderson [Mon, 16 Dec 2019 17:42:07 +0000 (09:42 -0800)]
Merge "lpdump: Add support for the metadata flags field."
am: d2290d8d36

Change-Id: Ibf87f5727adb95f01a0b7370316758c1d43826a8

4 years agoMerge "lpdump: Add support for the metadata flags field."
David Anderson [Mon, 16 Dec 2019 17:31:57 +0000 (17:31 +0000)]
Merge "lpdump: Add support for the metadata flags field."

4 years agopartition_tools: Add support for the VIRTUAL_AB_DEVICE flag.
David Anderson [Fri, 13 Dec 2019 23:34:54 +0000 (15:34 -0800)]
partition_tools: Add support for the VIRTUAL_AB_DEVICE flag.

Bug: 134949511
Test: manual test
Change-Id: If31234d9da0b15a3dbde7dcc835b2161c5dbba61

4 years agolpmake: Use an enum class for option codes.
David Anderson [Fri, 13 Dec 2019 23:31:10 +0000 (15:31 -0800)]
lpmake: Use an enum class for option codes.

There's no reason to have short-form option codes for everything, this
will make that more clear.

Bug: 134949511
Test: super.img builds
Change-Id: If60f6648ac311b77d68768bb39825d01c663c500

4 years agolpdump: Add support for the metadata flags field.
David Anderson [Fri, 13 Dec 2019 01:12:27 +0000 (17:12 -0800)]
lpdump: Add support for the metadata flags field.

Bug: 134949511
Test: manual test
Change-Id: Iafc5193c71315b14f192fcc0ae42188a51b0d2cb

4 years agoMerge "simpleperf: fix reading jit debug descriptors." am: 018adfb818 am: 5881fe12ba
Automerger Merge Worker [Thu, 12 Dec 2019 06:24:13 +0000 (06:24 +0000)]
Merge "simpleperf: fix reading jit debug descriptors." am: 018adfb818 am: 5881fe12ba

Change-Id: If829c7cd8b513acdc641300fb0c3b61acf2775e2

4 years agoMerge "simpleperf: fix reading jit debug descriptors."
Yabin Cui [Thu, 12 Dec 2019 06:02:43 +0000 (22:02 -0800)]
Merge "simpleperf: fix reading jit debug descriptors."
am: 018adfb818

Change-Id: I22b3ed631d4d89ae10844751a89f2a9f63193a4a

4 years agoMerge "simpleperf: fix reading jit debug descriptors."
Yabin Cui [Thu, 12 Dec 2019 05:25:14 +0000 (05:25 +0000)]
Merge "simpleperf: fix reading jit debug descriptors."

4 years agosimpleperf: fix reading jit debug descriptors.
Yabin Cui [Thu, 12 Dec 2019 00:50:24 +0000 (16:50 -0800)]
simpleperf: fix reading jit debug descriptors.

Clang may generate elf files with segments not starting from
page-aligned addresses. For these segments, dynamic linker
creates maps mapping to (segment.p_offset & PAGE_MASK). So
map.start is mapped to file vaddr (segment.p_vaddr & PAGE_MASK)
instead of segment.p_vaddr.

So add PAGE_MASK when calculating memory address of descriptors,
using below formula:
descriptor.vaddr_in_file - (segment.p_vaddr & PAGE_MASK) + map.start.

Bug: 145920143
Bug: 145930241
Test: run simpleperf_unit_test.

Change-Id: Id185a6d6b766ecaa30b5067664687e556f92ef27

4 years agoMerge "Add no decay variants of benchmarks." am: d2e2e2d875 am: a9e438d29f
Automerger Merge Worker [Tue, 10 Dec 2019 23:23:37 +0000 (23:23 +0000)]
Merge "Add no decay variants of benchmarks." am: d2e2e2d875 am: a9e438d29f

Change-Id: Ia72525f8a1f35cbe181680b421ca88cfd2f2203c

4 years agoMerge "Add no decay variants of benchmarks."
Christopher Ferris [Tue, 10 Dec 2019 23:03:40 +0000 (15:03 -0800)]
Merge "Add no decay variants of benchmarks."
am: d2e2e2d875

Change-Id: I05a5bce97fc7af65f0a6b5a674d33cd3462507e2

4 years agoMerge "Add no decay variants of benchmarks."
Christopher Ferris [Tue, 10 Dec 2019 22:50:18 +0000 (22:50 +0000)]
Merge "Add no decay variants of benchmarks."

4 years agoAdd no decay variants of benchmarks.
Christopher Ferris [Tue, 10 Dec 2019 21:19:43 +0000 (13:19 -0800)]
Add no decay variants of benchmarks.

This will help to tell what the performance impact is of turning
off the decay timer.

Test: Ran benchmarks and verified that times are slower for no decay.
Change-Id: Ia0d5aa879e92fb0790194c2efada6c2e407427a9

4 years agoMerge "Factor out the hashtree info from the verity_info" am: d4c448cb15
Tianjie Xu [Wed, 4 Dec 2019 23:13:27 +0000 (15:13 -0800)]
Merge "Factor out the hashtree info from the verity_info" am: d4c448cb15
am: 60226f5882

Change-Id: Ieeb72599b8950a4b3acca2aac5a84e1dde0bbcb9

4 years agoMerge "Factor out the hashtree info from the verity_info"
Tianjie Xu [Wed, 4 Dec 2019 23:11:27 +0000 (15:11 -0800)]
Merge "Factor out the hashtree info from the verity_info"
am: d4c448cb15

Change-Id: Icd9aade468c32d64a0482f2e050bd95f9e3ea25a

4 years agoMerge "Factor out the hashtree info from the verity_info"
Tianjie Xu [Wed, 4 Dec 2019 23:07:23 +0000 (23:07 +0000)]
Merge "Factor out the hashtree info from the verity_info"

4 years agoMerge "mkf2fsuserimg.sh: Make sparse mode optional" am: 8b724d9075
Alistair Delva [Mon, 2 Dec 2019 22:12:48 +0000 (14:12 -0800)]
Merge "mkf2fsuserimg.sh: Make sparse mode optional" am: 8b724d9075
am: 3e9732f91c

Change-Id: Ia807cc1bcb11272628339760c922937834559f38

4 years agoMerge "mkf2fsuserimg.sh: Make sparse mode optional"
Alistair Delva [Mon, 2 Dec 2019 22:06:45 +0000 (14:06 -0800)]
Merge "mkf2fsuserimg.sh: Make sparse mode optional"
am: 8b724d9075

Change-Id: Ic040444e05471954247abd688054c79544ac427c

4 years agoMerge "mkf2fsuserimg.sh: Make sparse mode optional"
Alistair Delva [Mon, 2 Dec 2019 21:54:20 +0000 (21:54 +0000)]
Merge "mkf2fsuserimg.sh: Make sparse mode optional"

4 years agoFactor out the hashtree info from the verity_info
Tianjie Xu [Wed, 20 Nov 2019 20:18:40 +0000 (12:18 -0800)]
Factor out the hashtree info from the verity_info

Even though the format for the VB2.0(AVB) image is different from the VB1.0
image, the majority of the content is the same. In specific, they both
have a hashtree and ecc data. By factoring the hashtree info, fec_read
can later use only the hashtree for error correction and doesn't need to
have the knowledge of verity format.

VB 1.0:
Filesystem
hash_tree
metadata    <- assume 8 blocks
ecc_data

VB 2.0:
Filesystem
hash_tree
ecc_data
vbmeta
avb footer

Also switch the internal struct to use std containers so that we don't
need to worry about the memory management.

Bug: 144388532
Test: load a verity image, unit tests pass
Change-Id: I83c55464c3ac75ac41be9f507b674886ad298350

4 years agoMerge "partition_tools: Add an "lpadd" tool for appending images to super.img." am...
David Anderson [Mon, 25 Nov 2019 20:27:09 +0000 (12:27 -0800)]
Merge "partition_tools: Add an "lpadd" tool for appending images to super.img." am: cf9b34eccd
am: e4d807d6ec

Change-Id: Id17cf821fd2dabd4213a1115e69747c8253bbfb7

4 years agoMerge "partition_tools: Add an "lpadd" tool for appending images to super.img."
David Anderson [Mon, 25 Nov 2019 20:24:12 +0000 (12:24 -0800)]
Merge "partition_tools: Add an "lpadd" tool for appending images to super.img."
am: cf9b34eccd

Change-Id: I4fc759fba2d489aee3bdf2870434d904f614e1e8

4 years agoMerge "partition_tools: Add an "lpadd" tool for appending images to super.img."
David Anderson [Mon, 25 Nov 2019 20:17:19 +0000 (20:17 +0000)]
Merge "partition_tools: Add an "lpadd" tool for appending images to super.img."

4 years agoMerge "simpleperf: fix flaky test TestApiProfiler." am: 184821b4f0
Yabin Cui [Fri, 22 Nov 2019 20:28:35 +0000 (12:28 -0800)]
Merge "simpleperf: fix flaky test TestApiProfiler." am: 184821b4f0
am: 2b10ffc628

Change-Id: I8af76455723128e4602e534a4b420af35fcccf04

4 years agoMerge "simpleperf: update simpleperf prebuilts to build 6021660." am: b17755fb7d
Yabin Cui [Fri, 22 Nov 2019 20:28:16 +0000 (12:28 -0800)]
Merge "simpleperf: update simpleperf prebuilts to build 6021660." am: b17755fb7d
am: f49a796319

Change-Id: I10f16d3f16d0e80825644682df7d99cd18a99037

4 years agoMerge "simpleperf: fix flaky test TestApiProfiler."
Yabin Cui [Fri, 22 Nov 2019 20:23:41 +0000 (12:23 -0800)]
Merge "simpleperf: fix flaky test TestApiProfiler."
am: 184821b4f0

Change-Id: Id953ebb3cfbebeaff09e837c1c084565820ad0fb

4 years agoMerge "simpleperf: update simpleperf prebuilts to build 6021660."
Yabin Cui [Fri, 22 Nov 2019 20:23:12 +0000 (12:23 -0800)]
Merge "simpleperf: update simpleperf prebuilts to build 6021660."
am: b17755fb7d

Change-Id: Ib5f29fe15f21a8dadde3da69d2e6a2c680e6f151

4 years agoMerge "simpleperf: fix flaky test TestApiProfiler."
Yabin Cui [Fri, 22 Nov 2019 20:14:19 +0000 (20:14 +0000)]
Merge "simpleperf: fix flaky test TestApiProfiler."

4 years agoMerge "simpleperf: update simpleperf prebuilts to build 6021660."
Yabin Cui [Fri, 22 Nov 2019 20:13:41 +0000 (20:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 6021660."

4 years agosimpleperf: fix flaky test TestApiProfiler.
Yabin Cui [Fri, 22 Nov 2019 00:06:24 +0000 (16:06 -0800)]
simpleperf: fix flaky test TestApiProfiler.

Bug: none
Test: run test.py TestApiProfiler* --repeat 10.
Change-Id: I5829aa9b2be8057b64130a6fb4b076958456c7ca

4 years agosimpleperf: update simpleperf prebuilts to build 6021660.
Yabin Cui [Wed, 20 Nov 2019 23:26:06 +0000 (15:26 -0800)]
simpleperf: update simpleperf prebuilts to build 6021660.

Taken from branch aosp-simpleperf-release.

Bug: none
Test: run test.py on devices with different android versions.

Change-Id: I39c33e6f7c1d3776288db78554feafea0bff959f

4 years agoMerge "lpdumpd: Do not use stack to store arguments." am: 46038c2002
David Anderson [Thu, 21 Nov 2019 21:52:56 +0000 (13:52 -0800)]
Merge "lpdumpd: Do not use stack to store arguments." am: 46038c2002
am: c48ac85483

Change-Id: If15065039b2fe0bd835e8a0580faadd7343dcfe0

4 years agoMerge "lpdumpd: Do not use stack to store arguments."
David Anderson [Thu, 21 Nov 2019 21:48:53 +0000 (13:48 -0800)]
Merge "lpdumpd: Do not use stack to store arguments."
am: 46038c2002

Change-Id: If7616927d6c970851458139906e0cbe9f9784dbd

4 years agoMerge "lpdumpd: Do not use stack to store arguments."
David Anderson [Thu, 21 Nov 2019 21:39:28 +0000 (21:39 +0000)]
Merge "lpdumpd: Do not use stack to store arguments."

4 years agoMerge "lpdump: When using -h, print usage to stdout so lpdumpd prints it." am: 2e61a7758c
David Anderson [Thu, 21 Nov 2019 20:36:25 +0000 (12:36 -0800)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it." am: 2e61a7758c
am: b471ced6ba

Change-Id: Ib13a27b43fe92c7858ad624affe328ada4039c6a

4 years agoMerge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
David Anderson [Thu, 21 Nov 2019 20:32:23 +0000 (12:32 -0800)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
am: 2e61a7758c

Change-Id: I9698754f5f0379db8310fb7d2ad2fca6d07e83b7

4 years agoMerge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
David Anderson [Thu, 21 Nov 2019 20:18:05 +0000 (20:18 +0000)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."

4 years agoMerge "Revert "lpmake: Don't assume a device is retrofit if it has one block device...
Cody Caldwell [Wed, 20 Nov 2019 20:59:47 +0000 (12:59 -0800)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super."" am: cafb6e9140
am: 712fdc3147

Change-Id: Ic6f552fddda0a33366b75d59a0adcd7681b49eae

4 years agoMerge "Revert "lpmake: Don't assume a device is retrofit if it has one block device...
Cody Caldwell [Wed, 20 Nov 2019 20:56:16 +0000 (12:56 -0800)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super.""
am: cafb6e9140

Change-Id: Iae536a2eaef715a899bd97ccf1645541a520376f

4 years agoMerge "Revert "lpmake: Don't assume a device is retrofit if it has one block device...
Cody Caldwell [Wed, 20 Nov 2019 20:40:30 +0000 (20:40 +0000)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super.""

4 years agoRevert "lpmake: Don't assume a device is retrofit if it has one block device for...
Cody Caldwell [Wed, 20 Nov 2019 20:36:12 +0000 (20:36 +0000)]
Revert "lpmake: Don't assume a device is retrofit if it has one block device for super."

This reverts commit 13945230d36282a0dd2ad7c240f2b88ffc506205.

Reason for revert: Potential culprit for Bug b/144809373 - verifying through Forrest before revert submission

Change-Id: Ic4ed750a5386f6f45a871ac7112142a6991dfd2c

4 years agolpdumpd: Do not use stack to store arguments.
David Anderson [Wed, 20 Nov 2019 01:04:39 +0000 (17:04 -0800)]
lpdumpd: Do not use stack to store arguments.

Bug: 144052321
Test: manual test
Change-Id: I700e22ef5c6c0a0c6a5f05c5bb4ea29b0077b34e

4 years agopartition_tools: Add an "lpadd" tool for appending images to super.img.
David Anderson [Mon, 18 Nov 2019 23:07:45 +0000 (15:07 -0800)]
partition_tools: Add an "lpadd" tool for appending images to super.img.

Syntax: lpadd [--readonly] SUPER_FILE PART_NAME GROUP_NAME [IMAGE_FILE]

The super file can be sparsed, unsparsed, or a "super_empty" image. The
source image can either be sparsed or unsparsed as well. The named
partition cannot already exist.

Usage is further described in README.md.

Bug: 144468779
Test: lpadd unsparsed super.img w/ sparsed partition
      lpadd unsparsed super.img w/ unsparsed partition
      lpadd sparsed super.img w/ sparsed partition
      lpadd sparsed super.img w/ unsparsed partition
      lpadd super_empty.img

Change-Id: I0cb5d4432c86689567f2a58a379be0f96b64a88d

4 years agolpdump: When using -h, print usage to stdout so lpdumpd prints it.
David Anderson [Wed, 20 Nov 2019 01:07:14 +0000 (17:07 -0800)]
lpdump: When using -h, print usage to stdout so lpdumpd prints it.

Bug: N/A
Test: lpdump -h
Change-Id: I7bad9f8b5d5c14b831e42d1f21fe8bfeccba3fb0

4 years agoMerge "lpmake: Don't assume a device is retrofit if it has one block device for super...
David Anderson [Wed, 20 Nov 2019 00:28:23 +0000 (16:28 -0800)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super." am: c42dc84680
am: 87d0cc0e6f

Change-Id: I54d5043ede937e35681c20e33ff15493dfae54c5

4 years agoMerge "lpmake: Don't assume a device is retrofit if it has one block device for super."
David Anderson [Wed, 20 Nov 2019 00:20:12 +0000 (16:20 -0800)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."
am: c42dc84680

Change-Id: I405f154ba371488182a2dd5ca16923a694263e4a

4 years agoMerge "lpmake: Don't assume a device is retrofit if it has one block device for super."
David Anderson [Wed, 20 Nov 2019 00:10:37 +0000 (00:10 +0000)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."

4 years agoMerge "simpleperf: support libraries without build ids when recording." am: 75381635bc
Yabin Cui [Tue, 19 Nov 2019 19:34:24 +0000 (11:34 -0800)]
Merge "simpleperf: support libraries without build ids when recording." am: 75381635bc
am: 3b90ee7c79

Change-Id: I08acecb1655922d2db3f13e99a9fee6faf2a80b5

4 years agoMerge "simpleperf: support libraries without build ids when recording."
Yabin Cui [Tue, 19 Nov 2019 19:31:12 +0000 (11:31 -0800)]
Merge "simpleperf: support libraries without build ids when recording."
am: 75381635bc

Change-Id: Ibbd16734fae30741a632780b0879b40e38c8e75c

4 years agoMerge "simpleperf: support libraries without build ids when recording."
Yabin Cui [Tue, 19 Nov 2019 19:21:07 +0000 (19:21 +0000)]
Merge "simpleperf: support libraries without build ids when recording."

4 years agoMerge "simpleperf: exclude undefined symbols." am: fcdb95370b
Yabin Cui [Tue, 19 Nov 2019 18:42:23 +0000 (10:42 -0800)]
Merge "simpleperf: exclude undefined symbols." am: fcdb95370b
am: 290d7e7997

Change-Id: I6d028f228bb0f3faa81773c75c64ee0446f7c9c4

4 years agoMerge "simpleperf: exclude undefined symbols."
Yabin Cui [Tue, 19 Nov 2019 18:39:31 +0000 (10:39 -0800)]
Merge "simpleperf: exclude undefined symbols."
am: fcdb95370b

Change-Id: If20762d78df6be06f2c5dee7ecd5e526da6c49c1

4 years agosimpleperf: support libraries without build ids when recording.
Yabin Cui [Tue, 19 Nov 2019 00:40:28 +0000 (16:40 -0800)]
simpleperf: support libraries without build ids when recording.

Simpleperf can download unstripped libraries on device and use them
for unwinding during recording, through `app_profiler.py -lib` and
`simpleperf record --symfs` options. But it doesn't support libraries
without build ids.

To support them:
1. In app_profiler.py, download libraries without build ids in native
   lib dir.
2. In DebugElfFileFinder in dso.cpp, check path with the same basename
   in symfs_dir.

Also add document for downloading unstripped libraries on device.

Bug: none
Test: run simpleperf_unit_test.
Test: run test.py.
Change-Id: I5d9015e683f2ecb992d425a42f1f7303307b2cea

4 years agoMerge "simpleperf: exclude undefined symbols."
Yabin Cui [Tue, 19 Nov 2019 18:25:36 +0000 (18:25 +0000)]
Merge "simpleperf: exclude undefined symbols."

4 years agosimpleperf: exclude undefined symbols.
Yabin Cui [Tue, 19 Nov 2019 01:23:27 +0000 (17:23 -0800)]
simpleperf: exclude undefined symbols.

Bug: none
Test: run simpleperf_unit_test.
Change-Id: I13c1e926d21897090103741744a7613b3f844c6a

4 years agoMerge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters....
Yabin Cui [Fri, 15 Nov 2019 23:17:24 +0000 (15:17 -0800)]
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." am: 3897583b73
am: cef49af7c9

Change-Id: I19280fee72035065dc5b3b35a40cfb5b533e0f51

4 years agoMerge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters."
Yabin Cui [Fri, 15 Nov 2019 23:13:38 +0000 (15:13 -0800)]
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters."
am: 3897583b73

Change-Id: I6d0ea969fd9892e5d0dc20da0385e62070d92b88

4 years agoMerge "simpleperf: fix build_id checking." am: 9fe57a62ae
Yabin Cui [Fri, 15 Nov 2019 23:13:17 +0000 (15:13 -0800)]
Merge "simpleperf: fix build_id checking." am: 9fe57a62ae
am: 4ea82ff628

Change-Id: Ib3defe4ce0d062dbb6557c54fbf8fd0460fd9da2

4 years agoMerge "simpleperf: fix build_id checking."
Yabin Cui [Fri, 15 Nov 2019 22:56:08 +0000 (14:56 -0800)]
Merge "simpleperf: fix build_id checking."
am: 9fe57a62ae

Change-Id: I029e3ff597fcc29a337501a4aa342651b228e527