From f120ffc1b4864c28bc2aa249e714b51da11f3ea0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 23 Apr 2018 11:27:31 -0700 Subject: Dump profile checksums Also dump profile checksums. This helps diagnose checksum mismatches. Test: manual Bug: 70292748 Change-Id: Iaab4b34378240a265d11d196dcad6db12dc3545d --- profman/profile_assistant_test.cc | 12 ++++++------ runtime/jit/profile_compilation_info.cc | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/profman/profile_assistant_test.cc b/profman/profile_assistant_test.cc index 9494f04a5a..72c285a3f5 100644 --- a/profman/profile_assistant_test.cc +++ b/profman/profile_assistant_test.cc @@ -1147,18 +1147,18 @@ TEST_F(ProfileAssistantTest, DumpOnly) { // Check the actual contents of the dump by looking at the offsets of the methods. for (uint32_t m : hot_methods) { const size_t pos = output.find(std::to_string(m) + "[],", hot_offset); - ASSERT_NE(pos, std::string::npos); - EXPECT_LT(pos, startup_offset); + ASSERT_NE(pos, std::string::npos) << output; + EXPECT_LT(pos, startup_offset) << output; } for (uint32_t m : startup_methods) { const size_t pos = output.find(std::to_string(m) + ",", startup_offset); - ASSERT_NE(pos, std::string::npos); - EXPECT_LT(pos, post_startup_offset); + ASSERT_NE(pos, std::string::npos) << output; + EXPECT_LT(pos, post_startup_offset) << output; } for (uint32_t m : post_startup_methods) { const size_t pos = output.find(std::to_string(m) + ",", post_startup_offset); - ASSERT_NE(pos, std::string::npos); - EXPECT_LT(pos, classes_offset); + ASSERT_NE(pos, std::string::npos) << output; + EXPECT_LT(pos, classes_offset) << output; } } diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc index f5c2715cda..7c21916997 100644 --- a/runtime/jit/profile_compilation_info.cc +++ b/runtime/jit/profile_compilation_info.cc @@ -1675,6 +1675,7 @@ std::string ProfileCompilationInfo::DumpInfo(const std::vector* os << (multidex_suffix.empty() ? kFirstDexFileKeySubstitute : multidex_suffix); } os << " [index=" << static_cast(dex_data->profile_index) << "]"; + os << " [checksum=" << std::hex << dex_data->checksum << "]" << std::dec; const DexFile* dex_file = nullptr; if (dex_files != nullptr) { for (size_t i = 0; i < dex_files->size(); i++) { -- cgit v1.2.3-59-g8ed1b