diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-19 20:34:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-19 20:34:57 +0000 |
commit | ea7d802d202976301d204ecf5fecae2dc475d13a (patch) | |
tree | ea2a2b1ec3b6e1e2e0c196c03d60a94ac7176b82 | |
parent | 2b615d74e4e3081ac139dd79329336d22f8fa0b2 (diff) | |
parent | 46be8580be5ab064f98c5f4778bafbafa84e14df (diff) | |
download | extras-android13-tests-release.tar.gz |
Merge "Snap for 11738212 from 57b29e5ba9c9d0717fc2626f5313ffeef6727087 to android13-tests-release" into android13-tests-releaseandroid13-tests-release
-rw-r--r-- | simpleperf/cmd_record_test.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index 01861c60..f74bdec9 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" @@ -877,6 +878,7 @@ TEST(record_cmd, check_trampoline_after_art_jni_methods) { auto reader = RecordFileReader::CreateInstance(helper.GetDataPath()); ASSERT_TRUE(reader); ThreadTree thread_tree; + reader->LoadBuildIdAndFileFeatures(thread_tree); auto get_symbol_name = [&](ThreadEntry* thread, uint64_t ip) -> std::string { const MapEntry* map = thread_tree.FindMap(thread, ip, false); @@ -898,10 +900,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; } } } |