Tidy

rm unused multiply

more tests

Author: jamierpond

inc/zoo/swar/associative_iteration.h

@@ -411,36 +411,6 @@ constexpr auto associativeOperatorIterated_regressive(
     return result;
 }
 
-
-// What I don't understand is why this doesn't work?
-template <typename T>
-constexpr auto multiply(T a , T b) {
-    auto operation = [](auto left, auto right, auto count) {
-      if (count) {
-        return left + right;
-      } else {
-        return left;
-      }
-    };
-
-    auto updateCount = [](auto count) {
-      return count << 1;
-    };
-
-    constexpr auto numBits = sizeof(T) * 8;
-    return associativeOperatorIterated_regressive(
-        a,          // base
-        0,          // neutral
-        b,          // count
-        1,          // forSquaring, pretty sure this is where i am not understanding
-        operation,  // operation
-        numBits,    // log2Count
-        updateCount // halver
-    );
-}
-
-// static_assert(multiply(3, 4) == 12, "multiply failed");
-
 template<int ActualBits, int NB, typename T>
 constexpr auto multiplication_OverflowUnsafe_SpecificBitCount(
     SWAR<NB, T> multiplicand, SWAR<NB, T> multiplier

test/swar/BasicOperations.cpp

@@ -2,6 +2,7 @@
 
 #include "catch2/catch.hpp"
 
+#include <initializer_list>
 #include <type_traits>
 
 
@@ -59,7 +60,7 @@ static_assert(
 
 static_assert(0b00000010000000110000010100000110 == 0x02'03'05'06);
 
-TEST_CASE("Jamie's totally working exponentiation :D") {
+TEST_CASE("Expontiation with 8-bit lane width (overflow unsafe)") {
   using S = SWAR<8, u32>;
   constexpr auto base     = S::fromLaneLiterals({2,   3,  5,  6});
   constexpr auto exponent = S::fromLaneLiterals({7,   4,  2,  3});
@@ -69,8 +70,19 @@ TEST_CASE("Jamie's totally working exponentiation :D") {
   CHECK(expected.value() == actual.value());
 }
 
+TEST_CASE("Expontiation with 16-bit lane width (overflow unsafe)") {
+  using S = SWAR<16, u64>; // Change to 16-bit lane width
+  constexpr auto base     = S::fromLaneLiterals({10,   2,  7, 3});
+  constexpr auto exponent = S::fromLaneLiterals({3,    5,  1, 4});
+  constexpr auto expected = S::fromLaneLiterals({1000, 32, 7, 81});
+  constexpr auto actual = exponentiation_OverflowUnsafe(base, exponent);
+  static_assert(expected.value() == actual.value());
+  CHECK(expected.value() == actual.value());
 }
 
+};
+
+
 #define HE(nbits, t, v0, v1) \
     static_assert(horizontalEquality<nbits, t>(\
         SWAR<nbits, t>(v0),\
@@ -358,7 +370,7 @@ TEST_CASE(
     "BooleanSWAR MSBtoLaneMask",
     "[swar]"
 ) {
-    // BooleanSWAR as a mask: 
+    // BooleanSWAR as a mask:
     auto bswar =BooleanSWAR<4, u32>(0x0808'0000);
     auto mask = S4_32(0x0F0F'0000);
     CHECK(bswar.MSBtoLaneMask().value() == mask.value());
@@ -385,6 +397,6 @@ TEST_CASE(
     CHECK(SWAR<4, u16>(0x0400).value() == saturatingUnsignedAddition(SWAR<4, u16>(0x0100), SWAR<4, u16>(0x0300)).value());
     CHECK(SWAR<4, u16>(0x0B00).value() == saturatingUnsignedAddition(SWAR<4, u16>(0x0800), SWAR<4, u16>(0x0300)).value());
     CHECK(SWAR<4, u16>(0x0F00).value() == saturatingUnsignedAddition(SWAR<4, u16>(0x0800), SWAR<4, u16>(0x0700)).value());
-    CHECK(SWAR<4, u16>(0x0F00).value() == saturatingUnsignedAddition(SWAR<4, u16>(0x0800), SWAR<4, u16>(0x0800)).value()); 
-    CHECK(S4_32(0x0F0C'F000).value() == saturatingUnsignedAddition(S4_32(0x0804'F000), S4_32(0x0808'F000)).value()); 
+    CHECK(SWAR<4, u16>(0x0F00).value() == saturatingUnsignedAddition(SWAR<4, u16>(0x0800), SWAR<4, u16>(0x0800)).value());
+    CHECK(S4_32(0x0F0C'F000).value() == saturatingUnsignedAddition(S4_32(0x0804'F000), S4_32(0x0808'F000)).value());
 }