From 2316b3a0779f3721a78681f5c70ed6624ecaebef Mon Sep 17 00:00:00 2001 From: Alex Light Date: Sat, 14 Nov 2020 01:28:22 +0000 Subject: 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 --- libartbase/base/bit_vector.cc | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'libartbase/base/bit_vector.cc') diff --git a/libartbase/base/bit_vector.cc b/libartbase/base/bit_vector.cc index d3cb652c0c..8e3d4c9bf7 100644 --- a/libartbase/base/bit_vector.cc +++ b/libartbase/base/bit_vector.cc @@ -376,31 +376,4 @@ Allocator* BitVector::GetAllocator() const { return allocator_; } -void BaseBitVectorArray::Resize(size_t rows, size_t cols, bool clear) { - DCHECK(IsExpandable()); - if (clear) { - Clear(); - } - cols = RoundUp(cols, BitVector::kWordBits); - num_columns_ = cols; - num_rows_ = rows; - // Ensure size - GetRawData().SetBit(num_rows_ * num_columns_ - 1); - GetRawData().ClearBit(num_rows_ * num_columns_ - 1); -} - -// In order to improve performance we do this in 4-byte blocks. Clang should be -// able to optimize this to larger blocks if possible. -void BaseBitVectorArray::UnionRows(size_t dest_row, size_t other) { - DCHECK_LT(dest_row, num_rows_); - DCHECK_LT(other, num_rows_); - size_t block_words = num_columns_ / BitVector::kWordBits; - uint32_t* dest = - GetRawData().GetRawStorage() + ((dest_row * num_columns_) / BitVector::kWordBits); - uint32_t* source = GetRawData().GetRawStorage() + ((other * num_columns_) / BitVector::kWordBits); - for (uint32_t i = 0; i < block_words; ++i, ++dest, ++source) { - *dest = (*dest) | (*source); - } -} - } // namespace art -- cgit v1.2.3-59-g8ed1b