reconcile with new bulkScore implementations

Author: mccullocht

lucene/core/src/java24/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentFloatVectorScorer.java

@@ -112,8 +112,9 @@ public float score(int node) throws IOException {
     }
 
     @Override
-    public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOException {
+    public float bulkScore(int[] nodes, float[] scores, int numNodes) throws IOException {
       float[] scratchScores = new float[4];
+      float maxScore = Float.NEGATIVE_INFINITY;
       int i = 0;
       final int limit = numNodes & ~3;
       for (; i < limit; i += 4) {
@@ -123,9 +124,13 @@ public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOExcept
         MemorySegment ms4 = getSegment(nodes[i + 3]);
         DOT_OPS.dotProductBulk(scratchScores, query, ms1, ms2, ms3, ms4, query.length);
         scores[i + 0] = normalizeToUnitInterval(scratchScores[0]);
+        maxScore = Math.max(maxScore, scores[i + 0]);
         scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
+        maxScore = Math.max(maxScore, scores[i + 1]);
         scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+        maxScore = Math.max(maxScore, scores[i + 2]);
         scores[i + 3] = normalizeToUnitInterval(scratchScores[3]);
+        maxScore = Math.max(maxScore, scores[i + 3]);
       }
       // Handle remaining 1–3 nodes in bulk (if any)
       int remaining = numNodes - i;
@@ -135,9 +140,17 @@ public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOExcept
         MemorySegment ms3 = (remaining > 2) ? getSegment(nodes[i + 2]) : ms1;
         DOT_OPS.dotProductBulk(scratchScores, query, ms1, ms2, ms3, ms1, query.length);
         scores[i] = normalizeToUnitInterval(scratchScores[0]);
-        if (remaining > 1) scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
-        if (remaining > 2) scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+        maxScore = Math.max(maxScore, scores[i]);
+        if (remaining > 1) {
+          scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
+          maxScore = Math.max(maxScore, scores[i + 1]);
+        }
+        if (remaining > 2) {
+          scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+          maxScore = Math.max(maxScore, scores[i + 2]);
+        }
       }
+      return maxScore;
     }
   }
 }

lucene/core/src/java24/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentFloatVectorScorerSupplier.java

@@ -117,9 +117,10 @@ public float score(int node) throws IOException {
         }
 
         @Override
-        public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOException {
+        public float bulkScore(int[] nodes, float[] scores, int numNodes) throws IOException {
           // TODO checkOrdinal(node1 ....);
           float[] scratchScores = new float[4];
+          float maxScore = Float.NEGATIVE_INFINITY;
           int i = 0;
           MemorySegment query = getSegment(queryOrd, queryScratch);
           final int limit = numNodes & ~3;
@@ -130,9 +131,13 @@ public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOExcept
             MemorySegment ms4 = getSegment(nodes[i + 3], scratch4);
             DOT_OPS.dotProductBulk(scratchScores, query, ms1, ms2, ms3, ms4, dims);
             scores[i + 0] = normalizeToUnitInterval(scratchScores[0]);
+            maxScore = Math.max(maxScore, scores[i + 0]);
             scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
+            maxScore = Math.max(maxScore, scores[i + 1]);
             scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+            maxScore = Math.max(maxScore, scores[i + 2]);
             scores[i + 3] = normalizeToUnitInterval(scratchScores[3]);
+            maxScore = Math.max(maxScore, scores[i + 3]);
           }
           // Handle remaining 1–3 nodes in bulk (if any)
           int remaining = numNodes - i;
@@ -142,9 +147,17 @@ public void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOExcept
             MemorySegment ms3 = (remaining > 2) ? getSegment(nodes[i + 2], scratch3) : ms1;
             DOT_OPS.dotProductBulk(scratchScores, query, ms1, ms2, ms3, ms1, dims);
             scores[i] = normalizeToUnitInterval(scratchScores[0]);
-            if (remaining > 1) scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
-            if (remaining > 2) scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+            maxScore = Math.max(maxScore, scores[i]);
+            if (remaining > 1) {
+              scores[i + 1] = normalizeToUnitInterval(scratchScores[1]);
+              maxScore = Math.max(maxScore, scores[i + 1]);
+            }
+            if (remaining > 2) {
+              scores[i + 2] = normalizeToUnitInterval(scratchScores[2]);
+              maxScore = Math.max(maxScore, scores[i + 2]);
+            }
           }
+          return maxScore;
         }
 
         @Override