A few optimization for doBigIntBinOpvv and doBigIntBinOpvs, still nee…

…d sv and bool returns

benchmarks/bigint_conversion.py

@@ -43,8 +43,15 @@ def time_bigint_conversion(N_per_locale, trials, seed, max_bits):
             (2 * a.size * a.itemsize) / 2**30 / avg_conversion
         )
     )
-    assert ak.all(a == u_arrays[0])
-    assert ak.all(b == u_arrays[1])
+    if max_bits == -1 or max_bits > 128:
+        assert ak.all(a == u_arrays[0])
+        assert ak.all(b == u_arrays[1])
+    elif max_bits <= 64:
+        assert ak.all(b % (2**max_bits - 1) == u_arrays[0])
+    else:
+        max_bits -= 64
+        assert ak.all(a & (2**max_bits - 1) == u_arrays[0])
+        assert ak.all(b == u_arrays[1])
 
 
 def check_correctness(seed, max_bits):
@@ -54,8 +61,15 @@ def check_correctness(seed, max_bits):
     b = ak.randint(0, N, N, dtype=ak.uint64, seed=seed)
     u_arrays = ak.bigint_from_uint_arrays([a, b], max_bits=max_bits).bigint_to_uint_arrays()
 
-    assert ak.all(a == u_arrays[0])
-    assert ak.all(b == u_arrays[1])
+    if max_bits == -1 or max_bits > 128:
+        assert ak.all(a == u_arrays[0])
+        assert ak.all(b == u_arrays[1])
+    elif max_bits <= 64:
+        assert ak.all(b % (2**max_bits - 1) == u_arrays[0])
+    else:
+        max_bits -= 64
+        assert ak.all(a & (2**max_bits - 1) == u_arrays[0])
+        assert ak.all(b == u_arrays[1])
 
 
 def create_parser():

benchmarks/bigint_stream.py

@@ -18,7 +18,7 @@ def time_ak_stream(N_per_locale, trials, alpha, max_bits, random, seed):
     if random or seed is not None:
         a1 = ak.randint(0, 2**32, N, dtype=ak.uint64, seed=seed)
         a2 = ak.randint(0, 2**32, N, dtype=ak.uint64, seed=seed)
-        a = ak.bigint_from_uint_arrays([a1, a2])
+        a = ak.bigint_from_uint_arrays([a1, a2], max_bits=max_bits)
         b1 = ak.randint(0, 2**32, N, dtype=ak.uint64, seed=seed)
         b2 = ak.randint(0, 2**32, N, dtype=ak.uint64, seed=seed)
         b = ak.bigint_from_uint_arrays([b1, b2], max_bits=max_bits)

src/BigIntMsg.chpl

@@ -37,10 +37,11 @@ module BigIntMsg {
 
         if max_bits != -1 {
             // modBy should always be non-zero since we start at 1 and left shift
-            var modBy = 1:bigint;
-            modBy <<= max_bits;
-            forall bA in bigIntArray with (var local_modBy = modBy) {
-              bA.mod(bA, local_modBy);
+            var max_size = 1:bigint;
+            max_size <<= max_bits;
+            max_size -= 1;
+            forall bA in bigIntArray with (var local_max_size = max_size) {
+              bA &= local_max_size;
             }
         }