phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feefrac fuzz: use arith_uint256 instead of ad-hoc multiply

Browse source 
Rather than use an ad-hoc reimplementation of wide multiplication inside the
fuzz test, reuse arith_uint256, which already has this. It's larger than what we
need here, but performance isn't a concern in this test, and it does what we need.
This commit is contained in:
Pieter Wuille 2024-07-29 16:00:34 -04:00
parent 46ff4220bf
commit fcfe008db2
1 changed files with 19 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/test/fuzz/feefrac.cpp
View file

@ -2,6 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <arith_uint256.h>
#include <util/feefrac.h> #include <util/feefrac.h>
#include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>
@ -13,43 +14,22 @@
namespace { namespace {
/** Compute a * b, represented in 4x32 bits, highest limb first. */ /** The maximum absolute value of an int64_t, as an arith_uint256 (2^63). */
std::array<uint32_t, 4> Mul128(uint64_t a, uint64_t b) const auto MAX_ABS_INT64 = arith_uint256{1} << 63;
/** Construct an arith_uint256 whose value equals abs(x). */
arith_uint256 Abs256(int64_t x)
{ {
std::array<uint32_t, 4> ret{0, 0, 0, 0}; if (x >= 0) {
// For positive numbers, pass through the value.
/** Perform ret += v << (32 * pos), at 128-bit precision. */ return arith_uint256{static_cast<uint64_t>(x)};
auto add_fn = [&](uint64_t v, int pos) { } else if (x > std::numeric_limits<int64_t>::min()) {
uint64_t accum{0}; // For negative numbers, negate first.
for (int i = 0; i + pos < 4; ++i) { return arith_uint256{static_cast<uint64_t>(-x)};
// Add current value at limb pos in ret. } else {
accum += ret[3 - pos - i]; // Special case for x == -2^63 (for which -x results in integer overflow).
// Add low or high half of v. return MAX_ABS_INT64;
if (i == 0) accum += v & 0xffffffff;
if (i == 1) accum += v >> 32;
// Store lower half of result in limb pos in ret.
ret[3 - pos - i] = accum & 0xffffffff;
// Leave carry in accum.
accum >>= 32;
}
// Make sure no overflow.
assert(accum == 0);
};
// Multiply the 4 individual limbs (schoolbook multiply, with base 2^32).
add_fn((a & 0xffffffff) * (b & 0xffffffff), 0);
add_fn((a >> 32) * (b & 0xffffffff), 1);
add_fn((a & 0xffffffff) * (b >> 32), 1);
add_fn((a >> 32) * (b >> 32), 2);
return ret;
}
/* comparison helper for std::array */
std::strong_ordering compare_arrays(const std::array<uint32_t, 4>& a, const std::array<uint32_t, 4>& b) {
for (size_t i = 0; i < a.size(); ++i) {
if (a[i] != b[i]) return a[i] <=> b[i];
} }
return std::strong_ordering::equal;
} }
std::strong_ordering MulCompare(int64_t a1, int64_t a2, int64_t b1, int64_t b2) std::strong_ordering MulCompare(int64_t a1, int64_t a2, int64_t b1, int64_t b2)
@ -59,23 +39,14 @@ std::strong_ordering MulCompare(int64_t a1, int64_t a2, int64_t b1, int64_t b2)
int sign_b = (b1 == 0 ? 0 : b1 < 0 ? -1 : 1) * (b2 == 0 ? 0 : b2 < 0 ? -1 : 1); int sign_b = (b1 == 0 ? 0 : b1 < 0 ? -1 : 1) * (b2 == 0 ? 0 : b2 < 0 ? -1 : 1);
if (sign_a != sign_b) return sign_a <=> sign_b; if (sign_a != sign_b) return sign_a <=> sign_b;
// Compute absolute values. // Compute absolute values of products.
uint64_t abs_a1 = static_cast<uint64_t>(a1), abs_a2 = static_cast<uint64_t>(a2); auto mul_abs_a = Abs256(a1) * Abs256(a2), mul_abs_b = Abs256(b1) * Abs256(b2);
uint64_t abs_b1 = static_cast<uint64_t>(b1), abs_b2 = static_cast<uint64_t>(b2);
// Use (~x + 1) instead of the equivalent (-x) to silence the linter; mod 2^64 behavior is
// intentional here.
if (a1 < 0) abs_a1 = ~abs_a1 + 1;
if (a2 < 0) abs_a2 = ~abs_a2 + 1;
if (b1 < 0) abs_b1 = ~abs_b1 + 1;
if (b2 < 0) abs_b2 = ~abs_b2 + 1;
// Compute products of absolute values. // Compute products of absolute values.
auto mul_abs_a = Mul128(abs_a1, abs_a2);
auto mul_abs_b = Mul128(abs_b1, abs_b2);
if (sign_a < 0) { if (sign_a < 0) {
return compare_arrays(mul_abs_b, mul_abs_a); return mul_abs_b <=> mul_abs_a;
} else { } else {
return compare_arrays(mul_abs_a, mul_abs_b); return mul_abs_a <=> mul_abs_b;
} }
} }