From 327497e303903f300b01f77f2259fd5b61238ee3 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 4 Mar 2019 12:53:20 +0000 Subject: Move CompilerDriver to dex2oat/. Also DexToDexCompiler, QuickCompilerCallbacks and tests. aosp_taimen-userdebug: - before: lib64/libart-compiler.so: 3112344 lib/libart-compiler.so: 2312908 bin/dex2oat: 563176 - after: lib64/libart-compiler.so: 2986720 (-123KiB) lib/libart-compiler.so: 2219852 (-91KiB) bin/dex2oat: 635832 (+71KiB) Test: m test-art-host-gtest Test: testrunner.py --host --optimizing --jit Change-Id: I36e63b83dff1d5c731d05de27d3663cfc81de6ad --- compiler/common_compiler_driver_test.h | 74 ---------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 compiler/common_compiler_driver_test.h (limited to 'compiler/common_compiler_driver_test.h') diff --git a/compiler/common_compiler_driver_test.h b/compiler/common_compiler_driver_test.h deleted file mode 100644 index e3354d4ad4..0000000000 --- a/compiler/common_compiler_driver_test.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ART_COMPILER_COMMON_COMPILER_DRIVER_TEST_H_ -#define ART_COMPILER_COMMON_COMPILER_DRIVER_TEST_H_ - -#include - -#include - -#include "common_compiler_test.h" -#include "base/hash_set.h" -#include "base/mem_map.h" - -namespace art { - -class CompilerDriver; -class DexFile; -class ProfileCompilationInfo; -class TimingLogger; - -class CommonCompilerDriverTest : public CommonCompilerTest { - public: - CommonCompilerDriverTest(); - ~CommonCompilerDriverTest(); - - void CompileAll(jobject class_loader, - const std::vector& dex_files, - TimingLogger* timings) REQUIRES(!Locks::mutator_lock_); - - void SetDexFilesForOatFile(const std::vector& dex_files); - - void ReserveImageSpace(); - - void UnreserveImageSpace(); - - void CreateCompilerDriver(); - - protected: - void SetUpRuntimeOptions(RuntimeOptions* options) override; - - void SetUp() override; - void TearDown() override; - - // Get the set of image classes given to the compiler-driver in SetUp. - virtual std::unique_ptr> GetImageClasses(); - - virtual ProfileCompilationInfo* GetProfileCompilationInfo(); - - size_t number_of_threads_ = 2u; - - std::unique_ptr compiler_driver_; - - private: - MemMap image_reservation_; - void* inaccessible_page_; -}; - -} // namespace art - -#endif // ART_COMPILER_COMMON_COMPILER_DRIVER_TEST_H_ -- cgit v1.2.3-59-g8ed1b