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/oat_test.cc | |
| parent | 113f7a4b6093280e4783c69e06467f816a568e72 (diff) | |
| download | art-b34f69ab43aaf7a6e6045c95f398baf566ef5023.tar.gz art-b34f69ab43aaf7a6e6045c95f398baf566ef5023.tar.bz2 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/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 93c35022f..9cfef12b2 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -15,7 +15,7 @@ */ #include "common_compiler_test.h" -#include "compiler/compiler_backend.h" +#include "compiler/compiler.h" #include "compiler/oat_writer.h" #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" @@ -84,9 +84,9 @@ TEST_F(OatTest, WriteRead) { ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); // TODO: make selectable. - CompilerBackend::Kind compiler_backend = kUsePortableCompiler - ? CompilerBackend::kPortable - : CompilerBackend::kQuick; + Compiler::Kind compiler_kind = kUsePortableCompiler + ? Compiler::kPortable + : Compiler::kQuick; InstructionSet insn_set = kIsTargetBuild ? kThumb2 : kX86; InstructionSetFeatures insn_features; @@ -99,7 +99,7 @@ TEST_F(OatTest, WriteRead) { compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), method_inliner_map_.get(), - compiler_backend, insn_set, + compiler_kind, insn_set, insn_features, false, NULL, 2, true, true, timer_.get())); jobject class_loader = NULL; |