From d4f4f94809c327a16ca73fb7b00b3e99591f991d Mon Sep 17 00:00:00 2001
From: Christopher Taylor <christopher.taylor@oculus.com>
Date: Sun, 28 May 2017 00:20:48 -0700
Subject: [PATCH] Fixes

---
 LeopardFF8.cpp      | 7 +++----
 tests/benchmark.cpp | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/LeopardFF8.cpp b/LeopardFF8.cpp
index cf76984..ca8a05b 100644
--- a/LeopardFF8.cpp
+++ b/LeopardFF8.cpp
@@ -280,7 +280,7 @@ static ffe_t FFEMultiplyLog(ffe_t a, ffe_t log_b)
 }
 
 
-bool InitializeMultiplyTables()
+void InitializeMultiplyTables()
 {
     for (int log_y = 0; log_y < 256; ++log_y)
     {
@@ -307,8 +307,6 @@ bool InitializeMultiplyTables()
         }
 #endif // LEO_TRY_AVX2
     }
-
-    return true;
 }
 
 
@@ -332,9 +330,9 @@ void mul_mem(
 #define LEO_MUL_256(x_ptr, y_ptr) { \
             LEO_M256 data = _mm256_loadu_si256(y_ptr); \
             LEO_M256 lo = _mm256_and_si256(data, clr_mask); \
+            lo = _mm256_shuffle_epi8(table_lo_y, lo); \
             LEO_M256 hi = _mm256_srli_epi64(data, 4); \
             hi = _mm256_and_si256(hi, clr_mask); \
-            lo = _mm256_shuffle_epi8(table_lo_y, lo); \
             hi = _mm256_shuffle_epi8(table_hi_y, hi); \
             _mm256_storeu_si256(x_ptr, _mm256_xor_si256(lo, hi)); }
 
@@ -1190,6 +1188,7 @@ bool Initialize()
         return false;
 
     InitializeLogarithmTables();
+    InitializeMultiplyTables();
     FFTInitialize();
 
     IsInitialized = true;
diff --git a/tests/benchmark.cpp b/tests/benchmark.cpp
index ce85857..0856089 100644
--- a/tests/benchmark.cpp
+++ b/tests/benchmark.cpp
@@ -506,7 +506,7 @@ static void BasicTest(const TestParameters& params)
             return;
         }
 
-#if 0
+#if 1
         for (unsigned i = 0; i < params.original_count; ++i)
         {
             if (!original_data[i])
@@ -758,6 +758,7 @@ int main(int argc, char **argv)
     t_leo_init.EndCall();
     t_leo_init.Print(1);
 
+#if 0
     ParallelXORBenchmark();
 #ifdef LEO_HAS_FF8
     ParallelButterfly8Benchmark();
@@ -765,6 +766,7 @@ int main(int argc, char **argv)
 #ifdef LEO_HAS_FF16
     ParallelButterfly16Benchmark();
 #endif // LEO_HAS_FF16
+#endif
 
     TestParameters params;