test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java

@@ -158,15 +158,17 @@
      }
  
      @Test
      @IR(applyIfCPUFeature = {"sse2", "true"},
          applyIfPlatform = {"64-bit", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"asimd", "true"},
-         applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+         applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
      public static int[] testd(int[] out) {
          for (int i = 0; i < ITER-2; i+=2) {
              // Unrolled, with the same structure.
              out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+0]) + (sArr1[2*i+1] * sArr2[2*i+1]));

@@ -176,15 +178,17 @@
      }
  
      @Test
      @IR(applyIfCPUFeature = {"sse2", "true"},
          applyIfPlatform = {"64-bit", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"asimd", "true"},
-         applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+         applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
      public static int[] teste(int[] out) {
          for (int i = 0; i < ITER-2; i+=2) {
              // Unrolled, with some swaps.
              out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+0]) + (sArr1[2*i+1] * sArr2[2*i+1]));

@@ -194,15 +198,17 @@
      }
  
      @Test
      @IR(applyIfCPUFeature = {"sse2", "true"},
          applyIfPlatform = {"64-bit", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"asimd", "true"},
-         applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+         applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
      public static int[] testf(int[] out) {
          for (int i = 0; i < ITER-2; i+=2) {
              // Unrolled, with some swaps.
              out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+0]) + (sArr1[2*i+1] * sArr2[2*i+1]));

@@ -212,15 +218,17 @@
      }
  
      @Test
      @IR(applyIfCPUFeature = {"sse2", "true"},
          applyIfPlatform = {"64-bit", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"asimd", "true"},
-         applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+         applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
      public static int[] testg(int[] out) {
          for (int i = 0; i < ITER-2; i+=2) {
              // Unrolled, with some swaps.
              out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+0]) + (sArr1[2*i+1] * sArr2[2*i+1]));

@@ -230,15 +238,17 @@
      }
  
      @Test
      @IR(applyIfCPUFeature = {"sse2", "true"},
          applyIfPlatform = {"64-bit", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"asimd", "true"},
-         applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+         applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
      @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+         applyIf = { "UseCompactObjectHeaders", "false" },
          counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
      public static int[] testh(int[] out) {
          for (int i = 0; i < ITER-2; i+=2) {
              // Unrolled, with some swaps.
              out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+0]) + (sArr1[2*i+1] * sArr2[2*i+1]));