Skip to content

Apache Lucene open-source search software

Add a separate option to allow running Panama Vectorization for all tests with suitable C2 defaults (#13351)

Chris Hegarty8d7e4174afb5
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
index 160b77eaea9..d8ee3cedaf0 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -51,7 +51,7 @@ allprojects {
includeInReproLine: false
],
[propName: 'tests.jvmargs',
- value: { -> propertyOrEnvOrDefault("tests.jvmargs", "TEST_JVM_ARGS", isCIBuild ? "" : "-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1") },
+ value: { -> envOrDefault("TEST_JVM_ARGS", (isCIBuild || testsDefaultVectorizationRequested()) ? "" : "-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1") },
description: "Arguments passed to each forked JVM."],
// Other settings.
[propName: 'tests.neverUpToDate', value: true,
@@ -66,6 +66,8 @@ allprojects {
}
return propertyOrDefault(option.propName, option.value)
}
+
+ testsDefaultVectorizationRequested = { -> Boolean.parseBoolean(resolvedTestOption('tests.defaultvectorization') as String) }
testsCwd = file("${buildDir}/tmp/tests-cwd")
testsTmpDir = file(resolvedTestOption("tests.workDir"))
@@ -116,8 +118,6 @@ allprojects {
ignoreFailures = resolvedTestOption("tests.haltonfailure").toBoolean() == false
- jvmArgs Commandline.translateCommandline(resolvedTestOption("tests.jvmargs"))
-
// Up to JDK-15 we have to enforce --illegal-access=deny, because we want no code to access
// JDK internals; JDK-16 and later will default to deny, see https://openjdk.java.net/jeps/396:
if (rootProject.runtimeJavaVersion < JavaVersion.VERSION_16) {
diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle
index 44ae964cab0..fd32d57e7c1 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -63,6 +63,7 @@ allprojects {
allprojects {
plugins.withType(JavaPlugin) {
ext {
+ String randomVectorSize = RandomPicks.randomFrom(new Random(projectSeedLong), ["default", "128", "256", "512"])
testOptions += [
// seed, repetition and amplification.
[propName: 'tests.seed', value: { -> rootSeed }, description: "Sets the master randomization seed."],
@@ -106,11 +107,13 @@ allprojects {
[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."],
+ value: { -> testsDefaultVectorizationRequested() ? 'default' : randomVectorSize },
+ description: "Sets preferred vector size in bits."],
+ [propName: 'tests.forceintegervectors',
+ value: { -> testsDefaultVectorizationRequested() ? false : (randomVectorSize != 'default') },
+ description: "Forces use of integer vectors even when slow."],
+ [propName: 'tests.defaultvectorization', value: false,
+ description: "Uses defaults for running tests with correct JVM settings to test Panama vectorization (tests.jvmargs, tests.vectorsize, tests.forceintegervectors)."],
]
}
}
@@ -172,6 +175,8 @@ allprojects {
// and not the test JVM itself.
systemProperties testOptionsResolved
+ jvmArgs Commandline.translateCommandline(testOptionsResolved['tests.jvmargs'])
+
if (Boolean.parseBoolean(testOptionsResolved['tests.asserts'])) {
jvmArgs("-ea", "-esa")
} else {
diff --git a/lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java b/lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java
index 158cdde5e0e..bf3615bf10a 100644
--- a/lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java
+++ b/lucene/core/src/java/org/apache/lucene/internal/vectorization/VectorizationProvider.java
@@ -47,7 +47,7 @@ public abstract class VectorizationProvider {
try {
vs =
Stream.ofNullable(System.getProperty("tests.vectorsize"))
- .filter(Predicate.not(String::isEmpty))
+ .filter(Predicate.not(Set.of("", "default")::contains))
.mapToInt(Integer::parseInt)
.findAny();
} catch (