jdk-sandbox: comparison hotspot/src/share/vm/compiler/compileBroker.cpp

equal deleted inserted replaced

-:5a0b66604a5b
+:20c2c4dc8b77
 HS_DTRACE_PROBE_DECL8(hotspot, method__compile__begin,
 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t);
 HS_DTRACE_PROBE_DECL9(hotspot, method__compile__end,
 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t, bool);
-#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method)              \
+#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method, comp_name)   \
 {                                                                      \
-char* comp_name = (char*)(compiler)->name();                         \
 Symbol* klass_name = (method)->klass_name();                         \
 Symbol* name = (method)->name();                                     \
 Symbol* signature = (method)->signature();                           \
 HS_DTRACE_PROBE8(hotspot, method__compile__begin,                    \
 comp_name, strlen(comp_name),                                      \
 klass_name->bytes(), klass_name->utf8_length(),                    \
 name->bytes(), name->utf8_length(),                                \
 signature->bytes(), signature->utf8_length());                     \
 }
-#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success)       \
+#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method,                \
+comp_name, success)              \
 {                                                                      \
-char* comp_name = (char*)(compiler)->name();                         \
 Symbol* klass_name = (method)->klass_name();                         \
 Symbol* name = (method)->name();                                     \
 Symbol* signature = (method)->signature();                           \
 HS_DTRACE_PROBE9(hotspot, method__compile__end,                      \
 comp_name, strlen(comp_name),                                      \
 signature->bytes(), signature->utf8_length(), (success));          \
 }
 #else /* USDT2 */
-#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method)              \
+#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method, comp_name)   \
 {                                                                      \
-char* comp_name = (char*)(compiler)->name();                         \
 Symbol* klass_name = (method)->klass_name();                         \
 Symbol* name = (method)->name();                                     \
 Symbol* signature = (method)->signature();                           \
-HOTSPOT_METHOD_COMPILE_BEGIN(                                       \
+HOTSPOT_METHOD_COMPILE_BEGIN(                                        \
 comp_name, strlen(comp_name),                                      \
-(char *) klass_name->bytes(), klass_name->utf8_length(),          \
+(char *) klass_name->bytes(), klass_name->utf8_length(),           \
 (char *) name->bytes(), name->utf8_length(),                       \
 (char *) signature->bytes(), signature->utf8_length());            \
 }
-#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success)       \
+#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method,                \
+comp_name, success)              \
 {                                                                      \
-char* comp_name = (char*)(compiler)->name();                         \
 Symbol* klass_name = (method)->klass_name();                         \
 Symbol* name = (method)->name();                                     \
 Symbol* signature = (method)->signature();                           \
 HOTSPOT_METHOD_COMPILE_END(                                          \
 comp_name, strlen(comp_name),                                      \
 }
 #endif /* USDT2 */
 #else //  ndef DTRACE_ENABLED
-#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method)
+#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method, comp_name)
-#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success)
+#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, comp_name, success)
 #endif // ndef DTRACE_ENABLED
 bool CompileBroker::_initialized = false;
 volatile bool CompileBroker::_should_block = false;
 //
 // Otherwise it's the same as CompileTask::print_line()
 //
 void CompileTask::print_line_on_error(outputStream* st, char* buf, int buflen) {
 // print compiler name
-st->print("%s:", CompileBroker::compiler(comp_level())->name());
+st->print("%s:", CompileBroker::compiler_name(comp_level()));
 print_compilation(st);
 }
 // ------------------------------------------------------------------
 // CompileTask::print_line
 void CompileTask::print_line() {
 ttyLocker ttyl;  // keep the following output all in one block
 // print compiler name if requested
-if (CIPrintCompilerName) tty->print("%s:", CompileBroker::compiler(comp_level())->name());
+if (CIPrintCompilerName) tty->print("%s:", CompileBroker::compiler_name(comp_level()));
 print_compilation();
 }
 // ------------------------------------------------------------------
 // return quickly if possible
 // lock, make sure that the compilation
 // isn't prohibited in a straightforward way.
+AbstractCompiler *comp = CompileBroker::compiler(comp_level);
-if (compiler(comp_level) == NULL || !compiler(comp_level)->can_compile_method(method) || compilation_is_prohibited(method, osr_bci, comp_level)) {
+if (comp == NULL || !comp->can_compile_method(method) ||
+compilation_is_prohibited(method, osr_bci, comp_level)) {
 return NULL;
 }
 if (osr_bci == InvocationEntryBci) {
 // standard compilation
 if (method->is_not_osr_compilable(comp_level)) return NULL;
 }
 assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
 // some prerequisites that are compiler specific
-if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_shark()) {
+if (comp->is_c2() || comp->is_shark()) {
 method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NULL);
 // Resolve all classes seen in the signature of the method
 // we are compiling.
 Method::load_signature_classes(method, CHECK_AND_CLEAR_NULL);
 }
 //
 // See if this compilation is not allowed.
 bool CompileBroker::compilation_is_prohibited(methodHandle method, int osr_bci, int comp_level) {
 bool is_native = method->is_native();
 // Some compilers may not support the compilation of natives.
+AbstractCompiler *comp = compiler(comp_level);
 if (is_native &&
-(!CICompileNatives || !compiler(comp_level)->supports_native())) {
+(!CICompileNatives || comp == NULL || !comp->supports_native())) {
 method->set_not_compilable_quietly(comp_level);
 return true;
 }
 bool is_osr = (osr_bci != standard_entry_bci);
 // Some compilers may not support on stack replacement.
 if (is_osr &&
-(!CICompileOSR || !compiler(comp_level)->supports_osr())) {
+(!CICompileOSR || comp == NULL || !comp->supports_osr())) {
 method->set_not_osr_compilable(comp_level);
 return true;
 }
 // The method may be explicitly excluded by the user.
 uint compile_id = task->compile_id();
 int osr_bci = task->osr_bci();
 bool is_osr = (osr_bci != standard_entry_bci);
 bool should_log = (thread->log() != NULL);
 bool should_break = false;
+int task_level = task->comp_level();
 {
 // create the handle inside it's own block so it can't
 // accidentally be referenced once the thread transitions to
 // native.  The NoHandleMark before the transition should catch
 // any cases where this occurs in the future.
 should_log = false;
 }
 assert(!method->is_native(), "no longer compile natives");
 // Save information about this method in case of failure.
-set_last_compile(thread, method, is_osr, task->comp_level());
+set_last_compile(thread, method, is_osr, task_level);
-DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler(task->comp_level()), method);
+DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler(task_level), method,
+compiler_name(task_level));
 }
 // Allocate a new set of JNI handles.
 push_jni_handle_block();
 Method* target_handle = task->method();
 ciMethod* target = ci_env.get_method_from_handle(target_handle);
 TraceTime t1("compilation", &time);
-compiler(task->comp_level())->compile_method(&ci_env, target, osr_bci);
+AbstractCompiler *comp = compiler(task_level);
+if (comp == NULL) {
+ci_env.record_method_not_compilable("no compiler", !TieredCompilation);
+} else {
+comp->compile_method(&ci_env, target, osr_bci);
+}
 if (!ci_env.failing() && task->code() == NULL) {
 //assert(false, "compiler should always document failure");
 // The compiler elected, without comment, not to register a result.
 // Do not attempt further compilations of this method.
 }
 pop_jni_handle_block();
 methodHandle method(thread, task->method());
-DTRACE_METHOD_COMPILE_END_PROBE(compiler(task->comp_level()), method, task->is_success());
+DTRACE_METHOD_COMPILE_END_PROBE(compiler(task_level), method,
+compiler_name(task_level), task->is_success());
 collect_statistics(thread, time, task);
 if (PrintCompilation && PrintCompilation2) {
 tty->print("%7d ", (int) tty->time_stamp().milliseconds());  // print timestamp
 else
 method->set_not_compilable_quietly();
 break;
 case ciEnv::MethodCompilable_not_at_tier:
 if (is_osr)
-method->set_not_osr_compilable_quietly(task->comp_level());
+method->set_not_osr_compilable_quietly(task_level);
 else
-method->set_not_compilable_quietly(task->comp_level());
+method->set_not_compilable_quietly(task_level);
 break;
 }
 // Note that the queued_for_compilation bits are cleared without
 // protection of a mutex. [They were set by the requester thread,
 }
 // set the current method for the thread to null
 if (UsePerfData) counters->set_current_method("");
 }
+const char* CompileBroker::compiler_name(int comp_level) {
+AbstractCompiler *comp = CompileBroker::compiler(comp_level);
+if (comp == NULL) {
+return "no compiler";
+} else {
+return (comp->name());
+}
+}
 void CompileBroker::print_times() {
 tty->cr();
 tty->print_cr("Accumulated compiler times (for compiled methods only)");
 tty->print_cr("------------------------------------------------");
 tty->print_cr("    Standard compilation   : %6.3f s, Average : %2.3f",
 CompileBroker::_t_standard_compilation.seconds(),
 CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
 tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
-if (compiler(CompLevel_simple) != NULL) {
+AbstractCompiler *comp = compiler(CompLevel_simple);
-compiler(CompLevel_simple)->print_timers();
+if (comp != NULL) {
-}
+comp->print_timers();
-if (compiler(CompLevel_full_optimization) != NULL) {
+}
-compiler(CompLevel_full_optimization)->print_timers();
+comp = compiler(CompLevel_full_optimization);
+if (comp != NULL) {
+comp->print_timers();
 }
 tty->cr();
 int tcb = CompileBroker::_sum_osr_bytes_compiled + CompileBroker::_sum_standard_bytes_compiled;
 tty->print_cr("  Total compiled bytecodes : %6d bytes", tcb);
 tty->print_cr("    Standard compilation   : %6d bytes", CompileBroker::_sum_standard_bytes_compiled);

changeset 16372	20c2c4dc8b77
parent 15946	f688e7528dc6
child 16611	6807a703dd6b