commit 31ec3810524635d773e40339ab309d923cfb35d2
author Yabin Cui <yabinc@google.com> Wed Oct 04 15:50:43 2023 -0700
committer Yabin Cui <yabinc@google.com> Tue Jan 23 14:11:51 2024 -0800
tree 5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e
parent b347fdbef643dabf6d2fbc48a9ad94f32e87dc89

simpleperf: Fix flaky test check_trampoline_after_art_jni_methods

Bug: 317955689
Bug: 299090869
Test: run simpleperf_unit_test
Change-Id: I846cd2bbf1159abf05e9d754c2e96c12912c7d72

simpleperf/cmd_record_test.cpp

diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index d3db6d5..fef62e1 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -34,6 +34,7 @@
 #include <android-base/test_utils.h>
 
 #include "ETMRecorder.h"
+#include "JITDebugReader.h"
 #include "ProbeEvents.h"
 #include "cmd_record_impl.h"
 #include "command.h"
@@ -929,10 +930,23 @@
         if (android::base::StartsWith(sym_name, "art::Method_invoke") && i + 1 < ips.size()) {
           has_check = true;
           std::string name = get_symbol_name(thread, ips[i + 1]);
-          if (!android::base::EndsWith(name, "jni_trampoline")) {
-            GTEST_LOG_(ERROR) << "unexpected symbol after art::Method_invoke: " << name;
-            return false;
+          if (android::base::EndsWith(name, "jni_trampoline")) {
+            continue;
           }
+          // When the jni_trampoline function is from JIT cache, we may not get map info in time.
+          // To avoid test flakiness, we accept this.
+          // Case 1: It doesn't hit any maps.
+          if (name == "unknown") {
+            continue;
+          }
+          // Case 2: It hits an old map for JIT cache.
+          if (const MapEntry* map = thread_tree.FindMap(thread, ips[i + 1], false);
+              JITDebugReader::IsPathInJITSymFile(map->dso->Path())) {
+            continue;
+          }
+
+          GTEST_LOG_(ERROR) << "unexpected symbol after art::Method_invoke: " << name;
+          return false;
         }
       }
     }