graal-compiler: src/share/vm/graal/graalVMEntries.cpp comparison

comparison src/share/vm/graal/graalVMEntries.cpp @ 3570:da1b32a58d7e

Merge.

author	Thomas Wuerthinger <thomas@wuerthinger.net>
date	Fri, 02 Sep 2011 18:29:16 +0200
parents	76a7f1732bb0 dbf8d6a4201f
children	a72615456c50

comparison

equal deleted inserted replaced

-:76a7f1732bb0
+:da1b32a58d7e
 }
 // public native int RiMethod_exceptionProbability(long vmId, int bci);
 JNIEXPORT jint JNICALL Java_com_oracle_graal_runtime_VMEntries_RiMethod_2exceptionProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) {
 TRACE_graal_3("VMEntries::RiMethod_exceptionProbability");
-ciMethod* cimethod;
 {
 VM_ENTRY_MARK;
 methodOop method = getMethodFromHotSpotMethod(hotspot_method);
-cimethod = (ciMethod*)CURRENT_ENV->get_object(method);
+methodDataOop method_data = method->method_data();
-}
+if (method_data == NULL || !method_data->is_mature()) {
-ciMethodData* method_data = cimethod->method_data();
+return -1;
+}
-if (method_data == NULL || !method_data->is_mature()) return -1;
+ProfileData* data = method_data->bci_to_data(bci);
+if (data == NULL) {
-ciProfileData* profile = method_data->bci_to_data(bci);
+return 0;
-if (profile == NULL) {
+}
-return 0;
+uint trap = Deoptimization::trap_state_is_recompiled(data->trap_state())? 1: 0;
-}
+if (trap > 0) {
-uint trap = method_data->trap_recompiled_at(profile);
+return 100;
-if (trap > 0) {
+} else {
-return 100;
+return trap;
-} else {
+}
-return trap;
+}
 }
+// ------------------------------------------------------------------
+// Adjust a CounterData count to be commensurate with
+// interpreter_invocation_count.  If the MDO exists for
+// only 25% of the time the method exists, then the
+// counts in the MDO should be scaled by 4X, so that
+// they can be usefully and stably compared against the
+// invocation counts in methods.
+int scale_count(methodDataOop method_data, int count) {
+if (count > 0) {
+int counter_life;
+int method_life = method_data->method()->interpreter_invocation_count();
+int current_mileage = methodDataOopDesc::mileage_of(method_data->method());
+int creation_mileage = method_data->creation_mileage();
+counter_life = current_mileage - creation_mileage;
+// counter_life due to backedge_counter could be > method_life
+if (counter_life > method_life)
+counter_life = method_life;
+if (0 < counter_life && counter_life <= method_life) {
+count = (int)((double)count * method_life / counter_life + 0.5);
+count = (count > 0) ? count : 1;
+}
+}
+return count;
 }
 // public native RiTypeProfile RiMethod_typeProfile(long vmId, int bci);
 JNIEXPORT jobject JNICALL Java_com_oracle_graal_runtime_VMEntries_RiMethod_2typeProfile(JNIEnv *, jobject, jobject hotspot_method, jint bci) {
 TRACE_graal_3("VMEntries::RiMethod_typeProfile");
-ciMethod* cimethod;
-{
-VM_ENTRY_MARK;
-methodOop method = getMethodFromHotSpotMethod(hotspot_method);
-cimethod = (ciMethod*)CURRENT_ENV->get_object(method);
-}
-ciCallProfile profile = cimethod->call_profile_at_bci(bci);
 Handle obj;
 {
 VM_ENTRY_MARK;
-instanceKlass::cast(RiTypeProfile::klass())->initialize(CHECK_NULL);
+methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
-obj = instanceKlass::cast(RiTypeProfile::klass())->allocate_instance(CHECK_NULL);
+if (strstr(method->name_and_sig_as_C_string(), "factor") != NULL) {
-assert(obj() != NULL, "must succeed in allocating instance");
+//      tty->print_cr("here");
+}
-RiTypeProfile::set_count(obj, cimethod->scale_count(profile.count(), 1));
+if (bci == 123) {
-RiTypeProfile::set_morphism(obj, profile.morphism());
+//      tty->print_cr("here2");
+}
-typeArrayHandle probabilities = oopFactory::new_typeArray(T_FLOAT, profile.limit(), CHECK_NULL);
+methodDataHandle method_data = method->method_data();
-objArrayHandle types = oopFactory::new_objArray(SystemDictionary::RiType_klass(), profile.limit(), CHECK_NULL);
+if (method_data == NULL || !method_data->is_mature()) {
-for (int i=0; i<profile.limit(); i++) {
+return NULL;
-float prob = profile.receiver_prob(i);
+}
-ciKlass* receiver = profile.receiver(i);
+ProfileData* data = method_data->bci_to_data(bci);
-oop type = GraalCompiler::get_RiType(receiver, KlassHandle(), CHECK_NULL);
+if (data != NULL && data->is_ReceiverTypeData()) {
+ReceiverTypeData* recv = data->as_ReceiverTypeData();
-probabilities->float_at_put(i, prob);
+// determine morphism
-types->obj_at_put(i, type);
+int morphism = 0;
-}
+uint total_count = 0;
+for (uint i = 0; i < recv->row_limit(); i++) {
-RiTypeProfile::set_probabilities(obj, probabilities());
+klassOop receiver = recv->receiver(i);
-RiTypeProfile::set_types(obj, types());
+if (receiver == NULL)  continue;
+morphism++;
+total_count += recv->receiver_count(i);
+}
+instanceKlass::cast(RiTypeProfile::klass())->initialize(CHECK_NULL);
+obj = instanceKlass::cast(RiTypeProfile::klass())->allocate_instance(CHECK_NULL);
+assert(obj() != NULL, "must succeed in allocating instance");
+int count = MAX2(total_count, recv->count());
+RiTypeProfile::set_count(obj, scale_count(method_data(), count));
+RiTypeProfile::set_morphism(obj, morphism);
+if (morphism > 0) {
+typeArrayHandle probabilities = oopFactory::new_typeArray(T_FLOAT, morphism, CHECK_NULL);
+objArrayHandle types = oopFactory::new_objArray(SystemDictionary::RiType_klass(), morphism, CHECK_NULL);
+int pos = 0;
+for (uint i = 0; i < recv->row_limit(); i++) {
+KlassHandle receiver = recv->receiver(i);
+if (receiver.is_null())  continue;
+float prob = recv->receiver_count(i) / (float) total_count;
+oop type = GraalCompiler::get_RiType(receiver, KlassHandle(), CHECK_NULL);
+probabilities->float_at_put(pos, prob);
+types->obj_at_put(pos, type);
+pos++;
+}
+RiTypeProfile::set_probabilities(obj, probabilities());
+RiTypeProfile::set_types(obj, types());
+} else {
+RiTypeProfile::set_probabilities(obj, NULL);
+RiTypeProfile::set_types(obj, NULL);
+}
+}
 }
 return JNIHandles::make_local(obj());
 }

Mercurial > hg > graal-compiler

comparison src/share/vm/graal/graalVMEntries.cpp @ 3570:da1b32a58d7e