summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-19Merge "Snap for 11738211 from e4cc9c7725b420215d194e5b3b72235ef6efb1a2 to ↵android12-tests-releaseAndroid Build Coastguard Worker
android12-tests-release" into android12-tests-release
2024-04-19Snap for 11738211 from e4cc9c7725b420215d194e5b3b72235ef6efb1a2 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Id494c661b6e45e697d201d40fc8a936ec34b4f2d
2024-04-19Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" ↵android12-tests-devTreehugger Robot
into android12-tests-dev
2024-04-19Merge "simpleperf: Fix record_cmd#check_trampoline test" into ↵Treehugger Robot
android12-tests-dev
2024-04-18simpleperf: Fix flaky test check_trampoline_after_art_jni_methodsYabin Cui
Bug: 335341168 Bug: 317955689 Bug: 299090869 Test: run simpleperf_unit_test Change-Id: I846cd2bbf1159abf05e9d754c2e96c12912c7d72 Merged-In: I846cd2bbf1159abf05e9d754c2e96c12912c7d72
2024-04-18simpleperf: Fix record_cmd#check_trampoline testYabin Cui
art_jni_trampoline may appear in JIT cache. To load symbols for JIT cache (stored in the recording file), we need to call LoadBuildIdAndFileFeatures(). Bug: 335341168 Bug: 317955689 Bug: 299090869 Test: run simpleperf_unit_test Change-Id: I401b091e27e7b3ae86f003a270b53be4060c922f Merged-In: I401b091e27e7b3ae86f003a270b53be4060c922f
2023-07-06Merge "Snap for 10445396 from e89e0976796aa8c4a6a2091f7344e613e9b0de02 to ↵android-vts-12.0_r9android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r9android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2023-07-06Snap for 10445396 from e89e0976796aa8c4a6a2091f7344e613e9b0de02 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I3fff57dc60ca05d4de80b74bf566ed3a3db46b66
2023-06-12Merge "resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac ↵Treehugger Robot
to android12-tests-dev" into android12-tests-dev
2023-06-09resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac to ↵Yabin Cui
android12-tests-dev Bug: 286585422 Test: build Change-Id: I4ca69cbfde11d05152a010f30b22acbac5fbbf0a
2023-06-09Merge "simpleperf: Check hardware counter dynamically in non-native ABIs" ↵android11-tests-devTreehugger Robot
into android11-tests-dev
2023-06-08simpleperf: Check hardware counter dynamically in non-native ABIsYabin Cui
ARM64 CtsSimpleperfTestCases may run via binary translation on a x86_64 environment, which may run on a VM not supporting hardware counters. Bug: 284801306 Test: run CtsSimpleperfTestCases Change-Id: Icc08d3639459c2c671f57c96860db085e8b7f8b9
2023-06-02Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Automerger Merge Worker
runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev
2023-06-02[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: I18c5e886e64ce79573ce4507ecfa03f9939ee921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02Merge "simpleperf: replace InCloudAndroid() with runtime check." into ↵Treehugger Robot
android11-tests-dev
2023-06-02simpleperf: replace InCloudAndroid() with runtime check.Yabin Cui
On x86 and x86_64, it's likely to run on an emulator or vm without hardware perf counters. It's hard to enumerate them all. So check if hardware perf counters are available at runtime. Bug: 284801306 Test: run simpleperf_unit_test Change-Id: I38cc89bc7f81f8d6d6165a4b8f344c0660c10364 (cherry picked from commit 1f6f51aee77235b1fb374a917f0b46c9c09f0933)
2023-05-31Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: ↵Automerger Merge Worker
b19afd3d01" into android12-tests-dev
2023-05-31Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: b19afd3d01Yury Khmel
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I483c661e5783de8f775ad509829f912302347aac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "arc: Fix CTS tests for grunt" into android11-tests-devYury Khmel
2023-05-29arc: Fix CTS tests for gruntYury Khmel
Waiting loop has 1us delay waiting for requested changes are propagated. This is too aggressive and Grunt and other low-end devices may have no chance to react in specific timeout. Bug: 265675811 Test: cts-tradefed run commandAndExit cts -m CtsSimpleperfTestCases Most tests are now passing: Total Tests : 540 PASSED : 528 FAILED : 12 Change-Id: Ida041674c2fea425e6d267ee6a973208da00ed71
2022-12-01Merge "Snap for 9354896 from 8aff5ada381ed5d2e9b9cc6d4b6b34e9e252e4ca to ↵android-vts-12.0_r8android-vts-12.0_r7android-cts-12.0_r8android-cts-12.0_r7Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-12-01Snap for 9354896 from 8aff5ada381ed5d2e9b9cc6d4b6b34e9e252e4ca to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I94eea310ee93f5a65b6e433b0d4fa8a90a82d9cd
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-01-29Merge "Snap for 8131688 from 2cbc0596712eddd5c269133855a15b4d2b4c59b3 to ↵android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-01-29Snap for 8131688 from 2cbc0596712eddd5c269133855a15b4d2b4c59b3 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I57a5baed4556cc543d26da12bc48ff0c4a8a1e23
2022-01-29Merge "Merge "simpleperf: use 8 byte aligned stack size when resizing stack ↵Automerger Merge Worker
data." into android11-tests-dev am: 0eb3232339" into android12-tests-dev
2022-01-29Merge "simpleperf: use 8 byte aligned stack size when resizing stack data." ↵Florian Muller
into android11-tests-dev am: 0eb3232339 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1965454 Change-Id: Ieb34e297f45e33ee16ede7b7c1e2ebbd4d57c84c
2022-01-29Merge "simpleperf: use 8 byte aligned stack size when resizing stack data." ↵Florian Muller
into android11-tests-dev
2022-01-28simpleperf: use 8 byte aligned stack size when resizing stack data.Yabin Cui
When generating sample records for 32bit arm processes, the dyn_stack_size may not be 8 byte aligned. And dyn_stack_size can be used to calculate new stack size. If the new stack size isn't 8 byte aligned, we can have alginment error later. So make sure new stack size is 8 byte aligned. Bug: 208187192 Test: run simpleperf_unit_test Change-Id: Ibc2f99ba766419fdb491c49317b9fb5ae13138ef (cherry picked from commit 9290fc7b9d3609b854d2791428b2385bba427906)
2021-12-17Merge "Snap for 8010960 from c54d12318f0e511868f61681dc9f1a6dec46c2df to ↵android-vts-12.0_r3android-cts-12.0_r3Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-12-17Snap for 8010960 from c54d12318f0e511868f61681dc9f1a6dec46c2df to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Ie6135c10ecc5b0bd4ed30fe291463c681aa07c36
2021-12-16Merge changes from topic "am-5ff3768a92d443d1939e70a1909e20ed" into ↵Automerger Merge Worker
android12-tests-dev * changes: Merge "simpleperf: Loose time constraint to fix flaky test." into android11-tests-dev am: a3e6140e6a simpleperf: Loose time constraint to fix flaky test. am: 79810fc160
2021-12-16Merge "simpleperf: Loose time constraint to fix flaky test." into ↵Treehugger Robot
android11-tests-dev am: a3e6140e6a Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1916677 Change-Id: Ibc8a62b01bba10dc665d188f61c2d39e0bb57ab1
2021-12-16simpleperf: Loose time constraint to fix flaky test. am: 79810fc160Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1916677 Change-Id: I6f20be1336592840fdca16b250cbbbef7e8915a9
2021-12-16Merge "simpleperf: Loose time constraint to fix flaky test." into ↵Treehugger Robot
android11-tests-dev
2021-12-09simpleperf: Loose time constraint to fix flaky test.Yabin Cui
DO NOT MERGE Bug: 179088910 Bug: 199771629 Test: run simpleperf_unit_test Change-Id: Ia58a5bd6e9bfff4ef208701f43541ba98a97fba0 (cherry picked from commit 3c1f59fcd18527d58bc42f3e1e73981594bb1b9b)
2021-10-29Merge "Snap for 7867141 from 12ad09c63dce5f7dc7017bc09abfa48cb9902786 to ↵android-vts-12.0_r2android-cts-12.0_r2Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-10-29Snap for 7867141 from 12ad09c63dce5f7dc7017bc09abfa48cb9902786 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I73e7c460aa5d39ca337119d98b83a4790afc1397
2021-10-28Merge "simpleperf: detect hardware counters on emulators." into ↵Treehugger Robot
android12-tests-dev
2021-10-28simpleperf: detect hardware counters on emulators.Yabin Cui
We may run arm64 tests on emulators, which may not have hardware counters. So use fingerprint to check if we are running on an emulator, and dynamically detect if hardware counters are available. Bug: 202840384 Bug: 191278807 Test: run CtsSimpleperfTestCases on emulators. Change-Id: I3b6ea439e72188d5b4cf23662b0ee00bfa3b28cd (cherry picked from commit 8c426d91c940ddfdb480dec9369a21f1c6907bc9)
2021-10-18Merge "Snap for 7834066 from 3c385fb5115c2608280836046faeea691805813e to ↵Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-10-18Snap for 7834066 from 3c385fb5115c2608280836046faeea691805813e to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I20ab389958283d74a2b53cdeb1e3b155285712f3
2021-10-09Merge "Merge "simpleperf: increase record duration" into android11-tests-dev ↵Automerger Merge Worker
am: 26d94ee676" into android12-tests-dev
2021-10-09Merge "simpleperf: increase record duration" into android11-tests-dev am: ↵Treehugger Robot
26d94ee676 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1723366 Change-Id: I93c51ff0c5faf1f78ef2f954dcb74b292b8638f3
2021-10-09Merge changes from topic "am-1ea4a23d68d44c7d84ed87e3618c6553" into ↵Automerger Merge Worker
android12-tests-dev * changes: Merge "[automerger skipped] Merge "simpleperf: increase record duration" into android10-tests-dev am: f33a791c40 -s ours" into android11-tests-dev am: ce9f7a6ae9 [automerger skipped] Merge "simpleperf: increase record duration" into android10-tests-dev am: f33a791c40 -s ours am: 1d1575720f -s ours
2021-10-09Merge "[automerger skipped] Merge "simpleperf: increase record duration" ↵Automerger Merge Worker
into android10-tests-dev am: f33a791c40 -s ours" into android11-tests-dev am: ce9f7a6ae9 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1723290 Change-Id: I1b7352a3bc320e99eeffda158ee8c2c86bc434a0
2021-10-09[automerger skipped] Merge "simpleperf: increase record duration" into ↵Treehugger Robot
android10-tests-dev am: f33a791c40 -s ours am: 1d1575720f -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1723290 Change-Id: I3b03698df2f0e7e3937319d5c7fe7d0c92207118
2021-10-09Merge "Merge "simpleperf: update test apk to run on wear devices." into ↵Automerger Merge Worker
android11-tests-dev am: f9cef3dc45" into android12-tests-dev
2021-10-09Merge "simpleperf: update test apk to run on wear devices." into ↵Treehugger Robot
android11-tests-dev am: f9cef3dc45 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1670231 Change-Id: Ibaca6de2190bfb3be702d6408d74e2d6fbcdc869