comparison src/share/vm/compiler/compileBroker.cpp @ 22298:c28cb37b2e1d

Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents be896a1983c0
children cfd7ebda543b
comparison
equal deleted inserted replaced
22297:571202729bbf 22298:c28cb37b2e1d
47 #include "utilities/dtrace.hpp" 47 #include "utilities/dtrace.hpp"
48 #include "utilities/events.hpp" 48 #include "utilities/events.hpp"
49 #ifdef COMPILER1 49 #ifdef COMPILER1
50 #include "c1/c1_Compiler.hpp" 50 #include "c1/c1_Compiler.hpp"
51 #endif 51 #endif
52 #ifdef JVMCI 52 #if INCLUDE_JVMCI
53 #include "jvmci/jvmciCompiler.hpp" 53 #include "jvmci/jvmciCompiler.hpp"
54 #ifdef COMPILERJVMCI 54 #ifdef COMPILERJVMCI
55 #include "jvmci/jvmciRuntime.hpp" 55 #include "jvmci/jvmciRuntime.hpp"
56 #include "runtime/vframe.hpp" 56 #include "runtime/vframe.hpp"
57 #endif 57 #endif
914 } 914 }
915 #ifndef SHARK 915 #ifndef SHARK
916 // Set the interface to the current compiler(s). 916 // Set the interface to the current compiler(s).
917 int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); 917 int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);
918 int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); 918 int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization);
919 #ifdef JVMCI 919 #if INCLUDE_JVMCI
920 JVMCICompiler* jvmci = new JVMCICompiler(); 920 JVMCICompiler* jvmci = new JVMCICompiler();
921 #endif 921 #endif
922 922
923 #if defined(COMPILERJVMCI) 923 #if defined(COMPILERJVMCI)
924 _compilers[1] = jvmci; 924 _compilers[1] = jvmci;
2471 } else { 2471 } else {
2472 return (comp->name()); 2472 return (comp->name());
2473 } 2473 }
2474 } 2474 }
2475 2475
2476 #ifdef JVMCI 2476 #if INCLUDE_JVMCI
2477 void CompileBroker::print_times(AbstractCompiler* comp) { 2477 void CompileBroker::print_times(AbstractCompiler* comp) {
2478 CompilerStatistics* stats = comp->stats(); 2478 CompilerStatistics* stats = comp->stats();
2479 tty->print_cr(" %s {speed: %d bytes/s; standard: %6.3f s, %d bytes, %d methods; osr: %6.3f s, %d bytes, %d methods; nmethods_size: %d bytes; nmethods_code_size: %d bytes}", 2479 tty->print_cr(" %s {speed: %d bytes/s; standard: %6.3f s, %d bytes, %d methods; osr: %6.3f s, %d bytes, %d methods; nmethods_size: %d bytes; nmethods_code_size: %d bytes}",
2480 comp->name(), stats->bytes_per_second(), 2480 comp->name(), stats->bytes_per_second(),
2481 stats->_standard._time.seconds(), stats->_standard._bytes, stats->_standard._count, 2481 stats->_standard._time.seconds(), stats->_standard._bytes, stats->_standard._count,
2484 comp->print_timers(); 2484 comp->print_timers();
2485 } 2485 }
2486 #endif 2486 #endif
2487 2487
2488 void CompileBroker::print_times(bool per_compiler, bool aggregate) { 2488 void CompileBroker::print_times(bool per_compiler, bool aggregate) {
2489 #ifdef JVMCI 2489 #if INCLUDE_JVMCI
2490 elapsedTimer standard_compilation; 2490 elapsedTimer standard_compilation;
2491 elapsedTimer total_compilation; 2491 elapsedTimer total_compilation;
2492 elapsedTimer osr_compilation; 2492 elapsedTimer osr_compilation;
2493 2493
2494 int standard_bytes_compiled = 0; 2494 int standard_bytes_compiled = 0;