Additional JMH tests (fibers)

compliance/repository/pom.xml

@@ -50,6 +50,18 @@
 			<version>${project.version}</version>
 			<type>war</type>
 		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-core</artifactId>
+			<version>${jmhVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-generator-annprocess</artifactId>
+			<version>${jmhVersion}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/sparql/federation/RepositoryFederatedServiceIntegrationTest.java

@@ -39,6 +39,23 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 import com.google.common.collect.Lists;
 
@@ -47,15 +64,25 @@
  *
  * @author Andreas Schwarte
  */
+@State(Scope.Benchmark)
+@Warmup(iterations = 5)
+@BenchmarkMode({ Mode.AverageTime })
+@Fork(value = 1, jvmArgs = { "-Xms1G", "-Xmx50G", })
+@Measurement(iterations = 5)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class RepositoryFederatedServiceIntegrationTest {
 
+	@Param({ "10", "50", "100", "500", "1000", "5000" })
+	private int numThreads;
+
 	private static final ValueFactory vf = SimpleValueFactory.getInstance();
 
 	private SailRepository serviceRepo;
 	private SailRepository localRepo;
 	private RepositoryFederatedService federatedService;
 
 	@BeforeEach
+	@Setup(Level.Iteration)
 	public void before() {
 		serviceRepo = new SailRepository(new MemoryStore());
 		serviceRepo.init();
@@ -74,6 +101,7 @@ public FederatedService getService(String serviceUrl) throws QueryEvaluationExce
 	}
 
 	@AfterEach
+	@TearDown((Level.Iteration))
 	public void after() {
 		federatedService.shutdown();
 		localRepo.shutDown();
@@ -277,6 +305,7 @@ public void test8a_subSelectAll() {
 	}
 
 	@Test
+	@Benchmark
 	public void test9_connectionHandling() throws Exception {
 
 		/*
@@ -297,7 +326,7 @@ public void test9_connectionHandling() throws Exception {
 
 		ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();
 		try {
-			for (int i = 0; i < 5; i++) {
+			for (int i = 0; i < numThreads; i++) {
 				executor.submit(() -> {
 
 					String query = "SELECT ?var WHERE { SERVICE <urn:dummy> { ?s ?p ?var  } }";

core/queryalgebra/evaluation/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/MinimalContextNowTest.java

@@ -16,6 +16,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -27,8 +28,33 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+@State(Scope.Benchmark)
+@Warmup(iterations = 5)
+@BenchmarkMode({ Mode.AverageTime })
+@Fork(value = 1, jvmArgs = { "-Xms1G", "-Xmx50G", })
+@Measurement(iterations = 5)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class MinimalContextNowTest {
 
+	@Param({ "10", "50", "100", "500", "1000", "5000" })
+	private int numberOfThreads;
+
 	@Test
 	public void testNow() {
 		// Tests that the now value is correctly initialized.
@@ -45,9 +71,9 @@ public void testNow() {
 	}
 
 	@Test
+	@Benchmark
 	public void testConcurrentAccessToNow() throws ExecutionException, InterruptedException {
 		int numberOfIterations = 100;
-		int numberOfThreads = 10;
 
 		ExecutorService executorService = Executors.newVirtualThreadPerTaskExecutor();
 		try {

core/sail/api/src/test/java/org/eclipse/rdf4j/common/concurrent/locks/benchmarks/ReadWriteLockManagerBenchmark.java

@@ -24,6 +24,7 @@
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.Runner;
@@ -41,6 +42,9 @@
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class ReadWriteLockManagerBenchmark extends BaseLockManagerBenchmark {
 
+	@Param({ "10", "50", "100", "500", "1000", "5000" })
+	public int numThreads;
+
 	public static void main(String[] args) throws RunnerException {
 		Options opt = new OptionsBuilder().include("ReadWriteLockManagerBenchmark.*") // adapt to run other benchmark
 				// tests
@@ -58,7 +62,7 @@ public void onlyReadLocksNoContention(Blackhole blackhole) throws Exception {
 
 		AbstractReadWriteLockManager lockManager = getReadWriteLockManager();
 
-		threads(100, () -> {
+		threads(numThreads, () -> {
 
 			readLocks(lockManager, 100, blackhole);
 
@@ -71,7 +75,7 @@ public void onlyWriteLocks(Blackhole blackhole) throws Exception {
 
 		AbstractReadWriteLockManager lockManager = getReadWriteLockManager();
 
-		threads(1000, () -> {
+		threads(numThreads, () -> {
 			try {
 				Lock lock = lockManager.getWriteLock();
 				lock.release();
@@ -94,7 +98,7 @@ public void mixedReadHeavy(Blackhole blackhole) throws Exception {
 
 		AbstractReadWriteLockManager lockManager = getReadWriteLockManager();
 
-		threads(100, () -> {
+		threads(numThreads, () -> {
 			try {
 				Lock lock = lockManager.getWriteLock();
 				lock.release();
@@ -115,7 +119,7 @@ public void readPriority(Blackhole blackhole) throws Exception {
 
 		AbstractReadWriteLockManager lockManager = getReadWriteLockManager();
 
-		threads(100, () -> {
+		threads(numThreads, () -> {
 			try {
 				Lock readLock1 = lockManager.getReadLock();
 
@@ -190,7 +194,7 @@ public void mixed(Blackhole blackhole) throws Exception {
 
 		AbstractReadWriteLockManager lockManager = getReadWriteLockManager();
 
-		threads(1000, () -> {
+		threads(numThreads, () -> {
 			try {
 				Lock lock = lockManager.getWriteLock();
 				lock.release();

core/sail/api/src/test/java/org/eclipse/rdf4j/sail/helpers/AbstractSailTest.java

@@ -25,19 +25,45 @@
 import org.eclipse.rdf4j.sail.SailException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 /**
  * Unit tests for {@link AbstractSail}.
  *
  * @author Jeen Broekstra
  */
+@State(Scope.Benchmark)
+@Warmup(iterations = 5)
+@BenchmarkMode({ Mode.AverageTime })
+@Fork(value = 1, jvmArgs = { "-Xms1G", "-Xmx50G", })
+@Measurement(iterations = 5)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class AbstractSailTest {
 
+	@Param({ "10", "50", "100", "500", "1000", "5000" })
+	private int count;
+
 	AbstractSail subject;
 
 	private final Random random = new Random(43252333);
 
 	@BeforeEach
+	@Setup(Level.Iteration)
 	public void setUp() {
 
 		subject = new AbstractSail() {
@@ -96,8 +122,8 @@ public void testExplicitInitTwice() {
 	}
 
 	@Test
+	@Benchmark
 	public void testConcurrentAutoInit() throws Exception {
-		int count = 200;
 		CountDownLatch latch = new CountDownLatch(count);
 
 		for (int i = 0; i < count; i++) {

core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/benchmark/OverflowBenchmarkConcurrent.java

@@ -54,6 +54,7 @@
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
@@ -78,6 +79,9 @@
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class OverflowBenchmarkConcurrent {
 
+	@Param({ "5", "25", "50", "250", "500", "2500" })
+	public int numThreadsHalf;
+
 	@Setup(Level.Trial)
 	public void setup() {
 		((Logger) (LoggerFactory
@@ -123,7 +127,7 @@ public void manyConcurrentTransactions() throws IOException {
 
 			CountDownLatch countDownLatch = new CountDownLatch(1);
 
-			for (int i = 0; i < 38; i++) {
+			for (int i = 0; i < numThreadsHalf; i++) {
 				var seed = i + 485924;
 				{
 					Future<?> submit = executorService.submit(() -> {

core/sail/lucene/pom.xml

@@ -78,5 +78,17 @@
 			<artifactId>junit-vintage-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-core</artifactId>
+			<version>${jmhVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-generator-annprocess</artifactId>
+			<version>${jmhVersion}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

core/sail/lucene/src/test/java/org/eclipse/rdf4j/sail/lucene/impl/AbstractGenericLuceneTest.java

@@ -67,11 +67,38 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Timeout(value = 10, unit = TimeUnit.MINUTES)
+@State(Scope.Benchmark)
+@Warmup(iterations = 5)
+@BenchmarkMode({ Mode.AverageTime })
+@Fork(value = 1, jvmArgs = { "-Xms1G", "-Xmx50G", })
+@Measurement(iterations = 5)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
 public abstract class AbstractGenericLuceneTest {
+
+	@Param({ "10", "50", "100", "500", "1000", "5000" })
+	int numThreads;
+
 	protected static final ValueFactory vf = SimpleValueFactory.getInstance();
 
 	public static final String QUERY_STRING;
@@ -120,6 +147,7 @@ public abstract class AbstractGenericLuceneTest {
 	protected abstract void configure(LuceneSail sail) throws IOException;
 
 	@BeforeEach
+	@Setup(Level.Iteration)
 	public void setUp() throws Exception {
 		// set logging, uncomment this to get better logging for debugging
 		// org.apache.log4j.BasicConfigurator.configure();
@@ -151,6 +179,7 @@ public void setUp() throws Exception {
 	}
 
 	@AfterEach
+	@TearDown(Level.Iteration)
 	public void tearDown() throws RepositoryException {
 		try {
 			if (connection != null) {
@@ -767,8 +796,8 @@ public void testPropertyVar() throws MalformedQueryException, RepositoryExceptio
 	}
 
 	@Test
+	@Benchmark
 	public void testMultithreadedAdd() throws InterruptedException {
-		int numThreads = 3;
 		final CountDownLatch startLatch = new CountDownLatch(1);
 		final CountDownLatch endLatch = new CountDownLatch(numThreads);
 		final Set<Throwable> exceptions = ConcurrentHashMap.newKeySet();