Add lg_ceil to bit_util.
Also, add the bit_util test back to the Makefile.
This commit is contained in:
committed by
David Goldblatt
parent
07b89c7673
commit
2f07e92adb
@@ -48,10 +48,64 @@ TEST_BEGIN(test_pow2_ceil_zu) {
|
||||
}
|
||||
TEST_END
|
||||
|
||||
void
|
||||
assert_lg_ceil_range(size_t input, unsigned answer) {
|
||||
if (input == 1) {
|
||||
assert_u_eq(0, answer, "Got %u as lg_ceil of 1", answer);
|
||||
return;
|
||||
}
|
||||
assert_zu_le(input, (ZU(1) << answer),
|
||||
"Got %u as lg_ceil of %zu", answer, input);
|
||||
assert_zu_gt(input, (ZU(1) << (answer - 1)),
|
||||
"Got %u as lg_ceil of %zu", answer, input);
|
||||
}
|
||||
|
||||
void
|
||||
assert_lg_floor_range(size_t input, unsigned answer) {
|
||||
if (input == 1) {
|
||||
assert_u_eq(0, answer, "Got %u as lg_floor of 1", answer);
|
||||
return;
|
||||
}
|
||||
assert_zu_ge(input, (ZU(1) << answer),
|
||||
"Got %u as lg_floor of %zu", answer, input);
|
||||
assert_zu_lt(input, (ZU(1) << (answer + 1)),
|
||||
"Got %u as lg_floor of %zu", answer, input);
|
||||
}
|
||||
|
||||
TEST_BEGIN(test_lg_ceil_floor) {
|
||||
for (size_t i = 1; i < 10 * 1000 * 1000; i++) {
|
||||
assert_lg_ceil_range(i, lg_ceil(i));
|
||||
assert_lg_ceil_range(i, LG_CEIL(i));
|
||||
assert_lg_floor_range(i, lg_floor(i));
|
||||
assert_lg_floor_range(i, LG_FLOOR(i));
|
||||
}
|
||||
for (int i = 10; i < 8 * (1 << LG_SIZEOF_PTR) - 5; i++) {
|
||||
for (size_t j = 0; j < (1 << 4); j++) {
|
||||
size_t num1 = ((size_t)1 << i)
|
||||
- j * ((size_t)1 << (i - 4));
|
||||
size_t num2 = ((size_t)1 << i)
|
||||
+ j * ((size_t)1 << (i - 4));
|
||||
assert_zu_ne(num1, 0, "Invalid lg argument");
|
||||
assert_zu_ne(num2, 0, "Invalid lg argument");
|
||||
assert_lg_ceil_range(num1, lg_ceil(num1));
|
||||
assert_lg_ceil_range(num1, LG_CEIL(num1));
|
||||
assert_lg_ceil_range(num2, lg_ceil(num2));
|
||||
assert_lg_ceil_range(num2, LG_CEIL(num2));
|
||||
|
||||
assert_lg_floor_range(num1, lg_floor(num1));
|
||||
assert_lg_floor_range(num1, LG_FLOOR(num1));
|
||||
assert_lg_floor_range(num2, lg_floor(num2));
|
||||
assert_lg_floor_range(num2, LG_FLOOR(num2));
|
||||
}
|
||||
}
|
||||
}
|
||||
TEST_END
|
||||
|
||||
int
|
||||
main(void) {
|
||||
return test(
|
||||
test_pow2_ceil_u64,
|
||||
test_pow2_ceil_u32,
|
||||
test_pow2_ceil_zu);
|
||||
test_pow2_ceil_zu,
|
||||
test_lg_ceil_floor);
|
||||
}
|
||||
|
Reference in New Issue
Block a user