diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-07 15:28:39 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-13 09:10:43 +0000 |
| commit | b34f69ab43aaf7a6e6045c95f398baf566ef5023 (patch) | |
| tree | 4090a650de1de3806f6273f3828e77bef9704453 /compiler/common_compiler_test.h | |
| parent | 113f7a4b6093280e4783c69e06467f816a568e72 (diff) | |
| download | android_art-b34f69ab43aaf7a6e6045c95f398baf566ef5023.tar.gz android_art-b34f69ab43aaf7a6e6045c95f398baf566ef5023.tar.bz2 android_art-b34f69ab43aaf7a6e6045c95f398baf566ef5023.zip | |
Add command line support for enabling the optimizing compiler.
Also run tests with the optimizing compiler enabled when
the file art/USE_OPTIMIZING_COMPILER is present.
Change-Id: Ibc33eed62a43547bc3b9fe786d014c0d81b5add8
Diffstat (limited to 'compiler/common_compiler_test.h')
| -rw-r--r-- | compiler/common_compiler_test.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index d28b0fedac..49c1283809 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_COMMON_COMPILER_TEST_H_ #define ART_COMPILER_COMMON_COMPILER_TEST_H_ -#include "compiler_backend.h" +#include "compiler.h" #include "compiler_callbacks.h" #include "common_runtime_test.h" #include "dex/quick/dex_file_to_method_inliner_map.h" @@ -319,13 +319,13 @@ class CommonCompilerTest : public CommonRuntimeTest { } // TODO: make selectable - CompilerBackend::Kind compiler_backend - = (kUsePortableCompiler) ? CompilerBackend::kPortable : CompilerBackend::kQuick; + Compiler::Kind compiler_kind + = (kUsePortableCompiler) ? Compiler::kPortable : Compiler::kQuick; timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), method_inliner_map_.get(), - compiler_backend, instruction_set, + compiler_kind, instruction_set, instruction_set_features, true, new CompilerDriver::DescriptorSet, 2, true, true, timer_.get())); |