8325451: Missed elimination of assertion predicates

Reviewed-by: chagedorn, phh
This commit is contained in:
Joshua Cao 2024-02-12 06:29:37 +00:00 committed by Christian Hagedorn
parent af7eeffddb
commit 2546afe2aa
2 changed files with 99 additions and 2 deletions
src/hotspot/share/opto
test/hotspot/jtreg/compiler/predicates

@ -4359,8 +4359,8 @@ void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(Ideal
}
void PhaseIdealLoop::eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) {
for (int i = 0; i < C->template_assertion_predicate_count(); i++) {
Node* opaque4 = C->template_assertion_predicate_opaq_node(i);
for (int i = C->template_assertion_predicate_count(); i > 0; i--) {
Node* opaque4 = C->template_assertion_predicate_opaq_node(i - 1);
assert(opaque4->Opcode() == Op_Opaque4, "must be");
if (!useful_predicates.member(opaque4)) { // not in the useful list
_igvn.replace_node(opaque4, opaque4->in(2));

@ -0,0 +1,97 @@
/*
* Copyright Amazon.com Inc. 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
* 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.
*/
package compiler.predicates;
import compiler.lib.ir_framework.*;
import jdk.test.lib.Asserts;
/*
* @test
* @bug 8325451
* @summary Test basic loop predicates
* @library /test/lib /
* @run driver compiler.predicates.TestPredicatesBasic
*/
public class TestPredicatesBasic {
public static final int size = 100;
public static void main(String[] args) {
TestFramework.run();
}
@DontInline
private void blackhole(int i) {}
@DontInline
private int[] getArr() {
int[] arr = new int[size];
for (int i = 0; i < size; ++i) {
arr[i] = i;
}
return arr;
}
@Test
// Null check, loop entrance check, array upper bound check
@IR(counts = {IRNode.IF, "3"})
public void basic() {
int[] arr = getArr();
for (int i = 0; i < arr.length; ++i) {
blackhole(arr[i]);
}
}
@Test
// Null check, loop entrance check, array upper bound check
@IR(counts = {IRNode.IF, "4"})
public void basicMinus() {
int[] arr = getArr();
for (int i = 0; i < arr.length - 1; ++i) {
blackhole(arr[i]);
}
}
@Test
// Null check, loop entrance check, array lower/upper bound check
@IR(counts = {IRNode.IF, "4"})
public void basicNeg() {
int[] arr = getArr();
for (int i = arr.length - 1; i >= 0; --i) {
blackhole(arr[i]);
}
}
@Test
@Arguments({Argument.NUMBER_42})
// Null check, loop entrance check, array lower/upper bound check
@IR(counts = {IRNode.IF, "4"})
public void basicLimit(int limit) {
int[] arr = getArr();
for (int i = 0; i < limit; ++i) {
blackhole(arr[i]);
}
}
}