diff options
| author | Jeff Hao <jeffhao@google.com> | 2015-02-23 15:32:43 -0800 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2015-03-02 18:29:58 -0800 |
| commit | f3c7ba6a5759873138fbf4ae24a216dc0d87a3fe (patch) | |
| tree | f2acaf88a41bc9237fabc8234b5bf4a8e6bb7ac1 | |
| parent | f5c224cca603ef1dba9bb80952613facc22598fa (diff) | |
| download | art-f3c7ba6a5759873138fbf4ae24a216dc0d87a3fe.zip art-f3c7ba6a5759873138fbf4ae24a216dc0d87a3fe.tar.gz art-f3c7ba6a5759873138fbf4ae24a216dc0d87a3fe.tar.bz2 | |
Remove ART_SMALL_MODE ifdefs.
WITH_ART_SMART_MODE now sets --compiler-filter options instead.
Has a corresponding change to /build
Bug: 19460766
Change-Id: I295ebbd49caa5341834141f7c2bbf8df830131ed
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build/Android.common_build.mk | 16 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.h | 4 | ||||
| -rw-r--r-- | dex2oat/dex2oat.cc | 11 |
4 files changed, 0 insertions, 32 deletions
@@ -1,5 +1,4 @@ USE_LLVM_COMPILER USE_PORTABLE_COMPILER -SMALL_ART SEA_IR_ART JIT_ART diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 6a83e72..08b4ec2 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -60,18 +60,6 @@ ART_JIT := true endif # -# Used to enable smart mode -# -ART_SMALL_MODE := false -ifneq ($(wildcard art/SMALL_ART),) -$(info Enabling ART_SMALL_MODE because of existence of art/SMALL_ART) -ART_SMALL_MODE := true -endif -ifeq ($(WITH_ART_SMALL_MODE), true) -ART_SMALL_MODE := true -endif - -# # Used to change the default GC. Valid values are CMS, SS, GSS. The default is CMS. # ART_DEFAULT_GC_TYPE ?= CMS @@ -219,10 +207,6 @@ else art_cflags += -DIMT_SIZE=64 endif -ifeq ($(ART_SMALL_MODE),true) - art_cflags += -DART_SMALL_MODE=1 -endif - ifeq ($(ART_USE_OPTIMIZING_COMPILER),true) art_cflags += -DART_USE_OPTIMIZING_COMPILER=1 endif diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index 122ae4b..0683d18 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -41,11 +41,7 @@ class CompilerOptions FINAL { }; // Guide heuristics to determine whether to compile method if profile data not available. -#if ART_SMALL_MODE - static const CompilerFilter kDefaultCompilerFilter = kInterpretOnly; -#else static const CompilerFilter kDefaultCompilerFilter = kSpeed; -#endif static const size_t kDefaultHugeMethodThreshold = 10000; static const size_t kDefaultLargeMethodThreshold = 600; static const size_t kDefaultSmallMethodThreshold = 60; diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 0b1f14d..d727e0a 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -180,11 +180,7 @@ NO_RETURN static void Usage(const char* fmt, ...) { "|time):"); UsageError(" select compiler filter."); UsageError(" Example: --compiler-filter=everything"); -#if ART_SMALL_MODE - UsageError(" Default: interpret-only"); -#else UsageError(" Default: speed"); -#endif UsageError(""); UsageError(" --huge-method-max=<method-instruction-count>: the threshold size for a huge"); UsageError(" method for compiler filter tuning."); @@ -875,15 +871,8 @@ class Dex2Oat FINAL { // For Mips64, can only compile in interpreter mode. // TODO: fix compiler for Mips64. compiler_filter_string = "interpret-only"; - } else if (image_) { - compiler_filter_string = "speed"; } else { - // TODO: Migrate SMALL mode to command line option. - #if ART_SMALL_MODE - compiler_filter_string = "interpret-only"; - #else compiler_filter_string = "speed"; - #endif } } CHECK(compiler_filter_string != nullptr); |