apache
diff --git a/‎gradle/testing/randomization.gradle‎
Lines changed: 7 additions & 0 deletions b/‎gradle/testing/randomization.gradle‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java‎
Lines changed: 45 additions & 7 deletions b/‎lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java‎
Lines changed: 45 additions & 7 deletions
@@ -105,6 +105,13 @@ allprojects {
           // miscellaneous; some of them very weird.
           [propName: 'tests.LUCENE_VERSION', value: baseVersion, description: "Base Lucene version."],
           [propName: 'tests.bwcdir', value: null, description: "Data for backward-compatibility indexes."],
+          // vectorization related
+          [propName: 'tests.vectorsize',
+             value: { ->
+               RandomPicks.randomFrom(new Random(projectSeedLong), ["128", "256", "512"])
+             },
+             description: "Sets preferred vector size in bits."],
+          [propName: 'tests.forceintegervectors', value: "true", description: "Forces use of integer vectors even when slow."],
       ]
     }
   }
 
@@ -26,8 +26,11 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
 import org.apache.lucene.util.SuppressForbidden;
 import org.apache.lucene.util.VectorUtil;
 
@@ -40,6 +43,35 @@
  */
 public abstract class VectorizationProvider {
 
+  static final OptionalInt TESTS_VECTOR_SIZE;
+  static final boolean TESTS_FORCE_INTEGER_VECTORS;
+
+  static {
+    var vs = OptionalInt.empty();
+    try {
+      vs =
+          Stream.ofNullable(System.getProperty("tests.vectorsize"))
+              .filter(Predicate.not(String::isEmpty))
+              .mapToInt(Integer::parseInt)
+              .findAny();
+    } catch (
+        @SuppressWarnings("unused")
+        SecurityException se) {
+      // ignored
+    }
+    TESTS_VECTOR_SIZE = vs;
+
+    boolean enforce = false;
+    try {
+      enforce = Boolean.getBoolean("tests.forceintegervectors");
+    } catch (
+        @SuppressWarnings("unused")
+        SecurityException se) {
+      // ignored
+    }
+    TESTS_FORCE_INTEGER_VECTORS = enforce;
+  }
+
   /**
    * Returns the default instance of the provider matching vectorization possibilities of actual
    * runtime.
@@ -90,10 +122,17 @@ static VectorizationProvider lookup(boolean testMode) {
         return new DefaultVectorizationProvider();
       }
       vectorMod.ifPresent(VectorizationProvider.class.getModule()::addReads);
-      // check if client VM
-      if (!testMode && isClientVM()) {
-        LOG.warning("C2 compiler is disabled; Java vector incubator API can't be enabled");
-        return new DefaultVectorizationProvider();
+      // check for testMode and otherwise fallback to default if slowness could happen
+      if (!testMode) {
+        if (TESTS_VECTOR_SIZE.isPresent() || TESTS_FORCE_INTEGER_VECTORS) {
+          LOG.warning(
+              "Vector bitsize and/or integer vectors enforcement; using default vectorization provider outside of testMode");
+          return new DefaultVectorizationProvider();
+        }
+        if (isClientVM()) {
+          LOG.warning("C2 compiler is disabled; Java vector incubator API can't be enabled");
+          return new DefaultVectorizationProvider();
+        }
       }
       try {
         // we use method handles with lookup, so we do not need to deal with setAccessible as we
@@ -102,10 +141,9 @@ static VectorizationProvider lookup(boolean testMode) {
         final var cls =
             lookup.findClass(
                 "org.apache.lucene.internal.vectorization.PanamaVectorizationProvider");
-        final var constr =
-            lookup.findConstructor(cls, MethodType.methodType(void.class, boolean.class));
+        final var constr = lookup.findConstructor(cls, MethodType.methodType(void.class));
         try {
-          return (VectorizationProvider) constr.invoke(testMode);
+          return (VectorizationProvider) constr.invoke();
         } catch (UnsupportedOperationException uoe) {
           // not supported because preferred vector size too small or similar
           LOG.warning("Java vector incubator API was not enabled. " + uoe.getMessage());
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,13 @@ allprojects {`
`105`	`105`	`// miscellaneous; some of them very weird.`
`106`	`106`	`[propName: 'tests.LUCENE_VERSION', value: baseVersion, description: "Base Lucene version."],`
`107`	`107`	`[propName: 'tests.bwcdir', value: null, description: "Data for backward-compatibility indexes."],`
	`108`	`+ // vectorization related`
	`109`	`+ [propName: 'tests.vectorsize',`
	`110`	`+ value: { ->`
	`111`	`+ RandomPicks.randomFrom(new Random(projectSeedLong), ["128", "256", "512"])`
	`112`	`+ },`
	`113`	`+ description: "Sets preferred vector size in bits."],`
	`114`	`+ [propName: 'tests.forceintegervectors', value: "true", description: "Forces use of integer vectors even when slow."],`
`108`	`115`	`]`
`109`	`116`	`}`
`110`	`117`	`}`