diff options
author | Yabin Cui <yabinc@google.com> | 2024-01-24 20:44:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-24 20:44:48 +0000 |
commit | 0c62c513d96036472b0ac0c7916f0d2a240878ab (patch) | |
tree | 5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e | |
parent | 1da3c129ce45a799e60aeec5d1a57332f379d0f0 (diff) | |
parent | 31ec3810524635d773e40339ab309d923cfb35d2 (diff) | |
download | extras-0c62c513d96036472b0ac0c7916f0d2a240878ab.tar.gz |
Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android14-tests-dev
-rw-r--r-- | simpleperf/cmd_record_test.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index d3db6d56..fef62e13 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 @@ TEST(record_cmd, check_trampoline_after_art_jni_methods) { 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; } } } |