(original) (raw)

src/share/vm/compiler/compileBroker.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File

*** old/src/share/vm/compiler/compileBroker.cpp Wed Sep 16 15🔞26 2015** --- new/src/share/vm/compiler/compileBroker.cpp Wed Sep 16 15🔞26 2015

*** 49,58 **** --- 49,63 ---- #include "utilities/dtrace.hpp" #include "utilities/events.hpp" #ifdef COMPILER1 #include "c1/c1_Compiler.hpp" #endif + #if INCLUDE_JVMCI + #include "jvmci/jvmciCompiler.hpp" + #include "jvmci/jvmciRuntime.hpp" + #include "runtime/vframe.hpp" + #endif #ifdef COMPILER2 #include "opto/c2compiler.hpp" #endif #ifdef SHARK #include "shark/sharkCompiler.hpp"

*** 384,393 **** --- 389,400 ---- bool is_osr_method, int osr_bci, bool is_blocking, const char* msg, bool short_form, bool cr) { if (!short_form) { st->print("%7d ", (int) st->time_stamp().milliseconds()); // print timestamp } + // print compiler name if requested + if (CIPrintCompilerName) st->print("%s:", CompileBroker::compiler_name(comp_level)); st->print("%4d ", compile_id); // print compilation number

// For unloaded methods the transition to zombie occurs after the
// method is cleared so it's impossible to report accurate
// information for that case.

*** 516,526 **** --- 523,534 ---- } // else compile_kind='c2c' if (!method.is_null()) log->method(method); if (_osr_bci != CompileBroker::standard_entry_bci) { log->print(" osr_bci='%d'", _osr_bci); } ~~if (_comp_level != CompLevel_highest_tier) {~~ + // Always print the level in tiered. + if (_comp_level != CompLevel_highest_tier || TieredCompilation) { log->print(" level='%d'", _comp_level); } if (_is_blocking) { log->print(" blocking='1'"); }

*** 553,562 **** --- 561,588 ---- xtty->end_elem(); }

// ------------------------------------------------------------------ + // CompileTask::log_task_dequeued + void CompileTask::log_task_dequeued(const char comment) {* + if (LogCompilation && xtty != NULL) { + Thread thread = Thread::current();* + ttyLocker ttyl; + ResourceMark rm(thread); + + xtty->begin_elem("task_dequeued"); + log_task(xtty); + if (comment != NULL) { + xtty->print(" comment='%s'", comment); + } + xtty->end_elem(); + } + } + + + // ------------------------------------------------------------------ // CompileTask::log_task_start void CompileTask::log_task_start(CompileLog* log) { log->begin_head("task"); log_task(log); log->end_head();

*** 869,888 **** --- 895,940 ---- } #ifndef SHARK // Set the interface to the current compiler(s). int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); + + #if INCLUDE_JVMCI + if (EnableJVMCI) { + // This is creating a JVMCICompiler singleton. + JVMCICompiler jvmci = new JVMCICompiler();* + + if (UseJVMCICompiler) { + _compilers[1] = jvmci; + if (FLAG_IS_DEFAULT(JVMCIThreads)) { + if (BootstrapJVMCI) { + // JVMCI will bootstrap so give it more threads + c2_count = MIN2(32, os::active_processor_count()); + } + } else { + c2_count = JVMCIThreads; + } + if (FLAG_IS_DEFAULT(JVMCIHostThreads)) { + } else { + c1_count = JVMCIHostThreads; + } + } + } + #endif + #ifdef COMPILER1 if (c1_count > 0) { _compilers[0] = new Compiler(); } #endif // COMPILER1

#ifdef COMPILER2 + if (true JVMCI_ONLY( && !UseJVMCICompiler)) { if (c2_count > 0) { _compilers[1] = new C2Compiler(); } + } #endif // COMPILER2

#else // SHARK int c1_count = 0; int c2_count = 1;

* 1097,1107 --- 1149,1159 ----
char name_buffer[256]; const bool compiler_thread = true; for (int i = 0; i < c2_compiler_count; i++) { // Create a name for our thread. ! sprintf(name_buffer, "C2 CompilerThread%d", i); ! sprintf(name_buffer, "%s CompilerThread%d", _compilers[1]->name(), i);** CompilerCounters* counters = new CompilerCounters("compilerThread", i, CHECK); // Shark and C2 make_thread(name_buffer, _c2_compile_queue, counters, _compilers[1], compiler_thread, CHECK); }

*** 1167,1177 **** --- 1219,1229 ---- tty->print("request: "); method->print_short_name(tty); if (osr_bci != InvocationEntryBci) { tty->print(" osr_bci: %d", osr_bci); } ! tty->print(" level: %d comment: %s count: %d", comp_level, comment, hot_count); if (!hot_method.is_null()) { tty->print(" hot: "); if (hot_method() != method()) { hot_method->print_short_name(tty); } else {

*** 1259,1268 **** --- 1311,1355 ---- }

  // Should this thread wait for completion of the compile?
  blocking = is_compile_blocking();

+ #if INCLUDE_JVMCI + if (UseJVMCICompiler) { + if (blocking) { + // Don't allow blocking compiles for requests triggered by JVMCI. + if (thread->is_Compiler_thread()) { + blocking = false; + } + + // Don't allow blocking compiles if inside a class initializer or while performing class loading + vframeStream vfst((JavaThread) thread);* + for (; !vfst.at_end(); vfst.next()) { + if (vfst.method()->is_static_initializer() || + (vfst.method()->method_holder()->is_subclass_of(SystemDictionary::ClassLoader_klass()) && + vfst.method()->name() == vmSymbols::loadClass_name())) { + blocking = false; + break; + } + } + + // Don't allow blocking compilation requests to JVMCI + // if JVMCI itself is not yet initialized + if (!JVMCIRuntime::is_HotSpotJVMCIRuntime_initialized() && compiler(comp_level)->is_jvmci()) { + blocking = false; + } + + // Don't allow blocking compilation requests if we are in JVMCIRuntime::shutdown + // to avoid deadlock between compiler thread(s) and threads run at shutdown + // such as the DestroyJavaVM thread. + if (JVMCIRuntime::shutdown_called()) { + blocking = false; + } + } + } + #endif + // We will enter the compilation in the queue. // 14012000: Note that this sets the queued_for_compile bits in // the target method. We can now reason that a method cannot be // queued for compilation more than once, as follows: // Before a thread queues a task for compilation, it first acquires

*** 1440,1450 **** --- 1527,1540 ---- compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, THREAD); }

// return requested nmethod
// We accept a higher level osr method

~~return osr_bci == InvocationEntryBci ? method->code() : method->lookup_osr_nmethod_for(osr_bci, comp_level, false);~~ + if (osr_bci == InvocationEntryBci) { + return method->code(); + } + return method->lookup_osr_nmethod_for(osr_bci, comp_level, false); }

// ------------------------------------------------------------------ // CompileBroker::compilation_is_complete

*** 1563,1572 **** --- 1653,1671 ---- // only _compilation_id is incremented. return Atomic::add(1, &_compilation_id); #endif }

+ // ------------------------------------------------------------------ + // CompileBroker::assign_compile_id_unlocked + // + // Public wrapper for assign_compile_id that acquires the needed locks + uint CompileBroker::assign_compile_id_unlocked(Thread thread, methodHandle method, int osr_bci) {* + MutexLocker locker(MethodCompileQueue_lock, thread); + return assign_compile_id(method, osr_bci); + } + /**

Should the current thread block until this compilation request
has been fulfilled? */ bool CompileBroker::is_compile_blocking() {

*** 1922,1931 **** --- 2021,2059 ---- } ttyLocker ttyl; tty->print("%s", s.as_string()); }

+ void CompileBroker::post_compile(CompilerThread thread, CompileTask task, EventCompilation& event, bool success, ciEnv* ci_env) {** + + if (success) { + task->mark_success(); + if (ci_env != NULL) { + task->set_num_inlined_bytecodes(ci_env->num_inlined_bytecodes()); + } + if (_compilation_log != NULL) { + nmethod code = task->code();* + if (code != NULL) { + _compilation_log->log_nmethod(thread, code); + } + } + } + + // simulate crash during compilation + assert(task->compile_id() != CICrashAt, "just as planned"); + if (event.should_commit()) { + event.set_method(task->method()); + event.set_compileID(task->compile_id()); + event.set_compileLevel(task->comp_level()); + event.set_succeded(task->is_success()); + event.set_isOsr(task->osr_bci() != CompileBroker::standard_entry_bci); + event.set_codeSize((task->code() == NULL) ? 0 : task->code()->total_size()); + event.set_inlinedBytes(task->num_inlined_bytecodes()); + event.commit(); + } + } + // ------------------------------------------------------------------ // CompileBroker::invoke_compiler_on_method // // Compile a method. //

*** 1970,1985 **** --- 2098,2128 ----

// Allocate a new set of JNI handles.
push_jni_handle_block();
Method* target_handle = task->method();
int compilable = ciEnv::MethodCompilable;

{ + AbstractCompiler comp = compiler(task_level); + int system_dictionary_modification_counter; { MutexLocker locker(Compile_lock, thread); system_dictionary_modification_counter = SystemDictionary::number_of_modifications(); } + #if INCLUDE_JVMCI + if (UseJVMCICompiler && comp != NULL && comp->is_jvmci()) { + JVMCICompiler jvmci = (JVMCICompiler) comp;* + + TraceTime t1("compilation", &time); + EventCompilation event; + + JVMCIEnv env(task, system_dictionary_modification_counter); + jvmci->compile_method(target_handle, osr_bci, &env); + + post_compile(thread, task, event, task->code() != NULL, NULL); + } else + #endif + {

  NoHandleMark  nhm;
  ThreadToNativeFromVM ttn(thread);

  ciEnv ci_env(task, system_dictionary_modification_counter);

*** 2001,2011 **** --- 2144,2153 ---- ciMethod* target = ci_env.get_method_from_handle(target_handle);

  TraceTime t1("compilation", &time);
  EventCompilation event;

~~*AbstractCompiler comp = compiler(task_level);~~ if (comp == NULL) { ci_env.record_method_not_compilable("no compiler", !TieredCompilation); } else { if (WhiteBoxAPI && WhiteBox::compilation_locked) { MonitorLockerEx locker(Compilation_lock, Mutex::_no_safepoint_check_flag);

* 2037,2068 --- 2179,2191 ---- FormatBufferResource msg = retry_message != NULL ? err_msg_res("COMPILE SKIPPED: %s (%s)", ci_env.failure_reason(), retry_message) : err_msg_res("COMPILE SKIPPED: %s", ci_env.failure_reason()); task->print_compilation(tty, msg); } } else { task->mark_success(); task->set_num_inlined_bytecodes(ci_env.num_inlined_bytecodes()); if (_compilation_log != NULL) {** nmethod code = task->code();* if (code != NULL) { _compilation_log->log_nmethod(thread, code); } } } // simulate crash during compilation assert(task->compile_id() != CICrashAt, "just as planned"); if (event.should_commit()) { event.set_method(target->get_Method()); event.set_compileID(compile_id); event.set_compileLevel(task->comp_level()); event.set_succeded(task->is_success()); event.set_isOsr(is_osr); event.set_codeSize((task->code() == NULL) ? 0 : task->code()->total_size()); event.set_inlinedBytes(task->num_inlined_bytecodes()); event.commit(); } + + post_compile(thread, task, event, !ci_env.failing(), &ci_env); } pop_jni_handle_block();
methodHandle method(thread, task->method());

*** 2309,2325 **** --- 2432,2454 ---- // java.lang.management.CompilationMBean _perf_total_compilation->inc(time.ticks()); _peak_compilation_time = time.milliseconds() > _peak_compilation_time ? time.milliseconds() : _peak_compilation_time;

  if (CITime) {

+ int bytes_compiled = method->code_size() + task->num_inlined_bytecodes(); + JVMCI_ONLY(CompilerStatistics stats = compiler(task->comp_level())->stats();)* if (is_osr) { _t_osr_compilation.add(time); ! _sum_osr_bytes_compiled += ~~method->code_size() + task->num_inlined_bytecodes()~~; ! _sum_osr_bytes_compiled += bytes_compiled; + JVMCI_ONLY(stats->_osr.update(time, bytes_compiled);) } else { _t_standard_compilation.add(time); _sum_standard_bytes_compiled += method->code_size() + task->num_inlined_bytecodes(); + JVMCI_ONLY(stats->_standard.update(time, bytes_compiled);) } + JVMCI_ONLY(stats->_nmethods_size += code->total_size();) + JVMCI_ONLY(stats->_nmethods_code_size += code->insts_size();) }

  if (UsePerfData) {
    // save the name of the last method compiled
    _perf_last_method->set_value(counters->current_method());

*** 2371,2396 **** --- 2500,2609 ---- } else { return (comp->name()); } }

~~void CompileBroker::print_times() {~~ + #if INCLUDE_JVMCI + void CompileBroker::print_times(AbstractCompiler comp) {* + CompilerStatistics stats = comp->stats();* + tty->print_cr(" %s {speed: %d bytes/s; standard: %6.3f s, %d bytes, %d methods; osr: %6.3f s, %d bytes, %d methods; nmethods_size: %d bytes; nmethods_code_size: %d bytes}", + comp->name(), stats->bytes_per_second(), + stats->_standard._time.seconds(), stats->_standard._bytes, stats->_standard._count, + stats->_osr._time.seconds(), stats->_osr._bytes, stats->_osr._count, + stats->_nmethods_size, stats->_nmethods_code_size); + comp->print_timers(); + } + #endif + + void CompileBroker::print_times(bool per_compiler, bool aggregate) { + #if INCLUDE_JVMCI + elapsedTimer standard_compilation; + elapsedTimer total_compilation; + elapsedTimer osr_compilation; + + int standard_bytes_compiled = 0; + int osr_bytes_compiled = 0; + + int standard_compile_count = 0; + int osr_compile_count = 0; + int total_compile_count = 0; + + int nmethods_size = 0; + int nmethods_code_size = 0; + bool printedHeader = false; + + for (unsigned int i = 0; i < sizeof(_compilers) / sizeof(AbstractCompiler*); i++) {** **+ AbstractCompiler* comp = _compilers[i];** **+ if (comp != NULL) {** **+ if (per_compiler && aggregate && !printedHeader) {** **+ printedHeader = true;** **+ tty->cr(); + tty->print_cr("Individual compiler times (for compiled methods only)"); + tty->print_cr("------------------------------------------------"); + tty->cr(); + } + CompilerStatistics stats = comp->stats();* + + standard_compilation.add(stats->_standard._time); + osr_compilation.add(stats->_osr._time); + + standard_bytes_compiled += stats->_standard._bytes; + osr_bytes_compiled += stats->_osr._bytes; + + standard_compile_count += stats->_standard._count; + osr_compile_count += stats->_osr._count; + + nmethods_size += stats->_nmethods_size; + nmethods_code_size += stats->_nmethods_code_size; + + if (per_compiler) { + print_times(comp); + } + } + } + total_compile_count = osr_compile_count + standard_compile_count; + total_compilation.add(osr_compilation); + total_compilation.add(standard_compilation); + + // In hosted mode, print the JVMCI compiler specific counters manually. + if (!UseJVMCICompiler) { + JVMCICompiler::print_compilation_timers(); + } + #else + elapsedTimer standard_compilation = CompileBroker::_t_standard_compilation; + elapsedTimer osr_compilation = CompileBroker::_t_osr_compilation; + elapsedTimer total_compilation = CompileBroker::_t_total_compilation; + + int standard_bytes_compiled = CompileBroker::_sum_standard_bytes_compiled; + int osr_bytes_compiled = CompileBroker::_sum_osr_bytes_compiled; + + int standard_compile_count = CompileBroker::_total_standard_compile_count; + int osr_compile_count = CompileBroker::_total_osr_compile_count; + int total_compile_count = CompileBroker::_total_compile_count; + + int nmethods_size = CompileBroker::_sum_nmethod_code_size; + int nmethods_code_size = CompileBroker::_sum_nmethod_size; + #endif + + if (!aggregate) { + return; + } tty->cr(); tty->print_cr("Accumulated compiler times"); tty->print_cr("----------------------------------------------------------"); //0000000000111111111122222222223333333333444444444455555555556666666666 //0123456789012345678901234567890123456789012345678901234567890123456789 - tty->print_cr(" Total compilation time : %7.3f s", ~~CompileBroker::t~~total_compilation.seconds()); tty->print_cr(" Standard compilation : %7.3f s, Average : %2.3f s", - ~~CompileBroker::t~~standard_compilation.seconds(), ! ~~CompileBroker::t~~standard_compilation.seconds() / CompileBroker::totalstandard_compile_count); tty->print_cr(" Bailed out compilation : %7.3f s, Average : %2.3f s", CompileBroker::_t_bailedout_compilation.seconds(), CompileBroker::_t_bailedout_compilation.seconds() / CompileBroker::_total_bailout_count); tty->print_cr(" On stack replacement : %7.3f s, Average : %2.3f s", - ~~CompileBroker::t~~osr_compilation.seconds(), ! ~~CompileBroker::t~~osr_compilation.seconds() / CompileBroker::totalosr_compile_count); tty->print_cr(" Invalidated : %7.3f s, Average : %2.3f s", CompileBroker::_t_invalidated_compilation.seconds(), CompileBroker::_t_invalidated_compilation.seconds() / CompileBroker::_total_invalidated_count);

AbstractCompiler *comp = compiler(CompLevel_simple);

*** 2402,2423 **** --- 2615,2637 ---- if (comp != NULL) { tty->cr(); comp->print_timers(); } tty->cr(); - tty->print_cr(" Total compiled methods : %8d methods", ~~CompileBroker::_~~total_compile_count); - tty->print_cr(" Standard compilation : %8d methods", CompileBroker::totalstandard_compile_count); - tty->print_cr(" On stack replacement : %8d methods", CompileBroker::totalosr_compile_count); ! int tcb = CompileBroker::sumosr_bytes_compiled + CompileBroker::sumstandard_bytes_compiled; tty->print_cr(" Total compiled bytecodes : %8d bytes", tcb); - tty->print_cr(" Standard compilation : %8d bytes", CompileBroker::sumstandard_bytes_compiled); - tty->print_cr(" On stack replacement : %8d bytes", CompileBroker::sumosr_bytes_compiled); ! ~~int bps = (int)(tcb / CompileBroker::_t_total_compilation.seconds()~~); ! double tcs = total_compilation.seconds(); + int bps = tcs == 0.0 ? 0 : (int)(tcb / tcs); tty->print_cr(" Average compilation speed : %8d bytes/s", bps); tty->cr(); ! tty->print_cr(" nmethod code size : %8d bytes", ~~CompileBroker::_sum_nmethod_code_size~~); ! tty->print_cr(" nmethod total size : %8d bytes", ~~CompileBroker::_sum_nmethod_size~~); ! tty->print_cr(" nmethod code size : %8d bytes", nmethods_code_size); ! tty->print_cr(" nmethod total size : %8d bytes", nmethods_size); }

// Debugging output for failure void CompileBroker::print_last_compile() { if ( _last_compile_level != CompLevel_none &&

src/share/vm/compiler/compileBroker.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File