From 2b7a02cbf49c0b630579ba713702998e3a5de490 Mon Sep 17 00:00:00 2001
From: Geir Storli <geirst@vespa.ai>
Date: Wed, 18 Dec 2024 14:44:59 +0100
Subject: [PATCH] Add more variants tested on Vespa Cloud.

---
 .../mmap_vs_directio/app/schemas/wikimedia.sd        | 10 +++++++++-
 tests/performance/mmap_vs_directio/app/services.xml  | 12 ++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/performance/mmap_vs_directio/app/schemas/wikimedia.sd b/tests/performance/mmap_vs_directio/app/schemas/wikimedia.sd
index 64c5eed32..9b3772d98 100644
--- a/tests/performance/mmap_vs_directio/app/schemas/wikimedia.sd
+++ b/tests/performance/mmap_vs_directio/app/schemas/wikimedia.sd
@@ -30,7 +30,7 @@ schema wikimedia {
   rank-profile use_bitvectors inherits default {
     rank-properties {
       # This is set to 1/64 which is the limit for generating bitvectors.
-      vespa.matching.diskindex.bitvector_limit: 0.015625
+      vespa.matching.diskindex.bitvector_limit: 0.05
     }
   }
 
@@ -41,6 +41,14 @@ schema wikimedia {
     }
   }
 
+  rank-profile weakand_stop_word_use_bitvectors inherits default {
+    rank-properties {
+      vespa.matching.weakand.stop_word_drop_limit: 0.6
+      vespa.matching.weakand.stop_word_adjust_limit: 0.01
+      vespa.matching.diskindex.bitvector_limit: 0.05
+    }
+  }
+
   document-summary minimal {
     summary id {}
   }
diff --git a/tests/performance/mmap_vs_directio/app/services.xml b/tests/performance/mmap_vs_directio/app/services.xml
index 9cfda01fe..5bad8fed8 100644
--- a/tests/performance/mmap_vs_directio/app/services.xml
+++ b/tests/performance/mmap_vs_directio/app/services.xml
@@ -8,6 +8,7 @@
         <search/>
         <nodes deploy:environment="perf" deploy:region="aws-us-east-1c" count="1">
             <resources vcpu="8.0" memory="16Gb" architecture="arm64" storage-type="remote" disk="48Gb"/>
+            <!-- <resources vcpu="1.0" memory="8Gb" architecture="arm64" storage-type="remote" disk="48Gb"/> -->
         </nodes>
     </container>
 
@@ -23,6 +24,9 @@
         <config name='vespa.config.search.core.proton'>
             <search>
                 <!-- <io>DIRECTIO</io> -->
+                <mmap>
+                    <!-- <advise>SEQUENTIAL</advise> -->
+                </mmap>
             </search>
             <index>
                 <cache>
@@ -35,16 +39,20 @@
                         <!-- <maxbytes>1299334981</maxbytes> -->
                         <!-- 20% : 2480 MiB -->
                         <!-- <maxbytes>2598669962</maxbytes> -->
+                        <!-- Force MMAP -->
+                        <!-- <maxbytes>-1</maxbytes> -->
                     </postinglist>
                     <bitvector>
                         <!-- 0.25% : 31 MiB -->
                         <!-- <maxbytes>32483374</maxbytes> -->
                         <!-- 0.5% : 62 MiB -->
                         <!-- <maxbytes>64966749</maxbytes> -->
-                        <!-- 0.1% : 124 MiB -->
+                        <!-- 1% : 124 MiB -->
                         <!-- <maxbytes>129933498</maxbytes> -->
-                        <!-- 0.2% : 248 MiB -->
+                        <!-- 2% : 248 MiB -->
                         <!-- <maxbytes>259866996</maxbytes> -->
+                        <!-- 5% : 620 MiB -->
+                        <!-- <maxbytes>649667490</maxbytes> -->
                     </bitvector>
                 </cache>
             </index>