import quincy beta 17.1.0

[ceph.git] / ceph / src / test / test_intarith.cc

diff --git a/ceph/src/test/test_intarith.cc b/ceph/src/test/test_intarith.cc
index 239222046e3a3af5526fe173c85de25ee030ed3a..c7dae7a7dcd6c1eb75d4d05d70c133d4c4441b99 100644 (file)
--- a/ceph/src/test/test_intarith.cc
+++ b/ceph/src/test/test_intarith.cc
@@ -1,9 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <iostream>
+#include <climits>
 #include <gtest/gtest.h>
-
 #include "include/intarith.h"
 
 TEST(intarith, cbits) {
@@ -12,34 +11,34 @@ TEST(intarith, cbits) {
   ASSERT_EQ(2u, cbits(2));
   ASSERT_EQ(2u, cbits(3));
   ASSERT_EQ(3u, cbits(4));
-  ASSERT_EQ(0u, cbitsl(0));
-  ASSERT_EQ(1u, cbitsl(1));
-  ASSERT_EQ(2u, cbitsl(2));
-  ASSERT_EQ(2u, cbitsl(3));
-  ASSERT_EQ(3u, cbitsl(4));
+  ASSERT_EQ(0u, cbits(0));
+  ASSERT_EQ(1u, cbits(1));
+  ASSERT_EQ(2u, cbits(2));
+  ASSERT_EQ(2u, cbits(3));
+  ASSERT_EQ(3u, cbits(4));
   ASSERT_EQ(9u, cbits(0x100));
   ASSERT_EQ(32u, cbits(0xffffffff));
-  ASSERT_EQ(32u, cbitsl(0xffffffff));
-  ASSERT_EQ(32u, cbitsll(0xffffffff));
-  ASSERT_EQ(64u, cbitsll(0xffffffffffffffff));
+  ASSERT_EQ(32u, cbits(0xffffffff));
+  ASSERT_EQ(32u, cbits(0xffffffff));
+  ASSERT_EQ(64u, cbits(0xffffffffffffffff));
 }
 
 TEST(intarith, clz) {
-  ASSERT_EQ(32u, clz(0));
-  ASSERT_EQ(31u, clz(1));
-  ASSERT_EQ(30u, clz(2));
-  ASSERT_EQ(30u, clz(3));
-  ASSERT_EQ(29u, clz(4));
-  ASSERT_EQ(64u, clzll(0));
-  ASSERT_EQ(63u, clzll(1));
-  ASSERT_EQ(62u, clzll(2));
-  ASSERT_EQ(62u, clzll(3));
-  ASSERT_EQ(61u, clzll(4));
-  ASSERT_EQ(23u, clz(0x100));
-  ASSERT_EQ(55u, clzll(0x100));
+  ASSERT_EQ(32u, clz(UINT32_C(0)));
+  ASSERT_EQ(31u, clz(UINT32_C(1)));
+  ASSERT_EQ(30u, clz(UINT32_C(2)));
+  ASSERT_EQ(30u, clz(UINT32_C(3)));
+  ASSERT_EQ(29u, clz(UINT32_C(4)));
+  ASSERT_EQ(64u, clz(UINT64_C(0)));
+  ASSERT_EQ(63u, clz(UINT64_C(1)));
+  ASSERT_EQ(62u, clz(UINT64_C(2)));
+  ASSERT_EQ(62u, clz(UINT64_C(3)));
+  ASSERT_EQ(61u, clz(UINT64_C(4)));
+  ASSERT_EQ(23u, clz(UINT32_C(0x100)));
+  ASSERT_EQ(55u, clz(UINT64_C(0x100)));
   ASSERT_EQ(0u, clz(0xffffffff));
-  ASSERT_EQ(32u, clzll(0xffffffff));
-  ASSERT_EQ(0u, clzll(0xffffffffffffffff));
+  ASSERT_EQ(32u, clz(UINT64_C(0xffffffff)));
+  ASSERT_EQ(0u, clz(UINT64_C(0xffffffffffffffff)));
 }
 
 TEST(intarith, ctz) {
@@ -48,18 +47,18 @@ TEST(intarith, ctz) {
   ASSERT_EQ(1u, ctz(2));
   ASSERT_EQ(0u, ctz(3));
   ASSERT_EQ(2u, ctz(4));
-  ASSERT_EQ(64u, ctzll(0));
-  ASSERT_EQ(0u, ctzll(1));
-  ASSERT_EQ(1u, ctzll(2));
-  ASSERT_EQ(0u, ctzll(3));
-  ASSERT_EQ(2u, ctzll(4));
+  ASSERT_EQ(64u, ctz(UINT64_C(0)));
+  ASSERT_EQ(0u, ctz(UINT64_C(1)));
+  ASSERT_EQ(1u, ctz(UINT64_C(2)));
+  ASSERT_EQ(0u, ctz(UINT64_C(3)));
+  ASSERT_EQ(2u, ctz(UINT64_C(4)));
   ASSERT_EQ(8u, ctz(0x100));
-  ASSERT_EQ(8u, ctzll(0x100));
+  ASSERT_EQ(8u, ctz(UINT64_C(0x100)));
   ASSERT_EQ(0u, ctz(0xffffffff));
-  ASSERT_EQ(0u, ctzl(0xffffffff));
-  ASSERT_EQ(0u, ctzll(0xffffffff));
-  ASSERT_EQ(20u, ctzll(0xffffffff00000));
-  ASSERT_EQ(48u, ctzll(0xff000000000000ull));
+  ASSERT_EQ(0u, ctz(UINT32_C(0xffffffff)));
+  ASSERT_EQ(0u, ctz(UINT64_C(0xffffffff)));
+  ASSERT_EQ(20u, ctz(UINT64_C(0xffffffff00000)));
+  ASSERT_EQ(48u, ctz(UINT64_C(0xff000000000000)));
 }
 
 TEST(intarith, p2family) {
@@ -80,3 +79,22 @@ TEST(intarith, p2family) {
   ASSERT_EQ(0x1300, p2roundup(0x1234, 0x100));
   ASSERT_EQ(0x5600, p2roundup(0x5600, 0x100));
 }
+
+TEST(intarith, popcount) {
+  // char, unsigned char
+  EXPECT_EQ(0, popcount((char)(0)));
+  EXPECT_EQ(1, popcount((unsigned char)(1)));
+  // short, unsigned short
+  EXPECT_EQ(1, popcount((short)0b10));
+  EXPECT_EQ(2, popcount((unsigned char)(0b11U)));
+  // int, unsigned int
+  EXPECT_EQ(sizeof(int) * CHAR_BIT, popcount(-1));
+  EXPECT_EQ(0, popcount(0));
+  EXPECT_EQ(1, popcount(0b10U));
+  // long, unsigned long
+  EXPECT_EQ(1, popcount(0b1000'0000'0000'0000L));
+  EXPECT_EQ(3, popcount(0b1100'1000'0000'0000UL));
+  // long long, unsigned long long
+  EXPECT_EQ(4, popcount(0x1111'0000LL));
+  EXPECT_EQ(1, popcount(0x1000'0000ULL));
+}