commit fd728c6783413a814a932a5fd7c4f140fe596786
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 13 23:22:55 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 13 23:22:55 2023 +0000
tree 90bb3813b2e964d5e7e5c3cb42cc08f6e267240e
parent 403269d8d415d985371bd0e4f1bdd9ce744c41a6
parent 266aa3bf840ab8392397cb86d59a064992db966b

Snap for 10314561 from 266aa3bf840ab8392397cb86d59a064992db966b to udc-release

Change-Id: Iabe75d65cfde318046f45eb76b5965edf50027c0

simpleperf/test_util.cpp

diff --git a/simpleperf/test_util.cpp b/simpleperf/test_util.cpp
index d93ddcd..60d8ea3 100644
--- a/simpleperf/test_util.cpp
+++ b/simpleperf/test_util.cpp
@@ -85,9 +85,10 @@
                        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);