Backport 487c4771818999749bfd507ab85777795bba0832

Author: duke

test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -46,6 +47,8 @@
 public class ArrayIndexFillTest extends VectorizationTestRunner {
 
     private static final int SIZE = 543;
+    private static int init = 0;
+    private static int limit = SIZE;
 
     private int[] a;
 
@@ -101,6 +104,11 @@ public int[] fillIntArray() {
     }
 
     @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, "=0"})
+    // The ConvI2L can be split through the AddI, creating a mix of
+    // ConvI2L(AddI) and AddL(ConvI2L) cases, which do not vectorize.
+    // See: JDK-8332878
     public long[] fillLongArray() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -109,6 +117,65 @@ public long[] fillLongArray() {
         return res;
     }
 
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, ">0"})
+    // The variable init/limit has the consequence that we do not split
+    // the ConvI2L through the AddI.
+    public long[] fillLongArray2() {
+        long[] res = new long[SIZE];
+        for (int i = init; i < limit; i++) {
+            res[i] = i;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, "=0"})
+    // See: JDK-8332878
+    public float[] fillFloatArray() {
+        float[] res = new float[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            res[i] = i;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, ">0"})
+    public float[] fillFloatArray2() {
+        float[] res = new float[SIZE];
+        for (int i = init; i < limit; i++) {
+            res[i] = i;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, "=0"})
+    // See: JDK-8332878
+    public double[] fillDoubleArray() {
+        double[] res = new double[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            res[i] = i;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, ">0"})
+    public double[] fillDoubleArray2() {
+        double[] res = new double[SIZE];
+        for (int i = init; i < limit; i++) {
+            res[i] = i;
+        }
+        return res;
+    }
+
     @Test
     @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})

test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -50,6 +51,7 @@ public class ArrayShiftOpTest extends VectorizationTestRunner {
 
     private static final int SIZE = 543;
     private static       int size = 543;
+    private static       int zero = 0;
 
     private int[] ints;
     private long[] longs;
@@ -114,6 +116,36 @@ public long[] longCombinedRotateShift() {
         return res;
     }
 
+    @Test
+    // Tests that we add a ConvI2L for size, when converting it to long for
+    // the rotateRight rotation input.
+    // However, it currently only seems to vectorize in OSR, so we cannot add IR rules.
+    public long[] longExplicitRotateWithPopulateIndex() {
+        long[] res = new long[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            res[i] = Long.rotateRight(i, /* some rotation value*/ size);
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.STORE_VECTOR, ">0"})
+    @IR(applyIfCPUFeature = {"avx512f", "true"},
+        counts = {IRNode.ROTATE_RIGHT_V, ">0"})
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+        counts = {IRNode.POPULATE_INDEX, ">0"})
+    // The unknown init/limit values make sure that the rotation does fold badly
+    // like in longExplicitRotateWithPopulateIndex.
+    public long[] longExplicitRotateWithPopulateIndex2() {
+        long[] res = new long[SIZE];
+        for (int i = zero; i < size; i++) {
+            res[i] = Long.rotateRight(i, /* some rotation value*/ size);
+        }
+        return res;
+    }
+
+
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VI, ">0"})