diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-12 22:22:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-12 22:22:34 +0000 |
commit | 06a88579c00366000b0153981fa4ce053774f383 (patch) | |
tree | cdfdae9d9c0ff69dbc08745a9cfd57696cc0ae23 | |
parent | 7653b25e7e0eb684fe8f1fe12885a1be079e6791 (diff) | |
parent | dfe54d611892b01fb1c0cf849794302f579a53ad (diff) | |
download | extras-06a88579c00366000b0153981fa4ce053774f383.tar.gz |
Merge "Merge "Merge "resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev am: e8a7be73b3" into android13-tests-dev am: c5db4be612 am: bcf5ca7156 am: a88d8919b8 am: c3e92162ba am: dfe54d6118
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312
Change-Id: I471506d3896bbe6efb776058a319a8a75b684e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | simpleperf/test_util.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/simpleperf/test_util.cpp b/simpleperf/test_util.cpp index d93ddcd8..60d8ea35 100644 --- a/simpleperf/test_util.cpp +++ b/simpleperf/test_util.cpp @@ -85,9 +85,10 @@ bool HasHardwareCounter() { android::base::StartsWith(fingerprint, "google/sdk_gpc") || android::base::StartsWith(fingerprint, "generic/cf"); - if (arch == ARCH_X86_64 || arch == ARCH_X86_32 || is_emulator) { - // 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 the support at runtime. + if (arch == ARCH_X86_64 || arch == ARCH_X86_32 || !IsInNativeAbi() || is_emulator) { + // On x86 and x86_64, or when we are not in native abi, it's likely to run on an emulator or + // vm without hardware perf counters. It's hard to enumerate them all. So check the support + // at runtime. const simpleperf::EventType* type = simpleperf::FindEventTypeByName("cpu-cycles", false); CHECK(type != nullptr); perf_event_attr attr = CreateDefaultPerfEventAttr(*type); |