Mercurial > hg > truffle

comparison src/share/vm/runtime/compilationPolicy.cpp @ 7226:8a3efb8c831d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents fb16d8681ddc 5d0bb7d52783
children bbf97d6688d3
comparison
equal deleted inserted replaced
7225:31c4d9f9e922 7226:8a3efb8c831d
58 case 0: 58 case 0:
59 CompilationPolicy::set_policy(new SimpleCompPolicy()); 59 CompilationPolicy::set_policy(new SimpleCompPolicy());
60 break; 60 break;
61 61
62 case 1: 62 case 1:
63 #if defined(COMPILER2) || defined(GRAAL) 63 #if defined(COMPILER2)
64 CompilationPolicy::set_policy(new StackWalkCompPolicy()); 64 CompilationPolicy::set_policy(new StackWalkCompPolicy());
65 #else 65 #else
66 Unimplemented(); 66 Unimplemented();
67 #endif 67 #endif
68 break; 68 break;
79 #else 79 #else
80 Unimplemented(); 80 Unimplemented();
81 #endif 81 #endif
82 break; 82 break;
83 case 4: 83 case 4:
84 #if defined(GRAAL) 84 #if defined(GRAALVM)
85 CompilationPolicy::set_policy(new GraalCompPolicy()); 85 CompilationPolicy::set_policy(new GraalCompPolicy());
86 #else 86 #else
87 Unimplemented(); 87 Unimplemented();
88 #endif 88 #endif
89 break; 89 break;
186 return 0; 186 return 0;
187 } 187 }
188 #endif 188 #endif
189 189
190 #ifdef COMPILER1 190 #ifdef COMPILER1
191 GRAAL_ONLY(ShouldNotReachHere();) 191 GRAALVM_ONLY(ShouldNotReachHere();)
192 if (is_c1_compile(comp_level)) { 192 if (is_c1_compile(comp_level)) {
193 return _compiler_count; 193 return _compiler_count;
194 } else { 194 } else {
195 return 0; 195 return 0;
196 } 196 }
440 } 440 }
441 } 441 }
442 442
443 // GraalCompPolicy - compile current method 443 // GraalCompPolicy - compile current method
444 444
445 #ifdef GRAAL 445 #ifdef GRAALVM
446 446
447 void GraalCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) { 447 void GraalCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) {
448 int hot_count = m->invocation_count(); 448 int hot_count = m->invocation_count();
449 jlong hot_time = m->graal_invocation_time(); 449 jlong hot_time = m->graal_invocation_time();
450 reset_counter_for_invocation_event(m); 450 reset_counter_for_invocation_event(m);
503 m, hot_count, comment, thread); 503 m, hot_count, comment, thread);
504 NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, CompLevel_highest_tier, true));) 504 NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, CompLevel_highest_tier, true));)
505 } 505 }
506 } 506 }
507 507
508 #endif // GRAAL 508 #endif // GRAALVM
509 509
510 510
511 // StackWalkCompPolicy - walk up stack to find a suitable method to compile 511 // StackWalkCompPolicy - walk up stack to find a suitable method to compile
512 512
513 #if defined(COMPILER2) || defined(GRAAL) 513 #if defined(COMPILER2)
514 const char* StackWalkCompPolicy::_msg = NULL; 514 const char* StackWalkCompPolicy::_msg = NULL;
515 515
516 516
517 // Consider m for compilation 517 // Consider m for compilation
518 void StackWalkCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) { 518 void StackWalkCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) {
735 return NULL; 735 return NULL;
736 } 736 }
737 737
738 738
739 739
740 #endif // COMPILER2 || GRAAL 740 #endif // COMPILER2