Remove score correction from native signature

ldematte · ldematte · commit 39d7f79ed44f · 2025-11-28T10:05:00.000+01:00
diff --git a/libs/native/src/main/java/org/elasticsearch/nativeaccess/jdk/JdkVectorLibrary.java b/libs/native/src/main/java/org/elasticsearch/nativeaccess/jdk/JdkVectorLibrary.java
@@ -62,7 +62,7 @@ public final class JdkVectorLibrary implements VectorLibrary {
                     );
                     dot7uBulkWithOffsets$mh = downcallHandle(
                         "vec_dot7u_bulk_offsets_2",
-                        FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS, JAVA_INT, JAVA_FLOAT, ADDRESS),
+                        FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS, JAVA_INT, ADDRESS),
                         LinkerHelperUtil.critical()
                     );
                     sqr7u$mh = downcallHandle(
@@ -98,7 +98,7 @@ public final class JdkVectorLibrary implements VectorLibrary {
                     );
                     dot7uBulkWithOffsets$mh = downcallHandle(
                         "vec_dot7u_bulk_offsets",
-                        FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS, JAVA_INT, JAVA_FLOAT, ADDRESS),
+                        FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS, JAVA_INT, ADDRESS),
                         LinkerHelperUtil.critical()
                     );
                     sqr7u$mh = downcallHandle(
@@ -180,10 +180,9 @@ static void dotProduct7uBulkWithOffsets(
             int pitch,
             MemorySegment offsets,
             int count,
-            float scoreCorrection,
             MemorySegment result
         ) {
-            dot7uBulkWithOffsets(a, b, length, pitch, offsets, count, scoreCorrection, result);
+            dot7uBulkWithOffsets(a, b, length, pitch, offsets, count, result);
         }
 
         /**
@@ -269,11 +268,10 @@ private static void dot7uBulkWithOffsets(
             int pitch,
             MemorySegment offsets,
             int count,
-            float scoreCorrection,
             MemorySegment result
         ) {
             try {
-                JdkVectorLibrary.dot7uBulkWithOffsets$mh.invokeExact(a, b, length, pitch, offsets, count, scoreCorrection, result);
+                JdkVectorLibrary.dot7uBulkWithOffsets$mh.invokeExact(a, b, length, pitch, offsets, count, result);
             } catch (Throwable t) {
                 throw new AssertionError(t);
             }
@@ -340,7 +338,6 @@ private static float sqrf32(MemorySegment a, MemorySegment b, int length) {
                         int.class,
                         MemorySegment.class,
                         int.class,
-                        float.class,
                         MemorySegment.class
                     )
                 );
diff --git a/libs/native/src/test/java/org/elasticsearch/nativeaccess/jdk/JDKVectorLibraryInt7uTests.java b/libs/native/src/test/java/org/elasticsearch/nativeaccess/jdk/JDKVectorLibraryInt7uTests.java
@@ -140,7 +140,7 @@ public void testInt7uBulkWithOffsets() {
         var nativeQuerySeg = vectorsSegment.asSlice((long) queryOrd * dims, dims);
         var bulkScoresSeg = arena.allocate((long) numVecs * Float.BYTES);
 
-        dotProduct7uBulkWithOffsets(vectorsSegment, nativeQuerySeg, dims, dims, offsetsSegment, numVecs, 1.0f, bulkScoresSeg);
+        dotProduct7uBulkWithOffsets(vectorsSegment, nativeQuerySeg, dims, dims, offsetsSegment, numVecs, bulkScoresSeg);
         assertScoresEquals(expectedScores, bulkScoresSeg);
     }
 
@@ -168,7 +168,7 @@ public void testInt7uBulkWithOffsetsAndPitch() {
         var nativeQuerySeg = vectorsSegment.asSlice((long) queryOrd * pitch, pitch);
         var bulkScoresSeg = arena.allocate((long) numVecs * Float.BYTES);
 
-        dotProduct7uBulkWithOffsets(vectorsSegment, nativeQuerySeg, dims, pitch, offsetsSegment, numVecs, 1.0f, bulkScoresSeg);
+        dotProduct7uBulkWithOffsets(vectorsSegment, nativeQuerySeg, dims, pitch, offsetsSegment, numVecs, bulkScoresSeg);
         assertScoresEquals(expectedScores, bulkScoresSeg);
     }
 
@@ -199,7 +199,6 @@ public void testInt7uBulkWithOffsetsHeapSegments() {
             dims,
             MemorySegment.ofArray(offsets),
             numVecs,
-            1.0f,
             MemorySegment.ofArray(bulkScores)
         );
         assertArrayEquals(expectedScores, bulkScores, 0f);
@@ -297,11 +296,10 @@ void dotProduct7uBulkWithOffsets(
         int pitch,
         MemorySegment offsets,
         int count,
-        float scoreCorrection,
         MemorySegment result
     ) {
         try {
-            getVectorDistance().dotProductHandle7uBulkWithOffsets().invokeExact(a, b, dims, pitch, offsets, count, scoreCorrection, result);
+            getVectorDistance().dotProductHandle7uBulkWithOffsets().invokeExact(a, b, dims, pitch, offsets, count, result);
         } catch (Throwable e) {
             if (e instanceof Error err) {
                 throw err;
diff --git a/libs/simdvec/native/src/vec/c/aarch64/vec_1.cpp b/libs/simdvec/native/src/vec/c/aarch64/vec_1.cpp
@@ -100,20 +100,6 @@ EXPORT int32_t vec_dot7u(const int8_t* a, const int8_t* b, const int32_t dims) {
     return res;
 }
 
-static inline f32_t adjust(f32_t raw_score, f32_t score_correction, f32_t first_offset, f32_t second_offset) {
-    auto adjusted_score = raw_score * score_correction + first_offset + second_offset;
-    return fmaxf((1.0f + adjusted_score) / 2.0f, 0.0f);
-}
-
-static inline f32_t int_bits_to_float(const int32_t v) {
-    union {
-      int i;
-      float f;
-    } u;
-    u.i = (long)v;
-    return (f32_t)u.f;
-}
-
 template <int64_t(*mapper)(const int32_t, const int32_t*)>
 static inline void dot7u_inner_bulk(
     const int8_t* a,
@@ -122,7 +108,6 @@ static inline void dot7u_inner_bulk(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction,
     f32_t* results
 ) {
     size_t blk = dims & ~15;
@@ -215,7 +200,7 @@ static inline int64_t index(const int32_t i, const int32_t* offsets) {
 }
 
 EXPORT void vec_dot7u_bulk(const int8_t* a, const int8_t* b, const int32_t dims, const int32_t count, f32_t* results) {
-    dot7u_inner_bulk<identity>(a, b, dims, dims, NULL, count, 1.0f, results);
+    dot7u_inner_bulk<identity>(a, b, dims, dims, NULL, count, results);
 }
 
 
@@ -226,9 +211,8 @@ EXPORT void vec_dot7u_bulk_offsets(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction,
     f32_t* results) {
-    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, score_correction, results);
+    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, results);
 }
 
 static inline int32_t sqr7u_inner(int8_t *a, int8_t *b, const int32_t dims) {
diff --git a/libs/simdvec/native/src/vec/c/amd64/vec_1.cpp b/libs/simdvec/native/src/vec/c/amd64/vec_1.cpp
@@ -165,7 +165,6 @@ static inline void dot7u_inner_bulk(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction, // TODO
     f32_t* results
 ) {
     if (dims > STRIDE_BYTES_LEN) {
@@ -211,9 +210,8 @@ EXPORT void vec_dot7u_bulk_offsets(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction,
     f32_t* results) {
-    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, score_correction, results);
+    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, results);
 }
 
 static inline int32_t sqr7u_inner(int8_t *a, int8_t *b, const int32_t dims) {
diff --git a/libs/simdvec/native/src/vec/c/amd64/vec_2.cpp b/libs/simdvec/native/src/vec/c/amd64/vec_2.cpp
@@ -131,7 +131,6 @@ static inline void dot7u_inner_bulk(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction, // TODO
     f32_t* results
 ) {
     if (dims > STRIDE_BYTES_LEN) {
@@ -177,9 +176,8 @@ EXPORT void vec_dot7u_bulk_offsets_2(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction,
     f32_t* results) {
-    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, score_correction, results);
+    dot7u_inner_bulk<index>(a, b, dims, pitch, offsets, count, results);
 }
 
 template<int offsetRegs>
diff --git a/libs/simdvec/native/src/vec/headers/vec.h b/libs/simdvec/native/src/vec/headers/vec.h
@@ -48,7 +48,6 @@ EXPORT void vec_dot7u_bulk_offsets(
     const int32_t pitch,
     const int32_t* offsets,
     const int32_t count,
-    const f32_t score_correction,
     f32_t* results);
 
 EXPORT int32_t vec_sqr7u(int8_t *a, int8_t *b, const int32_t length);
diff --git a/libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Int7SQVectorScorerSupplier.java b/libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Int7SQVectorScorerSupplier.java
@@ -69,15 +69,7 @@ final void bulkScoreFromOrds(int firstOrd, int[] ordinals, float[] scores, int n
             if (SUPPORTS_HEAP_SEGMENTS) {
                 var ordinalsSeg = MemorySegment.ofArray(ordinals);
                 var scoresSeg = MemorySegment.ofArray(scores);
-                bulkScoreFromSegment(
-                    vectorsSeg,
-                    vectorLength,
-                    vectorPitch,
-                    firstOrd,
-                    ordinalsSeg,
-                    scoresSeg,
-                    numNodes
-                );
+                bulkScoreFromSegment(vectorsSeg, vectorLength, vectorPitch, firstOrd, ordinalsSeg, scoresSeg, numNodes);
             } else {
                 try (var arena = Arena.ofConfined()) {
                     var ordinalsMemorySegment = arena.allocate((long) numNodes * Integer.BYTES, 32);
@@ -251,16 +243,7 @@ protected void bulkScoreFromSegment(
         ) {
             long firstByteOffset = (long) firstOrd * vectorPitch;
             var firstVector = vectors.asSlice(firstByteOffset, vectorPitch);
-            Similarities.dotProduct7uBulkWithOffsets(
-                vectors,
-                firstVector,
-                dims,
-                vectorPitch,
-                ordinals,
-                numNodes,
-                scoreCorrectionConstant,
-                scores
-            );
+            Similarities.dotProduct7uBulkWithOffsets(vectors, firstVector, dims, vectorPitch, ordinals, numNodes, scores);
 
             // Java-side adjustment
             var aOffset = Float.intBitsToFloat(vectors.asSlice(firstByteOffset + vectorLength, Float.BYTES).get(ValueLayout.JAVA_INT, 0));
diff --git a/libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Similarities.java b/libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Similarities.java
@@ -75,11 +75,10 @@ static void dotProduct7uBulkWithOffsets(
         int pitch,
         MemorySegment offsets,
         int count,
-        float scoreCorrection,
         MemorySegment scores
     ) {
         try {
-            DOT_HANDLE_7U_BULK_WITH_OFFSETS.invokeExact(a, b, length, pitch, offsets, count, scoreCorrection, scores);
+            DOT_HANDLE_7U_BULK_WITH_OFFSETS.invokeExact(a, b, length, pitch, offsets, count, scores);
         } catch (Throwable e) {
             if (e instanceof Error err) {
                 throw err;
diff --git a/libs/simdvec/src/main22/java/org/elasticsearch/simdvec/internal/Int7SQVectorScorer.java b/libs/simdvec/src/main22/java/org/elasticsearch/simdvec/internal/Int7SQVectorScorer.java
@@ -122,16 +122,7 @@ public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOExcept
                 var scoresSeg = MemorySegment.ofArray(scores);
 
                 var vectorPitch = vectorByteSize + Float.BYTES;
-                dotProduct7uBulkWithOffsets(
-                    vectorsSeg,
-                    query,
-                    vectorByteSize,
-                    vectorPitch,
-                    ordinalsSeg,
-                    numNodes,
-                    scoreCorrectionConstant,
-                    scoresSeg
-                );
+                dotProduct7uBulkWithOffsets(vectorsSeg, query, vectorByteSize, vectorPitch, ordinalsSeg, numNodes, scoresSeg);
 
                 for (int i = 0; i < numNodes; ++i) {
                     var dotProduct = scores[i];
