From bbe3a5efcdfb2fb15a4e5f724cc323ae0ada5111 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 13 Jun 2017 16:36:17 -0700 Subject: Refactor some profiling info functions Deleted profile_compilation_info-inl.h Added a new helper class MethodHotness to reduce the number of required getters for reading method hotness, startup, and post startup booleans. Test: test-art-host Bug: 62040831 Change-Id: I799a38e2bea6177ba5816c54524f4ccacedba772 --- compiler/driver/compiler_driver.cc | 2 +- compiler/driver/compiler_driver_test.cc | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'compiler') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 91b58e1590..51446d4b35 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1002,7 +1002,7 @@ bool CompilerDriver::ShouldCompileBasedOnProfile(const MethodReference& method_r } // Compile only hot methods, it is the profile saver's job to decide what startup methods to mark // as hot. - bool result = profile_compilation_info_->ContainsHotMethod(method_ref); + bool result = profile_compilation_info_->GetMethodHotness(method_ref).IsHot(); if (kDebugProfileGuidedCompilation) { LOG(INFO) << "[ProfileGuidedCompilation] " diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 4b979d8125..85d8b120d3 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -239,14 +239,10 @@ class CompilerDriverProfileTest : public CompilerDriverTest { ProfileCompilationInfo info; for (const std::unique_ptr& dex_file : dex_files) { - profile_info_.AddMethodIndex(dex_file->GetLocation(), - dex_file->GetLocationChecksum(), - 1, - dex_file->NumMethodIds()); - profile_info_.AddMethodIndex(dex_file->GetLocation(), - dex_file->GetLocationChecksum(), - 2, - dex_file->NumMethodIds()); + profile_info_.AddMethodIndex(ProfileCompilationInfo::MethodHotness::kFlagHot, + MethodReference(dex_file.get(), 1)); + profile_info_.AddMethodIndex(ProfileCompilationInfo::MethodHotness::kFlagHot, + MethodReference(dex_file.get(), 2)); } return &profile_info_; } -- cgit v1.2.3-59-g8ed1b