stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Roland Westrelin 2023-03-07 08:37:37 +00:00
parent 7fbfc884f0
commit 3f2d929dc3
2 changed files with 84 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/opto/loopopts.cpp
View File

@ -527,7 +527,7 @@ Node* PhaseIdealLoop::remix_address_expressions(Node* n) {
n23_loop == n_loop) {
Node* add1 = new AddPNode(n->in(1), n->in(2)->in(2), n->in(3));
// Stuff new AddP in the loop preheader
register_new_node(add1, n_loop->_head->in(LoopNode::EntryControl));
register_new_node(add1, n_loop->_head->as_Loop()->skip_strip_mined(1)->in(LoopNode::EntryControl));
Node* add2 = new AddPNode(n->in(1), add1, n->in(2)->in(3));
register_new_node(add2, n_ctrl);
_igvn.replace_node(n, add2);
@ -548,7 +548,7 @@ Node* PhaseIdealLoop::remix_address_expressions(Node* n) {
if (!is_member(n_loop,get_ctrl(I))) {
Node* add1 = new AddPNode(n->in(1), n->in(2), I);
// Stuff new AddP in the loop preheader
register_new_node(add1, n_loop->_head->in(LoopNode::EntryControl));
register_new_node(add1, n_loop->_head->as_Loop()->skip_strip_mined(1)->in(LoopNode::EntryControl));
Node* add2 = new AddPNode(n->in(1), add1, V);
register_new_node(add2, n_ctrl);
_igvn.replace_node(n, add2);

82
test/hotspot/jtreg/compiler/loopstripmining/TestAddPAtOuterLoopHead.java Normal file
View File

@ -0,0 +1,82 @@
/*
* Copyright (c) 2023, Red Hat, Inc. 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8303511
* @summary C2: assert(get_ctrl(n) == cle_out) during unrolling
* @requires vm.gc.Parallel
* @run main/othervm -XX:-BackgroundCompilation -XX:+UseParallelGC TestAddPAtOuterLoopHead
*/
import java.util.Arrays;
public class TestAddPAtOuterLoopHead {
public static void main(String[] args) {
boolean[] flags1 = new boolean[1000];
boolean[] flags2 = new boolean[1000];
Arrays.fill(flags2, true);
for (int i = 0; i < 20_000; i++) {
testHelper(42, 42, 43);
test(flags1);
test(flags2);
}
}
private static int test(boolean[] flags) {
int[] array = new int[1000];
int k;
for (k = 0; k < 10; k++) {
for (int i = 0; i < 2; i++) {
}
}
k = k / 10;
int m;
for (m = 0; m < 2; m++) {
for (int i = 0; i < 2; i++) {
for (int j = 0; j < 2; j++) {
}
}
}
int v = 0;
for (int j = 0; j < 2; j++) {
for (int i = 0; i < 998; i += k) {
int l = testHelper(m, j, i);
v = array[i + l];
if (flags[i]) {
return v;
}
}
}
return v;
}
private static int testHelper(int m, int j, int i) {
return m == 2 ? j : i;
}
}