From 7b3f1442a438e266800fb79a03ac689e724ce47b Mon Sep 17 00:00:00 2001 From: Christopher Taylor Date: Sat, 27 May 2017 23:48:57 -0700 Subject: [PATCH] Cleanup --- LeopardFF8.cpp | 16 ++++++++-------- tests/benchmark.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LeopardFF8.cpp b/LeopardFF8.cpp index b677734..cf76984 100644 --- a/LeopardFF8.cpp +++ b/LeopardFF8.cpp @@ -1017,17 +1017,17 @@ void ErrorBitfield::Prepare() // First mip level is for final layer of FFT: pairs of data for (unsigned i = 0; i < kWords; ++i) { - uint64_t w = Words[0][i]; - const uint64_t hi2lo = w | ((w & kHiMasks[0]) >> 1); - const uint64_t lo2hi = ((w & (kHiMasks[0] >> 1)) << 1); - Words[0][i] = hi2lo | lo2hi; + const uint64_t w0 = Words[0][i]; + const uint64_t hi2lo0 = w0 | ((w0 & kHiMasks[0]) >> 1); + const uint64_t lo2hi0 = ((w0 & (kHiMasks[0] >> 1)) << 1); + Words[0][i] = hi2lo0 | lo2hi0; for (unsigned j = 1, bits = 2; j < 5; ++j, bits <<= 1) { - uint64_t w = Words[j - 1][i]; - const uint64_t hi2lo = w | ((w & kHiMasks[j]) >> bits); - const uint64_t lo2hi = ((w & (kHiMasks[j] >> bits)) << bits); - Words[j][i] = hi2lo | lo2hi; + const uint64_t w_j = Words[j - 1][i]; + const uint64_t hi2lo_j = w_j | ((w_j & kHiMasks[j]) >> bits); + const uint64_t lo2hi_j = ((w_j & (kHiMasks[j] >> bits)) << bits); + Words[j][i] = hi2lo_j | lo2hi_j; } } diff --git a/tests/benchmark.cpp b/tests/benchmark.cpp index 022a9f4..ce85857 100644 --- a/tests/benchmark.cpp +++ b/tests/benchmark.cpp @@ -389,7 +389,7 @@ struct TestParameters unsigned original_count = 1000; // under 65536 unsigned recovery_count = 100; // under 65536 - original_count #else - unsigned original_count = 100; // under 65536 + unsigned original_count = 200; // under 65536 unsigned recovery_count = 10; // under 65536 - original_count #endif unsigned buffer_bytes = 64000; // multiple of 64 bytes