summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-19Merge "Snap for 11738209 from 6b5a8b2336a2b5b5466cdb8cf2831a4ce9592a8e to ↵android12L-tests-releaseAndroid Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2024-04-19Snap for 11738209 from 6b5a8b2336a2b5b5466cdb8cf2831a4ce9592a8e to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: Idee69cae4d46f26194df37c36a14d74abc8761ad
2024-04-19Merge "Merge "simpleperf: Fix flaky test ↵android12L-tests-devAutomerger Merge Worker
check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev
2024-04-19Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" ↵Treehugger Robot
into android12-tests-dev am: e4cc9c7725 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049053 Change-Id: I33ed7fa5e08bc1cf07e8478c8ecfe82fd11e9ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into ↵Automerger Merge Worker
android12-tests-dev am: 927e0ca800" into android12L-tests-dev
2024-04-19Merge "simpleperf: Fix record_cmd#check_trampoline test" into ↵Treehugger Robot
android12-tests-dev am: 927e0ca800 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049052 Change-Id: Ie86c4b73269f707ae357f281d495bc653d3434d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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-06-13Merge "Snap for 10311110 from e8a7be73b36aa2d41aac368bc56a8d6f74ef1edd to ↵android-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r10Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2023-06-13Snap for 10311110 from e8a7be73b36aa2d41aac368bc56a8d6f74ef1edd to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: Ic6bda86972ba44fd4b99a6fd5edc4dacc4c2cdcf
2023-06-12Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev
2023-06-12Merge "resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac ↵Treehugger Robot
to android12-tests-dev" into android12-tests-dev am: e89e097679 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312 Change-Id: I9bacb4ff2ce7fcd4fde62c85d13b8955082532ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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-04Merge "Snap for 10254767 from 04747534f83b21cdf5efb6bf7586b719c05be7c7 to ↵Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2023-06-04Snap for 10254767 from 04747534f83b21cdf5efb6bf7586b719c05be7c7 to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: Ib54a0e69778b1f629f24ca895b6b2703154cd679
2023-06-02Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev am: 74954de15a [automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours
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 am: 74954de15a Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Ifce085da936be76bdbb8dccb697ff6397922bc4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Idd24fca32d5cd218ce1a1dcc3e755a71849c5969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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-06-01Merge "Snap for 10233941 from 66f20d311e0c015cafba3d797821a67fb5c9dcf6 to ↵Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2023-06-01Snap for 10233941 from 66f20d311e0c015cafba3d797821a67fb5c9dcf6 to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: I3fea3a5a82065f70968dccefe9aafcca5284b151
2023-05-31Merge "Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev ↵Automerger Merge Worker
am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev
2023-05-31Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: ↵Automerger Merge Worker
b19afd3d01" into android12-tests-dev am: 886dfe2c36 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I0769507ba3a26ea94be4639cec2b01bd09737aa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 9355154 from b2dee26f989a5ab41fc7790634d8a6851635b897 to ↵android-vts-12.1_r6android-vts-12.1_r5android-cts-12.1_r6android-cts-12.1_r5Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2022-12-01Snap for 9355154 from b2dee26f989a5ab41fc7790634d8a6851635b897 to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: I0cf0d97e901503f82bbac01a5ab33a9f9112e2bd
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 "Snap for 9066087 from 942b61f7cfcd162d4ffd56ef312417df11976cde to ↵android-vts-12.1_r4android-cts-12.1_r4Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2022-09-15Snap for 9066087 from 942b61f7cfcd162d4ffd56ef312417df11976cde to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: I8f132e30569e232d74557d03e97eb417ccc53d6c
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-03-22Merge "Mark ab/8191998 as merged" into android12L-tests-devandroid-vts-12.1_r3android-vts-12.1_r2android-cts-12.1_r3android-cts-12.1_r2Xin Li
2022-03-21Mark ab/8191998 as mergedMaria Yang
Bug: 188847863 Merged-In: Ibc2f99ba766419fdb491c49317b9fb5ae13138ef Change-Id: Ib5888e2898349345cf924d21c246265f1a3a9fa4
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 14:47:09 +0000