Skip to content

Adding more bit support to jmh osq benchmark #138049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2025
+44 −10
Merged

Adding more bit support to jmh osq benchmark #138049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5fad34
Adding more bit support to jmh osq benchmark
benwtrent Nov 13, 2025
ebf0ab9
Merge branch 'main' into updated-jmh-for-multi-bytes
benwtrent Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions benchmarks/src/main/java/org/elasticsearch/benchmark/vector/OSQScorerBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
import org.apache.lucene.util.quantization.OptimizedScalarQuantizer;
import org.elasticsearch.common.logging.LogConfigurator;
import org.elasticsearch.core.IOUtils;
import org.elasticsearch.index.codec.vectors.diskbbq.next.ESNextDiskBBQVectorsFormat;
import org.elasticsearch.simdvec.ES91OSQVectorsScorer;
import org.elasticsearch.simdvec.ESNextOSQVectorsScorer;
import org.elasticsearch.simdvec.internal.vectorization.ESVectorizationProvider;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand Down Expand Up @@ -57,6 +59,9 @@ public class OSQScorerBenchmark {
@Param({ "384", "782", "1024" })
int dims;

@Param({ "1", "2", "4" })
int bits;

int length;

int numVectors = ES91OSQVectorsScorer.BULK_SIZE * 10;
Expand All @@ -68,8 +73,8 @@ public class OSQScorerBenchmark {
float centroidDp;

byte[] scratch;
ES91OSQVectorsScorer scorerMmap;
ES91OSQVectorsScorer scorerNfios;
ESNextOSQVectorsScorer scorerMmap;
ESNextOSQVectorsScorer scorerNfios;

Directory dirMmap;
IndexInput inMmap;
Expand All @@ -84,7 +89,12 @@ public class OSQScorerBenchmark {
public void setup() throws IOException {
Random random = new Random(123);

this.length = OptimizedScalarQuantizer.discretize(dims, 64) / 8;
this.length = switch (bits) {
case 1 -> ESNextDiskBBQVectorsFormat.QuantEncoding.ONE_BIT_4BIT_QUERY.getDocPackedLength(dims);
case 2 -> ESNextDiskBBQVectorsFormat.QuantEncoding.TWO_BIT_4BIT_QUERY.getDocPackedLength(dims);
case 4 -> ESNextDiskBBQVectorsFormat.QuantEncoding.FOUR_BIT_SYMMETRIC.getDocPackedLength(dims);
default -> throw new IllegalArgumentException("Unsupported bits: " + bits);
};

binaryVectors = new byte[numVectors][length];
for (byte[] binaryVector : binaryVectors) {
Expand All @@ -109,8 +119,14 @@ public void setup() throws IOException {
outNfios.close();
inMmap = dirMmap.openInput("vectors", IOContext.DEFAULT);
inNiofs = dirNiofs.openInput("vectors", IOContext.DEFAULT);

binaryQueries = new byte[numVectors][4 * length];
int binaryQueryLength = switch (bits) {
case 1 -> ESNextDiskBBQVectorsFormat.QuantEncoding.ONE_BIT_4BIT_QUERY.getQueryPackedLength(dims);
case 2 -> ESNextDiskBBQVectorsFormat.QuantEncoding.TWO_BIT_4BIT_QUERY.getQueryPackedLength(dims);
case 4 -> ESNextDiskBBQVectorsFormat.QuantEncoding.FOUR_BIT_SYMMETRIC.getQueryPackedLength(dims);
default -> throw new IllegalArgumentException("Unsupported bits: " + bits);
};

binaryQueries = new byte[numVectors][binaryQueryLength];
for (byte[] binaryVector : binaryVectors) {
random.nextBytes(binaryVector);
}
Expand All @@ -123,8 +139,26 @@ public void setup() throws IOException {
centroidDp = random.nextFloat();

scratch = new byte[length];
scorerMmap = ESVectorizationProvider.getInstance().newES91OSQVectorsScorer(inMmap, dims);
scorerNfios = ESVectorizationProvider.getInstance().newES91OSQVectorsScorer(inNiofs, dims);
final int docBits;
final int queryBits = switch (bits) {
case 1 -> {
docBits = 1;
yield 4;
}
case 2 -> {
docBits = 2;
yield 4;
}
case 4 -> {
docBits = 4;
yield 4;
}
default -> throw new IllegalArgumentException("Unsupported bits: " + bits);
};
scorerMmap = ESVectorizationProvider.getInstance()
.newESNextOSQVectorsScorer(inMmap, (byte) queryBits, (byte) docBits, dims, length);
scorerNfios = ESVectorizationProvider.getInstance()
.newESNextOSQVectorsScorer(inNiofs, (byte) queryBits, (byte) docBits, dims, length);
scratchScores = new float[16];
corrections = new float[3];
}
Expand Down Expand Up @@ -156,7 +190,7 @@ public void scoreFromMemorySegmentOnlyVectorNiofsVect(Blackhole bh) throws IOExc
scoreFromMemorySegmentOnlyVector(bh, inNiofs, scorerNfios);
}

private void scoreFromMemorySegmentOnlyVector(Blackhole bh, IndexInput in, ES91OSQVectorsScorer scorer) throws IOException {
private void scoreFromMemorySegmentOnlyVector(Blackhole bh, IndexInput in, ESNextOSQVectorsScorer scorer) throws IOException {
for (int j = 0; j < numQueries; j++) {
in.seek(0);
for (int i = 0; i < numVectors; i++) {
Expand Down Expand Up @@ -203,7 +237,7 @@ public void scoreFromMemorySegmentOnlyVectorBulkNiofsVect(Blackhole bh) throws I
scoreFromMemorySegmentOnlyVectorBulk(bh, inNiofs, scorerNfios);
}

private void scoreFromMemorySegmentOnlyVectorBulk(Blackhole bh, IndexInput in, ES91OSQVectorsScorer scorer) throws IOException {
private void scoreFromMemorySegmentOnlyVectorBulk(Blackhole bh, IndexInput in, ESNextOSQVectorsScorer scorer) throws IOException {
for (int j = 0; j < numQueries; j++) {
in.seek(0);
for (int i = 0; i < numVectors; i += 16) {
Expand Down Expand Up @@ -252,7 +286,7 @@ public void scoreFromMemorySegmentAllBulkNiofsVect(Blackhole bh) throws IOExcept
scoreFromMemorySegmentAllBulk(bh, inNiofs, scorerNfios);
}

private void scoreFromMemorySegmentAllBulk(Blackhole bh, IndexInput in, ES91OSQVectorsScorer scorer) throws IOException {
private void scoreFromMemorySegmentAllBulk(Blackhole bh, IndexInput in, ESNextOSQVectorsScorer scorer) throws IOException {
for (int j = 0; j < numQueries; j++) {
in.seek(0);
for (int i = 0; i < numVectors; i += 16) {
Expand Down