archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8276571: C2: pass compilation options as structure

Browse source 
Reviewed-by: shade, chagedorn
This commit is contained in:
Vladimir Kozlov 2021-11-05 16:07:25 +00:00
parent c393ee8f59
commit a74a839af0
4 changed files with 59 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/hotspot/share/opto/compile.cpp
View file

@ -487,25 +487,25 @@ CompileWrapper::~CompileWrapper() {
void Compile::print_compile_messages() {
#ifndef PRODUCT
// Check if recompiling
if (_subsume_loads == false && PrintOpto) {
if (!subsume_loads() && PrintOpto) {
// Recompiling without allowing machine instructions to subsume loads
tty->print_cr("*********************************************************");
tty->print_cr("** Bailout: Recompile without subsuming loads **");
tty->print_cr("*********************************************************");
}
if (_do_escape_analysis != DoEscapeAnalysis && PrintOpto) {
if ((do_escape_analysis() != DoEscapeAnalysis) && PrintOpto) {
// Recompiling without escape analysis
tty->print_cr("*********************************************************");
tty->print_cr("** Bailout: Recompile without escape analysis **");
tty->print_cr("*********************************************************");
}
if (_eliminate_boxing != EliminateAutoBox && PrintOpto) {
if ((eliminate_boxing() != EliminateAutoBox) && PrintOpto) {
// Recompiling without boxing elimination
tty->print_cr("*********************************************************");
tty->print_cr("** Bailout: Recompile without boxing elimination **");
tty->print_cr("*********************************************************");
}
if ((_do_locks_coarsening != EliminateLocks) && PrintOpto) {
if ((do_locks_coarsening() != EliminateLocks) && PrintOpto) {
// Recompiling without locks coarsening
tty->print_cr("*********************************************************");
tty->print_cr("** Bailout: Recompile without locks coarsening **");
@ -538,15 +538,10 @@ debug_only( int Compile::_debug_idx = 100000; )
Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
bool subsume_loads, bool do_escape_analysis, bool eliminate_boxing,
bool do_locks_coarsening, bool install_code, DirectiveSet* directive)
Options options, DirectiveSet* directive)
: Phase(Compiler),
_compile_id(ci_env->compile_id()),
_subsume_loads(subsume_loads),
_do_escape_analysis(do_escape_analysis),
_install_code(install_code),
_eliminate_boxing(eliminate_boxing),
_do_locks_coarsening(do_locks_coarsening),
_options(options),
_method(target),
_entry_bci(osr_bci),
_ilt(NULL),
@ -846,11 +841,7 @@ Compile::Compile( ciEnv* ci_env,
DirectiveSet* directive)
: Phase(Compiler),
_compile_id(0),
_subsume_loads(true),
_do_escape_analysis(false),
_install_code(true),
_eliminate_boxing(false),
_do_locks_coarsening(false),
_options(Options::for_runtime_stub()),
_method(NULL),
_entry_bci(InvocationEntryBci),
_stub_function(stub_function),
@ -1034,8 +1025,9 @@ void Compile::Init(int aliaslevel) {
// Type::update_loaded_types(_method, _method->constants());
// Init alias_type map.
if (!_do_escape_analysis && aliaslevel == 3)
if (!do_escape_analysis() && aliaslevel == 3) {
aliaslevel = 2; // No unique types without escape analysis
}
_AliasLevel = aliaslevel;
const int grow_ats = 16;
_max_alias_types = grow_ats;
@ -2160,7 +2152,7 @@ void Compile::Optimize() {
remove_root_to_sfpts_edges(igvn);
// Perform escape analysis
if (_do_escape_analysis && ConnectionGraph::has_candidates(this)) {
if (do_escape_analysis() && ConnectionGraph::has_candidates(this)) {
if (has_loops()) {
// Cleanup graph (remove dead nodes).
TracePhase tp("idealLoop", &timers[_t_idealLoop]);