Reviewers: Michael Achenbach,
Description:
Rename CountSetBits32 to CountPopulation32 for consistency.
[email protected]
Please review this at https://codereview.chromium.org/502803002/
SVN Base: [email protected]:v8/v8.git@master
Affected files (+14, -16 lines):
M src/base/bits.h
M src/compiler/arm/instruction-selector-arm.cc
M src/data-flow.cc
M src/frames.cc
M test/base-unittests/bits-unittest.cc
Index: src/base/bits.h
diff --git a/src/base/bits.h b/src/base/bits.h
index
129bf6268c677ae0a562630565508e24f54853a3..04a0300a66542785b177cf60884e44ba52914e23
100644
--- a/src/base/bits.h
+++ b/src/base/bits.h
@@ -17,8 +17,8 @@ namespace v8 {
namespace base {
namespace bits {
-// CountSetBits32(value) returns the number of bits set in |value|.
-inline uint32_t CountSetBits32(uint32_t value) {
+// CountPopulation32(value) returns the number of bits set in |value|.
+inline uint32_t CountPopulation32(uint32_t value) {
#if V8_HAS_BUILTIN_POPCOUNT
return __builtin_popcount(value);
#else
@@ -47,7 +47,7 @@ inline uint32_t CountLeadingZeros32(uint32_t value) {
value = value | (value >> 4);
value = value | (value >> 8);
value = value | (value >> 16);
- return CountSetBits32(~value);
+ return CountPopulation32(~value);
#endif
}
Index: src/compiler/arm/instruction-selector-arm.cc
diff --git a/src/compiler/arm/instruction-selector-arm.cc
b/src/compiler/arm/instruction-selector-arm.cc
index
3bf7e2f84fd081eb7d365145d04f4938a5dec28a..90c8eb530039a5a65c6453ce1f114baddfe5bf10
100644
--- a/src/compiler/arm/instruction-selector-arm.cc
+++ b/src/compiler/arm/instruction-selector-arm.cc
@@ -423,7 +423,7 @@ void InstructionSelector::VisitWord32And(Node* node) {
}
if (IsSupported(ARMv7) && m.right().HasValue()) {
uint32_t value = m.right().Value();
- uint32_t width = base::bits::CountSetBits32(value);
+ uint32_t width = base::bits::CountPopulation32(value);
uint32_t msb = base::bits::CountLeadingZeros32(value);
if (width != 0 && msb + width == 32) {
DCHECK_EQ(0, base::bits::CountTrailingZeros32(value));
@@ -536,7 +536,7 @@ void InstructionSelector::VisitWord32Shr(Node* node) {
Int32BinopMatcher mleft(m.left().node());
if (mleft.right().HasValue()) {
uint32_t value = (mleft.right().Value() >> lsb) << lsb;
- uint32_t width = base::bits::CountSetBits32(value);
+ uint32_t width = base::bits::CountPopulation32(value);
uint32_t msb = base::bits::CountLeadingZeros32(value);
if (msb + width + lsb == 32) {
DCHECK_EQ(lsb, base::bits::CountTrailingZeros32(value));
Index: src/data-flow.cc
diff --git a/src/data-flow.cc b/src/data-flow.cc
index
9494525a02bb44170ec3f021175b4a612ebe9eb1..bd92ea0531511b0b970a32e6fa4dddb73c42a085
100644
--- a/src/data-flow.cc
+++ b/src/data-flow.cc
@@ -45,7 +45,7 @@ int BitVector::Count() const {
int count = 0;
for (int i = 0; i < data_length_; i++) {
int data = data_[i];
- if (data != 0) count += base::bits::CountSetBits32(data);
+ if (data != 0) count += base::bits::CountPopulation32(data);
}
return count;
}
Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index
b22fafdf8659b693c76a318dfe3988e1b8bfae18..a4e77ff5561aeed691c5a7d055770cb91fb01d0b
100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -1579,9 +1579,7 @@ int StackHandler::Rewind(Isolate* isolate,
//
-------------------------------------------------------------------------
-int NumRegs(RegList reglist) {
- return base::bits::CountSetBits32(reglist);
-}
+int NumRegs(RegList reglist) { return
base::bits::CountPopulation32(reglist); }
struct JSCallerSavedCodeData {
Index: test/base-unittests/bits-unittest.cc
diff --git a/test/base-unittests/bits-unittest.cc
b/test/base-unittests/bits-unittest.cc
index
56d3d9261beb9aaab847de70f31e03d7b71b751f..9113675556c73dba72538539a55012557d03afbc
100644
--- a/test/base-unittests/bits-unittest.cc
+++ b/test/base-unittests/bits-unittest.cc
@@ -10,13 +10,13 @@ namespace v8 {
namespace base {
namespace bits {
-TEST(BitsTest, CountSetBits32) {
- EXPECT_EQ(0u, CountSetBits32(0));
- EXPECT_EQ(1u, CountSetBits32(1));
- EXPECT_EQ(8u, CountSetBits32(0x11111111));
- EXPECT_EQ(16u, CountSetBits32(0xf0f0f0f0));
- EXPECT_EQ(24u, CountSetBits32(0xfff0f0ff));
- EXPECT_EQ(32u, CountSetBits32(0xffffffff));
+TEST(BitsTest, CountPopulation32) {
+ EXPECT_EQ(0u, CountPopulation32(0));
+ EXPECT_EQ(1u, CountPopulation32(1));
+ EXPECT_EQ(8u, CountPopulation32(0x11111111));
+ EXPECT_EQ(16u, CountPopulation32(0xf0f0f0f0));
+ EXPECT_EQ(24u, CountPopulation32(0xfff0f0ff));
+ EXPECT_EQ(32u, CountPopulation32(0xffffffff));
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
