graal-compiler: src/share/vm/runtime/compilationPolicy.cpp comparison

comparison src/share/vm/runtime/compilationPolicy.cpp @ 10107:8df6ddda8090

Merge

author	jiangli
date	Mon, 15 Apr 2013 21:25:23 -0400
parents	b84fd7d73702 42a42da29fd7
children	d1c9384eecb4

comparison

equal deleted inserted replaced

-:c60f69931e1a
+:8df6ddda8090
 /*
-* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2013, 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.
 // Make sure invocation and backedge counter doesn't overflow again right away
 // as would be the case for native methods.
 // BUT also make sure the method doesn't look like it was never executed.
 // Set carry bit and reduce counter's value to min(count, CompileThreshold/2).
-m->invocation_counter()->set_carry();
+MethodCounters* mcs = m->method_counters();
-m->backedge_counter()->set_carry();
+assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+mcs->invocation_counter()->set_carry();
+mcs->backedge_counter()->set_carry();
 assert(!m->was_never_executed(), "don't reset to 0 -- could be mistaken for never-executed");
 }
 void NonTieredCompPolicy::reset_counter_for_back_branch_event(methodHandle m) {
 // Delay next back-branch event but pump up invocation counter to triger
 // whole method compilation.
-InvocationCounter* i = m->invocation_counter();
+MethodCounters* mcs = m->method_counters();
-InvocationCounter* b = m->backedge_counter();
+assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+InvocationCounter* i = mcs->invocation_counter();
+InvocationCounter* b = mcs->backedge_counter();
 // Don't set invocation_counter's value too low otherwise the method will
 // look like immature (ic < ~5300) which prevents the inlining based on
 // the type profiling.
 i->set(i->state(), CompileThreshold);
 // is done at each safepoint.
 //
 class CounterDecay : public AllStatic {
 static jlong _last_timestamp;
 static void do_method(Method* m) {
-m->invocation_counter()->decay();
+MethodCounters* mcs = m->method_counters();
+if (mcs != NULL) {
+mcs->invocation_counter()->decay();
+}
 }
 public:
 static void decay();
 static bool is_decay_needed() {
 return (os::javaTimeMillis() - _last_timestamp) > CounterDecayMinIntervalLength;
 }
 }
 void NonTieredCompPolicy::reprofile(ScopeDesc* trap_scope, bool is_osr) {
 ScopeDesc* sd = trap_scope;
+MethodCounters* mcs;
+InvocationCounter* c;
 for (; !sd->is_top(); sd = sd->sender()) {
-// Reset ICs of inlined methods, since they can trigger compilations also.
+mcs = sd->method()->method_counters();
-sd->method()->invocation_counter()->reset();
+if (mcs != NULL) {
-}
+// Reset ICs of inlined methods, since they can trigger compilations also.
-InvocationCounter* c = sd->method()->invocation_counter();
+mcs->invocation_counter()->reset();
-if (is_osr) {
+}
-// It was an OSR method, so bump the count higher.
+}
-c->set(c->state(), CompileThreshold);
+mcs = sd->method()->method_counters();
-} else {
+if (mcs != NULL) {
-c->reset();
+c = mcs->invocation_counter();
-}
+if (is_osr) {
-sd->method()->backedge_counter()->reset();
+// It was an OSR method, so bump the count higher.
+c->set(c->state(), CompileThreshold);
+} else {
+c->reset();
+}
+mcs->backedge_counter()->reset();
+}
 }
 // This method can be called by any component of the runtime to notify the policy
 // that it's recommended to delay the complation of this method.
 void NonTieredCompPolicy::delay_compilation(Method* method) {
-method->invocation_counter()->decay();
+MethodCounters* mcs = method->method_counters();
-method->backedge_counter()->decay();
+if (mcs != NULL) {
+mcs->invocation_counter()->decay();
+mcs->backedge_counter()->decay();
+}
 }
 void NonTieredCompPolicy::disable_compilation(Method* method) {
-method->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
+MethodCounters* mcs = method->method_counters();
-method->backedge_counter()->set_state(InvocationCounter::wait_for_nothing);
+if (mcs != NULL) {
+mcs->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
+mcs->backedge_counter()->set_state(InvocationCounter::wait_for_nothing);
+}
 }
 CompileTask* NonTieredCompPolicy::select_task(CompileQueue* compile_queue) {
 return compile_queue->first();
 }
 }
 #ifndef PRODUCT
 void NonTieredCompPolicy::trace_frequency_counter_overflow(methodHandle m, int branch_bci, int bci) {
 if (TraceInvocationCounterOverflow) {
-InvocationCounter* ic = m->invocation_counter();
+MethodCounters* mcs = m->method_counters();
-InvocationCounter* bc = m->backedge_counter();
+assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+InvocationCounter* ic = mcs->invocation_counter();
+InvocationCounter* bc = mcs->backedge_counter();
 ResourceMark rm;
 const char* msg =
 bci == InvocationEntryBci
 ? "comp-policy cntr ovfl @ %d in entry of "
 : "comp-policy cntr ovfl @ %d in loop of ";

Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/compilationPolicy.cpp @ 10107:8df6ddda8090