truffle: src/share/vm/ci/ciEnv.cpp comparison

comparison src/share/vm/ci/ciEnv.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Wed, 15 Oct 2014 16:02:50 +0200
parents	4ca6dc0799b6 78bbf4d43a14
children	7848fc12602b

comparison

equal deleted inserted replaced

-:45d7b2c7029d
+:52b4284cb496
 /*
-* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 ExceptionHandlerTable* handler_table,
 ImplicitExceptionTable* inc_table,
 AbstractCompiler* compiler,
 int comp_level,
 bool has_unsafe_access,
-bool has_wide_vectors) {
+bool has_wide_vectors,
+RTMState  rtm_state) {
 VM_ENTRY_MARK;
 nmethod* nm = NULL;
 {
 // To prevent compile queue updates.
 MutexLocker locker(MethodCompileQueue_lock, THREAD);
 validate_compile_task_dependencies(target);
 }
 methodHandle method(THREAD, target->get_Method());
+#if INCLUDE_RTM_OPT
+if (!failing() && (rtm_state != NoRTM) &&
+(method()->method_data() != NULL) &&
+(method()->method_data()->rtm_state() != rtm_state)) {
+// Preemptive decompile if rtm state was changed.
+record_failure("RTM state change invalidated rtm code");
+}
+#endif
 if (failing()) {
 // While not a true deoptimization, it is a preemptive decompile.
 MethodData* mdo = method()->method_data();
 if (mdo != NULL) {
 mdo->inc_decompile_count();
 orig_pc_offset,
 debug_info(), dependencies(), code_buffer,
 frame_words, oop_map_set,
 handler_table, inc_table,
 compiler, comp_level);
 // Free codeBlobs
 code_buffer->free_blob();
 if (nm != NULL) {
 nm->set_has_unsafe_access(has_unsafe_access);
 nm->set_has_wide_vectors(has_wide_vectors);
+#if INCLUDE_RTM_OPT
+nm->set_rtm_state(rtm_state);
+#endif
 // Record successful registration.
 // (Put nm into the task handle *before* publishing to the Java heap.)
 if (task() != NULL) {
 task()->set_code(nm);
 // ------------------------------------------------------------------
 // ciEnv::dump_replay_data*
 // Don't change thread state and acquire any locks.
 // Safe to call from VM error reporter.
+void ciEnv::dump_compile_data(outputStream* out) {
+CompileTask* task = this->task();
+Method* method = task->method();
+int entry_bci = task->osr_bci();
+int comp_level = task->comp_level();
+out->print("compile %s %s %s %d %d",
+method->klass_name()->as_quoted_ascii(),
+method->name()->as_quoted_ascii(),
+method->signature()->as_quoted_ascii(),
+entry_bci, comp_level);
+if (compiler_data() != NULL) {
+if (is_c2_compile(comp_level)) { // C2 or Shark
+#ifdef COMPILER2
+// Dump C2 inlining data.
+((Compile*)compiler_data())->dump_inline_data(out);
+#endif
+} else if (is_c1_compile(comp_level)) { // C1
+#ifdef COMPILER1
+// Dump C1 inlining data.
+((Compilation*)compiler_data())->dump_inline_data(out);
+#endif
+}
+}
+out->cr();
+}
 void ciEnv::dump_replay_data_unsafe(outputStream* out) {
 ResourceMark rm;
 #if INCLUDE_JVMTI
 out->print_cr("JvmtiExport can_access_local_variables %d",     _jvmti_can_access_local_variables);
 out->print_cr("JvmtiExport can_hotswap_or_post_breakpoint %d", _jvmti_can_hotswap_or_post_breakpoint);
 GrowableArray<ciMetadata*>* objects = _factory->get_ci_metadata();
 out->print_cr("# %d ciObject found", objects->length());
 for (int i = 0; i < objects->length(); i++) {
 objects->at(i)->dump_replay_data(out);
 }
-CompileTask* task = this->task();
+dump_compile_data(out);
-Method* method = task->method();
-int entry_bci = task->osr_bci();
-int comp_level = task->comp_level();
-// Klass holder = method->method_holder();
-out->print_cr("compile %s %s %s %d %d",
-method->klass_name()->as_quoted_ascii(),
-method->name()->as_quoted_ascii(),
-method->signature()->as_quoted_ascii(),
-entry_bci, comp_level);
 out->flush();
 }
 void ciEnv::dump_replay_data(outputStream* out) {
 GUARDED_VM_ENTRY(
 MutexLocker ml(Compile_lock);
 dump_replay_data_unsafe(out);
 )
 }
+void ciEnv::dump_replay_data(int compile_id) {
+static char buffer[O_BUFLEN];
+int ret = jio_snprintf(buffer, O_BUFLEN, "replay_pid%p_compid%d.log", os::current_process_id(), compile_id);
+if (ret > 0) {
+int fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
+if (fd != -1) {
+FILE* replay_data_file = os::open(fd, "w");
+if (replay_data_file != NULL) {
+fileStream replay_data_stream(replay_data_file, /*need_close=*/true);
+dump_replay_data(&replay_data_stream);
+tty->print_cr("# Compiler replay data is saved as: %s", buffer);
+} else {
+tty->print_cr("# Can't open file to dump replay data.");
+}
+}
+}
+}
+void ciEnv::dump_inline_data(int compile_id) {
+static char buffer[O_BUFLEN];
+int ret = jio_snprintf(buffer, O_BUFLEN, "inline_pid%p_compid%d.log", os::current_process_id(), compile_id);
+if (ret > 0) {
+int fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
+if (fd != -1) {
+FILE* inline_data_file = os::open(fd, "w");
+if (inline_data_file != NULL) {
+fileStream replay_data_stream(inline_data_file, /*need_close=*/true);
+GUARDED_VM_ENTRY(
+MutexLocker ml(Compile_lock);
+dump_compile_data(&replay_data_stream);
+)
+replay_data_stream.flush();
+tty->print("# Compiler inline data is saved as: ");
+tty->print_cr("%s", buffer);
+} else {
+tty->print_cr("# Can't open file to dump inline data.");
+}
+}
+}
+}

Mercurial > hg > truffle

comparison src/share/vm/ci/ciEnv.cpp @ 18041:52b4284cb496