summaryrefslogtreecommitdiff
path: root/libartbase/base/bit_vector_test.cc
diff options
context:
space:
mode:
authorAlex Light <allight@google.com>2020-11-14 01:28:22 +0000
committerTreehugger Robot <treehugger-gerrit@google.com>2020-11-14 02:54:26 +0000
commit2316b3a0779f3721a78681f5c70ed6624ecaebef (patch)
tree8aa4682729b839a97b2578e6cbe05ee5d35be923 /libartbase/base/bit_vector_test.cc
parentaeb7f9f8fe718219cfb04e0da5df62683250477d (diff)
Revert^3 "Partial LSE analysis & store removal"
This reverts commit b6837f0350ff66c13582b0e94178dd5ca283ff0a This unreverts commit fe270426c8a2a69a8f669339e83b86fbf40e25a1. This rereverts commit bb6cda60e4418c0ab557ea4090e046bed8206763. Bug: 67037140 Bug: 173120044 Reason for revert: Git-blame seems to point to the CL as cause of b/173120044. Revert during investigation. Change-Id: I46f557ce79c15f07f4e77aacded1926b192754c3
Diffstat (limited to 'libartbase/base/bit_vector_test.cc')
-rw-r--r--libartbase/base/bit_vector_test.cc58
1 files changed, 1 insertions, 57 deletions
diff --git a/libartbase/base/bit_vector_test.cc b/libartbase/base/bit_vector_test.cc
index 5f1b167718..2ef81c6726 100644
--- a/libartbase/base/bit_vector_test.cc
+++ b/libartbase/base/bit_vector_test.cc
@@ -15,13 +15,11 @@
*/
#include <memory>
-#include <random>
#include "allocator.h"
-#include "base/stl_util.h"
#include "bit_vector-inl.h"
-#include "gtest/gtest.h"
#include "transform_iterator.h"
+#include "gtest/gtest.h"
namespace art {
@@ -365,58 +363,4 @@ TEST(BitVector, MovementFree) {
EXPECT_EQ(alloc.AllocCount(), 1u);
}
-TEST(BitVector, ArrayCol) {
- {
- BitVectorArray bva(100, 200, true, Allocator::GetMallocAllocator());
- for (uint32_t i : Range(bva.NumColumns())) {
- bva.SetBit(bva.NumRows() / 2, i);
- }
- EXPECT_EQ(bva.GetRawData().NumSetBits(), bva.NumColumns());
- }
- {
- BitVectorArray bva(100, 200, true, Allocator::GetMallocAllocator());
- for (uint32_t i : Range(bva.NumRows())) {
- bva.SetBit(i, bva.NumColumns() / 2);
- }
- EXPECT_EQ(bva.GetRawData().NumSetBits(), bva.NumRows());
- }
-}
-
-TEST(BitVector, ArrayUnion) {
- {
- BitVectorArray bva(100, 200, true, Allocator::GetMallocAllocator());
- bva.SetBit(4, 12);
- bva.SetBit(40, 120);
- bva.SetBit(40, 121);
- bva.SetBit(40, 122);
-
- bva.UnionRows(4, 40);
-
- EXPECT_TRUE(bva.IsBitSet(4, 12));
- EXPECT_TRUE(bva.IsBitSet(4, 120));
- EXPECT_TRUE(bva.IsBitSet(4, 121));
- EXPECT_TRUE(bva.IsBitSet(4, 122));
- EXPECT_FALSE(bva.IsBitSet(40, 12));
- EXPECT_TRUE(bva.IsBitSet(40, 120));
- EXPECT_TRUE(bva.IsBitSet(40, 121));
- EXPECT_TRUE(bva.IsBitSet(40, 122));
- EXPECT_EQ(bva.GetRawData().NumSetBits(), 7u);
- }
- {
- BitVectorArray bva(100, 100, true, Allocator::GetMallocAllocator());
- for (uint32_t i : Range(bva.NumRows())) {
- bva.SetBit(i, i);
- }
- for (uint32_t i : Range(1, bva.NumRows())) {
- bva.UnionRows(0, i);
- }
- for (uint32_t col : Range(bva.NumColumns())) {
- for (uint32_t row : Range(bva.NumRows())) {
- // We set every bit where row== column and every bit on row 0 up to number of rows.
- EXPECT_EQ(bva.IsBitSet(row, col), row == col || (row == 0 && col < bva.NumRows()));
- }
- }
- }
-}
-
} // namespace art