8261137: Optimization of Box nodes in uncommon_trap #2401
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
|
|
@@ -554,6 +554,56 @@ void LateInlineVirtualCallGenerator::do_late_inline() { | |
| CallGenerator::do_late_inline_helper(); | ||
| } | ||
|
|
||
| // replace box node to scalar node only in case it is directly referenced by debug info | ||
| static void replace_box_to_scalar(CallNode* call, Node* resproj) { | ||
| if (resproj != nullptr && call->is_CallStaticJava() && | ||
| call->as_CallStaticJava()->is_boxing_method()) { | ||
| Unique_Node_List debuginfo_node_list; | ||
| for (DUIterator_Fast imax, i = resproj->fast_outs(imax); i < imax; i++) { | ||
| Node* m = resproj->fast_out(i); | ||
| if (m->is_SafePoint()) { | ||
| SafePointNode* sfpt = m->as_SafePoint(); | ||
| uint dbg_start = sfpt->is_Call() ? sfpt->as_Call()->tf()->domain()->cnt() : (uint)TypeFunc::Parms+1; | ||
| for (uint i = 0; i < dbg_start; i++) { | ||
| if (sfpt->in(i) == resproj) { | ||
| return; | ||
|
There was a problem hiding this comment. I think this code can be replaced by: |
||
| } | ||
| } | ||
| debuginfo_node_list.push(m); | ||
| } else { | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| GraphKit kit(call->jvms()); | ||
| PhaseGVN& gvn = kit.gvn(); | ||
| // delay box in runtime, treat box as a scalarized object | ||
| while (debuginfo_node_list.size() > 0) { | ||
| ProjNode* res = resproj->as_Proj(); | ||
| Node* debuginfo_node = debuginfo_node_list.pop(); | ||
|
There was a problem hiding this comment.
|
||
|
|
||
| ciInstanceKlass* klass = call->as_CallStaticJava()->method()->holder(); | ||
| int n_fields = klass->nof_nonstatic_fields(); | ||
| assert(n_fields == 1, "the klass must be an auto-boxing klass"); | ||
|
There was a problem hiding this comment. This code can be put in There was a problem hiding this comment. These codes are similar to #853 (comment) , so I put |
||
|
|
||
| uint first_ind = (debuginfo_node->req() - debuginfo_node->jvms()->scloff()); | ||
| Node* sobj = new SafePointScalarObjectNode(gvn.type(res)->isa_oopptr(), | ||
| #ifdef ASSERT | ||
| call->isa_Allocate(), | ||
|
There was a problem hiding this comment. It is always There was a problem hiding this comment. It was my suggestion to pass There was a problem hiding this comment. Thank you for your review. I will change the SafePointScalarObject constructor in next push. |
||
| #endif // ASSERT | ||
| first_ind, n_fields, true); | ||
| sobj->init_req(0, kit.root()); | ||
| debuginfo_node->add_req(call->in(res->_con)); | ||
|
There was a problem hiding this comment. I don't understand why you are selecting the input based on the result projection field There was a problem hiding this comment. Thank you for your review. I use |
||
| sobj = gvn.transform(sobj); | ||
| JVMState* jvms = debuginfo_node->jvms(); | ||
| jvms->set_endoff(debuginfo_node->req()); | ||
| int start = jvms->debug_start(); | ||
| int end = jvms->debug_end(); | ||
| debuginfo_node->replace_edges_in_range(res, sobj, start, end); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void CallGenerator::do_late_inline_helper() { | ||
| assert(is_late_inline(), "only late inline allowed"); | ||
|
|
||
|
|
@@ -603,6 +653,8 @@ void CallGenerator::do_late_inline_helper() { | |
| C->remove_macro_node(call); | ||
| } | ||
|
|
||
| replace_box_to_scalar(call, callprojs.resproj); | ||
|
There was a problem hiding this comment. Should this be guarded by There was a problem hiding this comment. Exactly. I will change that. |
||
|
|
||
| bool result_not_used = (callprojs.resproj == NULL || callprojs.resproj->outcnt() == 0); | ||
| if (is_pure_call() && result_not_used) { | ||
| // The call is marked as pure (no important side effects), but result isn't used. | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe rename this to
safepoints.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure.