Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41533 )
Change subject: base: Remove duplicate isPow2 helper
......................................................................
base: Remove duplicate isPow2 helper
This is already defined as isPowerOf2 in src/base/intmath.hh and it
is currently unused
Change-Id: I50b5d344e234fe1d4f1f85186686440773a209e3
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41533
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/base/bitfield.hh
M src/base/bitfield.test.cc
M src/base/intmath.test.cc
3 files changed, 2 insertions(+), 26 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 470941a..9dc7722 100644
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -304,14 +304,6 @@
}
/**
- * Checks if a number is a power of two, or zero.
- *
- * @ingroup api_bitfield
- */
-template <class T>
-constexpr inline bool isPow2(T v) { return (v & (v - 1)) == (T)0; }
-
-/**
* Returns the number of set ones in the provided value.
* PD algorithm from
* http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel
diff --git a/src/base/bitfield.test.cc b/src/base/bitfield.test.cc
index 51c316e..8097415 100644
--- a/src/base/bitfield.test.cc
+++ b/src/base/bitfield.test.cc
@@ -290,24 +290,6 @@
EXPECT_EQ(64, findLsbSet(0));
}
-/* The following tests a simple function that verifies whether a value is a
- * a power of two or not.
- */
-TEST(BitfieldTest, IsPow2)
-{
- EXPECT_TRUE(isPow2(32));
-}
-
-TEST(BitfieldTest, IsNotPow2)
-{
- EXPECT_FALSE(isPow2(36));
-}
-
-TEST(BitfieldTest, IsPow2Zero)
-{
- EXPECT_TRUE(isPow2(0));
-}
-
/*
* The following tests "popCount(X)". popCount counts the number of bits
set to
* one.
diff --git a/src/base/intmath.test.cc b/src/base/intmath.test.cc
index 4e88b00..e985a1b 100644
--- a/src/base/intmath.test.cc
+++ b/src/base/intmath.test.cc
@@ -33,10 +33,12 @@
TEST(IntmathTest, isPowerOf2)
{
EXPECT_TRUE(isPowerOf2(1));
+ EXPECT_TRUE(isPowerOf2(32));
EXPECT_TRUE(isPowerOf2(65536));
EXPECT_TRUE(isPowerOf2(131072));
EXPECT_TRUE(isPowerOf2(262144));
EXPECT_FALSE(isPowerOf2(0));
+ EXPECT_FALSE(isPowerOf2(36));
EXPECT_FALSE(isPowerOf2(2521));
EXPECT_FALSE(isPowerOf2(1679616));
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41533
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I50b5d344e234fe1d4f1f85186686440773a209e3
Gerrit-Change-Number: 41533
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
