Mercurial > hg > graal-jvmci-8
comparison src/share/vm/graal/graalCompiler.cpp @ 14881:1415a62ac8b2
allow to force bootstrap in tiered
author | Bernhard Urban <bernhard.urban@jku.at> |
---|---|
date | Sat, 29 Mar 2014 00:28:49 +0100 |
parents | 56704532e1cd |
children | 4df6d7c966a2 |
comparison
equal
deleted
inserted
replaced
14880:73546bd550f0 | 14881:1415a62ac8b2 |
---|---|
30 #include "graal/graalCompilerToVM.hpp" | 30 #include "graal/graalCompilerToVM.hpp" |
31 #include "graal/graalEnv.hpp" | 31 #include "graal/graalEnv.hpp" |
32 #include "graal/graalRuntime.hpp" | 32 #include "graal/graalRuntime.hpp" |
33 #include "runtime/arguments.hpp" | 33 #include "runtime/arguments.hpp" |
34 #include "runtime/compilationPolicy.hpp" | 34 #include "runtime/compilationPolicy.hpp" |
35 #include "runtime/globals_extension.hpp" | |
35 | 36 |
36 GraalCompiler* GraalCompiler::_instance = NULL; | 37 GraalCompiler* GraalCompiler::_instance = NULL; |
37 | 38 |
38 GraalCompiler::GraalCompiler() : AbstractCompiler(graal) { | 39 GraalCompiler::GraalCompiler() : AbstractCompiler(graal) { |
39 _initialized = false; | 40 _initialized = false; |
96 } | 97 } |
97 VMToCompiler::finalizeOptions(CITime || CITimeEach); | 98 VMToCompiler::finalizeOptions(CITime || CITimeEach); |
98 | 99 |
99 if (UseCompiler) { | 100 if (UseCompiler) { |
100 _external_deopt_i2c_entry = create_external_deopt_i2c(); | 101 _external_deopt_i2c_entry = create_external_deopt_i2c(); |
101 bool bootstrap = COMPILERGRAAL_PRESENT(TieredCompilation ? false : BootstrapGraal) NOT_COMPILERGRAAL(false); | 102 #ifdef COMPILERGRAAL |
103 bool bootstrap = FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal; | |
104 #else | |
105 bool bootstrap = false; | |
106 #endif | |
102 VMToCompiler::startCompiler(bootstrap); | 107 VMToCompiler::startCompiler(bootstrap); |
103 _initialized = true; | 108 _initialized = true; |
104 CompilationPolicy::completed_vm_startup(); | 109 CompilationPolicy::completed_vm_startup(); |
105 if (bootstrap) { | 110 if (bootstrap) { |
106 // Avoid -Xcomp and -Xbatch problems by turning on interpreter and background compilation for bootstrapping. | 111 // Avoid -Xcomp and -Xbatch problems by turning on interpreter and background compilation for bootstrapping. |