Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8261137: Optimization of Box nodes in uncommon_trap #2401

Closed
wants to merge 13 commits into from
Closed

8261137: Optimization of Box nodes in uncommon_trap #2401

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
73be94c
8261137: Optimization of Box nodes in uncommon_trap
Feb 4, 2021
4dfee52
refactor codes
Feb 5, 2021
4c62ec8
fix some bugs
Feb 10, 2021
e80e495
delete useless line
Feb 10, 2021
84290ae
add debuginfo optimization
Feb 23, 2021
2032493
fix bugs
Feb 27, 2021
a82410c
refactor some codes
Mar 10, 2021
3934fd9
refactor
Mar 19, 2021
4c1b503
Merge branch 'master' into JDK-8261137
Mar 23, 2021
2f0276c
refactor
Mar 24, 2021
fee961b
refact SafePointScalarObjectNode constructor
Mar 24, 2021
9fe85cf
refact SafePointScalarObjectNode constructor
Mar 30, 2021
31f215b
trivial fix
Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
92 changes: 48 additions & 44 deletions src/hotspot/share/opto/callGenerator.cpp
View file
Open in desktop
Expand Up @@ -554,6 +554,53 @@ void LateInlineVirtualCallGenerator::do_late_inline() {
CallGenerator::do_late_inline_helper();
}

static void delay_box_in_uncommon_trap(CallNode* call, Node* resproj) {
if (resproj != NULL && call->is_CallStaticJava() &&
Wanghuang-Huawei marked this conversation as resolved.
Show resolved Hide resolved
call->as_CallStaticJava()->is_boxing_method()) {
GraphKit kit(call->jvms());
Wanghuang-Huawei marked this conversation as resolved.
Show resolved Hide resolved
PhaseGVN& gvn = kit.gvn();

Node_List delay_boxes;
bool no_use = true;
for (DUIterator_Fast imax, i = resproj->fast_outs(imax); i < imax; i++) {
Node* m = resproj->fast_out(i);
if (m->is_CallStaticJava() &&
m->as_CallStaticJava()->uncommon_trap_request() != 0) {
delay_boxes.push(m);
} else {
no_use = false;
break;
}
}

if (no_use) {
// delay box node in uncommon_trap runtime, treat box as a scalarized object
while (delay_boxes.size() > 0) {
ProjNode* res = resproj->as_Proj();
Node* uncommon_trap_node = delay_boxes.pop();
int in_edge = uncommon_trap_node->find_edge(res);
assert(in_edge > 0, "sanity");
Wanghuang-Huawei marked this conversation as resolved.
Show resolved Hide resolved

ciInstanceKlass* klass = call->as_CallStaticJava()->method()->holder();
int n_fields = klass->nof_nonstatic_fields();
assert(n_fields == 1, "sanity");
Wanghuang-Huawei marked this conversation as resolved.
Show resolved Hide resolved

uint first_ind = (uncommon_trap_node->req() - uncommon_trap_node->jvms()->scloff());
Node* sobj = new SafePointScalarObjectNode(gvn.type(res)->isa_oopptr(),
#ifdef ASSERT
NULL,
Wanghuang-Huawei marked this conversation as resolved.
Show resolved Hide resolved
#endif // ASSERT
first_ind, n_fields);
sobj->init_req(0, kit.root());
uncommon_trap_node->add_req(call->in(res->_con));
sobj = gvn.transform(sobj);
uncommon_trap_node->jvms()->set_endoff(uncommon_trap_node->req());
uncommon_trap_node->set_req(in_edge, sobj);
}
}
}
}

void CallGenerator::do_late_inline_helper() {
assert(is_late_inline(), "only late inline allowed");

Expand Down Expand Up @@ -603,50 +650,7 @@ void CallGenerator::do_late_inline_helper() {
C->remove_macro_node(call);
}

if (callprojs.resproj != NULL && call->is_CallStaticJava() &&
call->as_CallStaticJava()->is_boxing_method()) {
GraphKit kit(call->jvms());
PhaseGVN& gvn = kit.gvn();

Node_List delay_boxes;
bool no_use = true;
for (DUIterator_Fast imax, i = callprojs.resproj->fast_outs(imax); i < imax; i++) {
Node* m = callprojs.resproj->fast_out(i);
if (m->is_CallStaticJava() &&
m->as_CallStaticJava()->uncommon_trap_request() != 0) {
delay_boxes.push(m);
} else {
no_use = false;
break;
}
}

if (no_use) {
// delay box node in uncommon_trap runtime, treat box as a scalarized object
while (delay_boxes.size() > 0) {
ProjNode* res = callprojs.resproj->as_Proj();
Node* uncommon_trap_node = delay_boxes.pop();
int in_edge = uncommon_trap_node->find_edge(res);
assert(in_edge > 0, "sanity");

ciInstanceKlass* klass = call->as_CallStaticJava()->method()->holder();
int n_fields = klass->nof_nonstatic_fields();
assert(n_fields == 1, "sanity");

uint first_ind = (uncommon_trap_node->req() - uncommon_trap_node->jvms()->scloff());
Node* sobj = new SafePointScalarObjectNode(gvn.type(res)->isa_oopptr(),
#ifdef ASSERT
NULL,
#endif // ASSERT
first_ind, n_fields);
sobj->init_req(0, C->root());
uncommon_trap_node->add_req(call->in(res->_con));
sobj = gvn.transform(sobj);
uncommon_trap_node->jvms()->set_endoff(uncommon_trap_node->req());
uncommon_trap_node->set_req(in_edge, sobj);
}
}
}
delay_box_in_uncommon_trap(call, callprojs.resproj);

bool result_not_used = (callprojs.resproj == NULL || callprojs.resproj->outcnt() == 0);
if (is_pure_call() && result_not_used) {
Expand Down