Remove small and tiny method options

These are unused and nops.

Test: test-art-host-gtest

Change-Id: I6421387d53ec8692cf420be71ec47e1ef5e61f19

5 files changed, 0 insertions, 42 deletions

diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc
index 6f39488cc7..6a7def8bf9 100644
--- a/compiler/driver/compiler_options.cc
+++ b/compiler/driver/compiler_options.cc
@@ -42,8 +42,6 @@ CompilerOptions::CompilerOptions()
     : compiler_filter_(CompilerFilter::kDefaultCompilerFilter),
       huge_method_threshold_(kDefaultHugeMethodThreshold),
       large_method_threshold_(kDefaultLargeMethodThreshold),
-      small_method_threshold_(kDefaultSmallMethodThreshold),
-      tiny_method_threshold_(kDefaultTinyMethodThreshold),
       num_dex_methods_threshold_(kDefaultNumDexMethodsThreshold),
       inline_max_code_units_(kUnsetInlineMaxCodeUnits),
       instruction_set_(kRuntimeISA == InstructionSet::kArm ? InstructionSet::kThumb2 : kRuntimeISA),
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 0ab5ff1907..bd832b963e 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -62,8 +62,6 @@ class CompilerOptions final {
   // Guide heuristics to determine whether to compile method if profile data not available.
   static const size_t kDefaultHugeMethodThreshold = 10000;
   static const size_t kDefaultLargeMethodThreshold = 600;
-  static const size_t kDefaultSmallMethodThreshold = 60;
-  static const size_t kDefaultTinyMethodThreshold = 20;
   static const size_t kDefaultNumDexMethodsThreshold = 900;
   static constexpr double kDefaultTopKProfileThreshold = 90.0;
   static const bool kDefaultGenerateDebugInfo = false;
@@ -125,14 +123,6 @@ class CompilerOptions final {
     return large_method_threshold_;
   }
 
-  size_t GetSmallMethodThreshold() const {
-    return small_method_threshold_;
-  }
-
-  size_t GetTinyMethodThreshold() const {
-    return tiny_method_threshold_;
-  }
-
   bool IsHugeMethod(size_t num_dalvik_instructions) const {
     return num_dalvik_instructions > huge_method_threshold_;
   }
@@ -141,14 +131,6 @@ class CompilerOptions final {
     return num_dalvik_instructions > large_method_threshold_;
   }
 
-  bool IsSmallMethod(size_t num_dalvik_instructions) const {
-    return num_dalvik_instructions > small_method_threshold_;
-  }
-
-  bool IsTinyMethod(size_t num_dalvik_instructions) const {
-    return num_dalvik_instructions > tiny_method_threshold_;
-  }
-
   size_t GetNumDexMethodsThreshold() const {
     return num_dex_methods_threshold_;
   }
@@ -375,8 +357,6 @@ class CompilerOptions final {
   CompilerFilter::Filter compiler_filter_;
   size_t huge_method_threshold_;
   size_t large_method_threshold_;
-  size_t small_method_threshold_;
-  size_t tiny_method_threshold_;
   size_t num_dex_methods_threshold_;
   size_t inline_max_code_units_;
 
diff --git a/compiler/driver/compiler_options_map-inl.h b/compiler/driver/compiler_options_map-inl.h
index 7e2a64b52b..aebde101c8 100644
--- a/compiler/driver/compiler_options_map-inl.h
+++ b/compiler/driver/compiler_options_map-inl.h
@@ -45,8 +45,6 @@ inline bool ReadCompilerOptions(Base& map, CompilerOptions* options, std::string
   }
   map.AssignIfExists(Base::HugeMethodMaxThreshold, &options->huge_method_threshold_);
   map.AssignIfExists(Base::LargeMethodMaxThreshold, &options->large_method_threshold_);
-  map.AssignIfExists(Base::SmallMethodMaxThreshold, &options->small_method_threshold_);
-  map.AssignIfExists(Base::TinyMethodMaxThreshold, &options->tiny_method_threshold_);
   map.AssignIfExists(Base::NumDexMethodsThreshold, &options->num_dex_methods_threshold_);
   map.AssignIfExists(Base::InlineMaxCodeUnitsThreshold, &options->inline_max_code_units_);
   map.AssignIfExists(Base::GenerateDebugInfo, &options->generate_debug_info_);
@@ -117,12 +115,6 @@ inline void AddCompilerOptionsArgumentParserOptions(Builder& b) {
       .Define("--large-method-max=_")
           .template WithType<unsigned int>()
           .IntoKey(Map::LargeMethodMaxThreshold)
-      .Define("--small-method-max=_")
-          .template WithType<unsigned int>()
-          .IntoKey(Map::SmallMethodMaxThreshold)
-      .Define("--tiny-method-max=_")
-          .template WithType<unsigned int>()
-          .IntoKey(Map::TinyMethodMaxThreshold)
       .Define("--num-dex-methods=_")
           .template WithType<unsigned int>()
           .IntoKey(Map::NumDexMethodsThreshold)
diff --git a/compiler/driver/compiler_options_map.def b/compiler/driver/compiler_options_map.def
index 0a9c873988..1a58f8de62 100644
--- a/compiler/driver/compiler_options_map.def
+++ b/compiler/driver/compiler_options_map.def
@@ -40,8 +40,6 @@ COMPILER_OPTIONS_KEY (std::string,                 CompilerFilter)
 COMPILER_OPTIONS_KEY (Unit,                        PIC)
 COMPILER_OPTIONS_KEY (unsigned int,                HugeMethodMaxThreshold)
 COMPILER_OPTIONS_KEY (unsigned int,                LargeMethodMaxThreshold)
-COMPILER_OPTIONS_KEY (unsigned int,                SmallMethodMaxThreshold)
-COMPILER_OPTIONS_KEY (unsigned int,                TinyMethodMaxThreshold)
 COMPILER_OPTIONS_KEY (unsigned int,                NumDexMethodsThreshold)
 COMPILER_OPTIONS_KEY (unsigned int,                InlineMaxCodeUnitsThreshold)
 COMPILER_OPTIONS_KEY (bool,                        GenerateDebugInfo)
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index c1504cc535..5787c702f3 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -329,16 +329,6 @@ NO_RETURN static void Usage(const char* fmt, ...) {
   UsageError("      Example: --large-method-max=%d", CompilerOptions::kDefaultLargeMethodThreshold);
   UsageError("      Default: %d", CompilerOptions::kDefaultLargeMethodThreshold);
   UsageError("");
-  UsageError("  --small-method-max=<method-instruction-count>: threshold size for a small");
-  UsageError("      method for compiler filter tuning.");
-  UsageError("      Example: --small-method-max=%d", CompilerOptions::kDefaultSmallMethodThreshold);
-  UsageError("      Default: %d", CompilerOptions::kDefaultSmallMethodThreshold);
-  UsageError("");
-  UsageError("  --tiny-method-max=<method-instruction-count>: threshold size for a tiny");
-  UsageError("      method for compiler filter tuning.");
-  UsageError("      Example: --tiny-method-max=%d", CompilerOptions::kDefaultTinyMethodThreshold);
-  UsageError("      Default: %d", CompilerOptions::kDefaultTinyMethodThreshold);
-  UsageError("");
   UsageError("  --num-dex-methods=<method-count>: threshold size for a small dex file for");
   UsageError("      compiler filter tuning. If the input has fewer than this many methods");
   UsageError("      and the filter is not interpret-only or verify-none or verify-at-runtime, ");