summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-01Snap for 9550112 from bfe2d06be19a7f1e80b9487549348f950fee6903 to ↵aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010android13-mainline-permission-releaseAndroid Build Coastguard Worker
mainline-permission-release Change-Id: I88d90b9042956678623273e3fa9fbc27e8ca9b89
2023-01-25Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0 am: d766f83731 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Idf0f946c4ec12f446398c803cc267316533019be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours am: e371085cdc -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Ic8f248096fcc725d9eb6f8199cc5017451851591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I8f7f4ca62445c222e25333e566949060db08cb67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I6b2bf53a1da0e672446e75101d0681670e18585c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Snap tm-dev to android13-tests-dev am: e65f708054Samip Garg
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/20514526 Merged-In: Ib4c566b0bd0e5c761d9c78620caa13703c10589c Change-Id: I1f95ab13b613eb7c56163fe7f0dc2bf19ea9e4aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Snap tm-dev to android13-tests-devSamip Garg
Bug:259849956 Merge ab/9299233 Merged-In: Ib4c566b0bd0e5c761d9c78620caa13703c10589c Change-Id: If320111be77cb6d02307b8442148140a0c494169
2022-12-01Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev
2022-12-01[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Ia5c9bd2a9a39fc074911473337953de650cdce24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." ↵Automerger Merge Worker
into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev
2022-12-01Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into ↵Treehugger Robot
android12-tests-dev am: 8aff5ada38 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I27131a851f65bd95cb5fb548a160540877d42b30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into ↵Treehugger Robot
android12-tests-dev
2022-11-30simpleperf: fix check_trampoline_after_art_jni_methods test.Yabin Cui
Loose the test and IsArtEntry() function to allow using art_quick_generic_jni_trampoline. (cherry picked from commit 41677a6ed702e6394912af43483b5b785562a79b) Bug: 260538122 Test: run simpleperf_unit_test Change-Id: Ia554c4186ce804601138160e1320421ee7ede3d0
2022-09-15Merge "Merge "simpleperf: assume gpc targets as emulator" into ↵Automerger Merge Worker
android12L-tests-dev am: 942b61f7cf" into android13-tests-dev
2022-09-15Merge "simpleperf: assume gpc targets as emulator" into android12L-tests-dev ↵Shubhangi Pawar
am: 942b61f7cf Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2216082 Change-Id: I279cb25b42ff4b57fa1fe623a68b97c1ed42cd66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14Merge "simpleperf: assume gpc targets as emulator" into android12L-tests-devShubhangi Pawar
2022-09-14simpleperf: assume gpc targets as emulatorDaichi Hirono
Without the change, CtsSimpleperfTestCases failed on arm64. Bug: 243612327 Test: None Change-Id: Ib4c566b0bd0e5c761d9c78620caa13703c10589c (cherry picked from commit fa815d04c8756eb2f3bd2faafcd66f829909db7b)
2022-08-29Merge changes I0eb2841e,I0eb6acbd into android13-tests-devYabin Cui
* changes: simpleperf: accept failures when getting hw counters on a cpu. simpleperf: stat: don't open event files across cpus.
2022-08-29simpleperf: accept failures when getting hw counters on a cpu.Yabin Cui
When built as a 32-bit program, simpleperf can't set sched_affinity to a 64-bit only CPU. That can make simpleperf not be able to get hardware counters on that CPU. Bug: 243065368 Bug: 243479304 Test: run simpleperf_unit_test Change-Id: I0eb2841e191e88a96eeae53ec95b265db194cfd8 (cherry picked from commit 5aded99e9925531836b0e2b511b1448b4d64785e)
2022-08-29simpleperf: stat: don't open event files across cpus.Yabin
When monitoring an hardware event for a thread running on all cpus, the stat cmd opens one event file to monitor the thread across all cpus. This works because CPU PMUs on all cpus are managed by one pmu object in perf event driver in the kernel. And the event file is bounded to a pmu object. So it can transfer with the thread between cpus. But now big/little ARM cores may have different numbers of CPU PMU hardware counters. To fully use them, CPU PMUs on big/little cores need to be managed by different pmu objects. As a result, event files can't be transfered between cpus belonging to different pmu objects. To work with this, this patch changes the stat cmd to open one event file for each cpu. But after that, we can't tell if hardware counter multiplexing happens by checking if runtime equals enabled time. So we avoid showing the runtime / enabled_time percentage. Instead, we check if events used are more than hardware counters available on each cpu. Bug: 243479304 Bug: 243065368 Test: simpleperf_unit_test Change-Id: I0eb6acbdb2c23bd726be90232a8d97285dac5482 (cherry picked from commit 4ed8e11cc2adf37eb95b922f51a029617c875874)
2022-08-29Merge "simpleperf: update --print-hw-counter to check each cpu." into ↵Treehugger Robot
android13-tests-dev
2022-08-29Merge "simpleperf: stat: remove percentage in csv output." into ↵Treehugger Robot
android13-tests-dev
2022-08-29simpleperf: update --print-hw-counter to check each cpu.Yabin
Little/Big cores may have different numbers of CPU PMU hardware counters. So check them separately. Bug: 243479304 Bug: 243034569 Test: run simpleperf_unit_test Change-Id: I33527d69bc935b8523482feaf98378c5f6641762 (cherry picked from commit 6b771a2e12740f4bbcef515d772e62b364d87858)
2022-08-29simpleperf: stat: remove percentage in csv output.Yabin Cui
Because percentage isn't correct after we open an event for each cpu. Bug: 243065368 Bug: 243479304 Test: run simpleperf_unit_test Change-Id: I67bc23594e82afce040de7755deb9b274b8ad8b8 (cherry picked from commit abc8ee2e0f792d24562405159ae46be19a1c8acb)
2022-06-08Snap for 8699383 from a066ffe0299a26d19561fbaab2e654087fcac3ae to ↵aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030Android Build Coastguard Worker
mainline-permission-release Change-Id: I856f87228e93344165677eaf37dd1c7e87f42ff7
2022-06-06populate attributes when re-writing perf data am: df142880e8Ryan Zuklie
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/18521979 Change-Id: I7b0d00f369ecdc8ff8f3a673067102ee17034f58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03populate attributes when re-writing perf dataandroid13-devRyan Zuklie
JoinCallChains, PostUnwindRecords, and MergeMapRecords all flush the current data to file and start a new data file using MoveRecordFile. Normally, creating the file fills in the attributes from the event selection set. However, DoRecording recently added CloseEventFiles calls which clear the event_fds which are used to populate the attrs. This change fixes the issue by copying the attrs from the old file. Test: ran simpleperf on device $ adb shell $ cd /data/local/tmp $ simpleperf record -a --exclude-perf --duration 2 -g \ -e power:sugov_next_freq -e power:sugov_util_update $ simpleperf report Before the fix, all samples would be attributed to the first event type. With this fix, the samples are correctly attributed. Bug: 231357972 Change-Id: Id077e3c6f6c4460df595fad04c355717985a914e (cherry picked from commit 62fe04581f910f5a847ad0653908a3e57b6ed8a2) Merged-In: Id077e3c6f6c4460df595fad04c355717985a914e
2022-05-10Snap for 8564071 from 9fdafb81d838ebd4eff0fc0dd6651fe24801f863 to ↵Android Build Coastguard Worker
mainline-permission-release Change-Id: I4170a64758fef0e8e2ae1d8c9d77c7145bd6b985
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: ↵Christopher Ferris
6fcf9c2387 am: f078c382e6 am: cd6b038e79 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: Idb4293a9300f3cbe277ce948647ae4a925d1c3ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: ↵Christopher Ferris
6fcf9c2387 am: f078c382e6 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: If50412205302ab93b9a55af36abf36d23b84fbbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: ↵Christopher Ferris
6fcf9c2387 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: I965046ac793ffea1d50076742fedfb79dbd8be7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: Idd09481b56fe241087232c807ed15f639eb1866b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Add support for new unwindstack error codes."Christopher Ferris
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 74153d19ff -s ours am: f4df34b268 -s ours am: 15a9dd74a4 -s ours am skip reason: Merged-In Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 with SHA-1 518046b346 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17805281 Change-Id: If82307562980cc379e463ef04f933a919397b80c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 74153d19ff -s ours am: f4df34b268 -s ours am skip reason: Merged-In Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 with SHA-1 518046b346 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17805281 Change-Id: I13699d195201f6ecc0855229f99e2d4e6d3c76c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Add support for new unwindstack error codes.Christopher Ferris
Bug: 120606663 Test: Compiles. Change-Id: Ib1b5f31208507dd3911a2b4660e58370c83be70b
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 74153d19ff -s ours am skip reason: Merged-In Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 with SHA-1 518046b346 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17805281 Change-Id: I3305dd52e02a7d523b7aa2884e29b4d96fc48ec6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 Change-Id: I2e27d93c2d7bc1085c855456b5db91e6eff27820
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d am: bdc7bdab69 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: Id0c6a881f53cd66bcb8a3e3598296e3fc9c84245 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: Ie8ad4aad3dd9ef8ed8b914e370fd08f74735aeda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa am: 8c15f1a834 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: I97a8d6521f276bb0f36c57afee1afd25e15ba034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: Icd1e2fd57f1459910c3da11d58556ad449a3e3cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py"Cole Faust
2022-04-14Fix more issues with python3 conversion of build_verity_metadata.pyCole Faust
Bug: 203436762 Test: lunch hikey-userdebug; m droidcore Change-Id: I11ee92d7a3d9aa4e190c338e8438848c3ba47762
2022-04-14Fix CtsKernelConfigTestCases cts-on-gsi am: a4766dc033Keith Mok
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17740091 Change-Id: I2f7c6f69f1e3db3053dc6f0d04d901e06ce0432e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Fix CtsKernelConfigTestCases cts-on-gsiKeith Mok
run cts-on-gsi -m CtsKernelConfigTestCases will failed on device with kernel not enabled CONFIG_PSTORE_PMSG. If CONFIG_PSTORE_PMSG not enabled /dev/pmsg0 device node will not exists, but echo HELLOWORLD > /dev/pmsg0 will tries to create a file in /dev folder which will failed. Since CONFIG_PSTORE_PMSG is not a mandatory config, add a checking to see if /dev/pmsg0 exist first before echo/write into it. Bug: 215043302 Test: On device kernel without CONFIG_PSTORE_PMSG enabled run cts-on-gsi -m CtsKernelConfigTestCases Change-Id: I5009558fc3a853772c27e5967eb49bd44f171ae0 (cherry picked from commit 745b67e86f2e1d44462dbda25f9ae7166d1511b8)
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 am: c9284377f3 am: 9a207c0c12 am: 4a0abad6f1 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I1908745009420f9f8408bf5ae5df9923d55cb031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 am: c9284377f3 am: 9a207c0c12 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I047d7399c985fdbaa7e3155b8461397262959bef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 am: c9284377f3 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I7dcfdeb222673643ae92e56314ad1d4a5b9a478f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I979ac0fd579bc3cc382fb94ba60758f8ce5fc254 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 18:10:41 +0000