Fixes and corrections on formatting.

This commit is contained in:
Fernando Sahmkow 2019-03-19 22:20:15 -04:00 committed by FernandoS27
parent f35e09fe0d
commit db42bcb306
5 changed files with 30 additions and 41 deletions

View file

@ -8,35 +8,16 @@
namespace Common {
inline u32 CTZ32(u32 value) {
u32 count = 0;
while (((value >> count) & 0xf) == 0 && count < 32)
count += 4;
while (((value >> count) & 1) == 0 && count < 32)
count++;
return count;
}
inline u64 CTZ64(u64 value) {
u64 count = 0;
while (((value >> count) & 0xf) == 0 && count < 64)
count += 4;
while (((value >> count) & 1) == 0 && count < 64)
count++;
return count;
}
TEST_CASE("BitUtils", "[common]") {
REQUIRE(Common::CountTrailingZeroes32(0) == CTZ32(0));
REQUIRE(Common::CountTrailingZeroes64(0) == CTZ64(0));
REQUIRE(Common::CountTrailingZeroes32(9) == CTZ32(9));
REQUIRE(Common::CountTrailingZeroes32(8) == CTZ32(8));
REQUIRE(Common::CountTrailingZeroes32(0x801000) == CTZ32(0x801000));
REQUIRE(Common::CountTrailingZeroes64(9) == CTZ64(9));
REQUIRE(Common::CountTrailingZeroes64(8) == CTZ64(8));
REQUIRE(Common::CountTrailingZeroes64(0x801000) == CTZ64(0x801000));
REQUIRE(Common::CountTrailingZeroes64(0x801000000000UL) == CTZ64(0x801000000000UL));
TEST_CASE("BitUtils::CountTrailingZeroes", "[common]") {
REQUIRE(Common::CountTrailingZeroes32(0) == 32);
REQUIRE(Common::CountTrailingZeroes64(0) == 64);
REQUIRE(Common::CountTrailingZeroes32(9) == 0);
REQUIRE(Common::CountTrailingZeroes32(8) == 3);
REQUIRE(Common::CountTrailingZeroes32(0x801000) == 12);
REQUIRE(Common::CountTrailingZeroes64(9) == 0);
REQUIRE(Common::CountTrailingZeroes64(8) == 3);
REQUIRE(Common::CountTrailingZeroes64(0x801000) == 12);
REQUIRE(Common::CountTrailingZeroes64(0x801000000000UL) == 36);
}
} // namespace Common

View file

@ -11,7 +11,7 @@ namespace Common {
TEST_CASE("MultiLevelQueue", "[common]") {
std::array<f32, 8> values = {0.0, 5.0, 1.0, 9.0, 8.0, 2.0, 6.0, 7.0};
Common::MultiLevelQueue<f32,64> mlq;
Common::MultiLevelQueue<f32, 64> mlq;
REQUIRE(mlq.empty());
mlq.add(values[2], 2);
mlq.add(values[7], 7);