Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/compilationPolicy.cpp @ 23404:3ef45d0a6d77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 24 May 2016 13:51:28 +0200
parents 7ae6a635fad0
children
comparison
equal deleted inserted replaced
23403:5342deb9bf53 23404:3ef45d0a6d77
186 // NOTE: CompileBroker::should_compile_new_jobs() checks for UseCompiler 186 // NOTE: CompileBroker::should_compile_new_jobs() checks for UseCompiler
187 return !delay_compilation_during_startup() && CompileBroker::should_compile_new_jobs(); 187 return !delay_compilation_during_startup() && CompileBroker::should_compile_new_jobs();
188 } 188 }
189 189
190 CompileTask* CompilationPolicy::select_task_helper(CompileQueue* compile_queue) { 190 CompileTask* CompilationPolicy::select_task_helper(CompileQueue* compile_queue) {
191 #ifdef COMPILERJVMCI 191 #if INCLUDE_JVMCI
192 if (!BackgroundCompilation) { 192 if (UseJVMCICompiler && !BackgroundCompilation) {
193 /* 193 /*
194 * In blocking compilation mode, the CompileBroker will make 194 * In blocking compilation mode, the CompileBroker will make
195 * compilations submitted by a JVMCI compiler thread non-blocking. These 195 * compilations submitted by a JVMCI compiler thread non-blocking. These
196 * compilations should be scheduled after all blocking compilations 196 * compilations should be scheduled after all blocking compilations
197 * to service non-compiler related compilations sooner and reduce the 197 * to service non-compiler related compilations sooner and reduce the
245 // - if only COMPILER1 is defined (client build), zero should be returned for 245 // - if only COMPILER1 is defined (client build), zero should be returned for
246 // the c2 level. 246 // the c2 level.
247 // - if neither is defined - always return zero. 247 // - if neither is defined - always return zero.
248 int NonTieredCompPolicy::compiler_count(CompLevel comp_level) { 248 int NonTieredCompPolicy::compiler_count(CompLevel comp_level) {
249 assert(!TieredCompilation, "This policy should not be used with TieredCompilation"); 249 assert(!TieredCompilation, "This policy should not be used with TieredCompilation");
250 #if defined(COMPILER2) || defined(COMPILERJVMCI) 250 #ifdef COMPILER2
251 if (is_c2_compile(comp_level)) { 251 if (is_c2_compile(comp_level)) {
252 return _compiler_count; 252 return _compiler_count;
253 } else { 253 } else {
254 return 0; 254 return 0;
255 } 255 }