From d0af56cdb1eaebea403e382257bdc14d7b7fdaa4 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 17 Feb 2017 12:56:25 -0800 Subject: Make dex2oat support profiles passed to non profile filters Using a non profile filter with an input profile should compile everything but generate an app image and optimize layout based on the profile. Change UseProfileGuidedCompilation to use the profile arguments. Using profile arguments instead of being based on the compiler filter lets us do full speed compile and layout based on profile. Fix ShouldCompileBasedOnProfile to use the compiler filter instead of the existence of a profile. Fixed gtests. Test: test-art-host Bug: 34927277 Change-Id: I325a10d2072ed427bb32f96e4efa54cf81e94ad3 --- compiler/driver/compiler_driver_test.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'compiler/driver/compiler_driver_test.cc') diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 1e4ca16844..3879631053 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -246,6 +246,11 @@ class CompilerDriverProfileTest : public CompilerDriverTest { return &profile_info_; } + CompilerFilter::Filter GetCompilerFilter() const OVERRIDE { + // Use a profile based filter. + return CompilerFilter::kSpeedProfile; + } + std::unordered_set GetExpectedMethodsForClass(const std::string& clazz) { if (clazz == "Main") { return std::unordered_set({ @@ -304,7 +309,6 @@ TEST_F(CompilerDriverProfileTest, ProfileGuidedCompilation) { // Need to enable dex-file writability. Methods rejected to be compiled will run through the // dex-to-dex compiler. - ProfileCompilationInfo info; for (const DexFile* dex_file : GetDexFiles(class_loader)) { ASSERT_TRUE(dex_file->EnableWrite()); } -- cgit v1.2.3-59-g8ed1b