From 47ac53100303e7e864b7f6d65f17b23088ccf1d6 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 22 Jan 2021 08:41:08 +0000
Subject: Revert "Partial Load Store Elimination"

This reverts commit b8686ce4c93eba7192ed7ef89e7ffd9f3aa6cd07.

Bug: 67037140

Reason for revert: Fails a few tests.

Change-Id: Icf0635bffbfbba93bf0a5b854a9582c418198136
---
 compiler/optimizing/execution_subgraph.h | 44 --------------------------------
 1 file changed, 44 deletions(-)

(limited to 'compiler/optimizing/execution_subgraph.h')

diff --git a/compiler/optimizing/execution_subgraph.h b/compiler/optimizing/execution_subgraph.h
index 7fabbaead1..dac938ed62 100644
--- a/compiler/optimizing/execution_subgraph.h
+++ b/compiler/optimizing/execution_subgraph.h
@@ -27,7 +27,6 @@
 #include "base/bit_vector-inl.h"
 #include "base/globals.h"
 #include "base/iteration_range.h"
-#include "base/mutex.h"
 #include "base/scoped_arena_allocator.h"
 #include "base/scoped_arena_containers.h"
 #include "base/stl_util.h"
@@ -36,18 +35,6 @@
 
 namespace art {
 
-// Helper for transforming blocks to block_ids.
-class BlockToBlockIdTransformer {
- public:
-  BlockToBlockIdTransformer(BlockToBlockIdTransformer&&) = default;
-  BlockToBlockIdTransformer(const BlockToBlockIdTransformer&) = default;
-  BlockToBlockIdTransformer() {}
-
-  inline uint32_t operator()(const HBasicBlock* b) const {
-    return b->GetBlockId();
-  }
-};
-
 // Helper for transforming block ids to blocks.
 class BlockIdToBlockTransformer {
  public:
@@ -74,20 +61,6 @@ class BlockIdToBlockTransformer {
   const HGraph* const graph_;
 };
 
-class BlockIdFilterThunk {
- public:
-  explicit BlockIdFilterThunk(const BitVector& i) : inner_(i) {}
-  BlockIdFilterThunk(BlockIdFilterThunk&& other) noexcept = default;
-  BlockIdFilterThunk(const BlockIdFilterThunk&) = default;
-
-  bool operator()(const HBasicBlock* b) const {
-    return inner_.IsBitSet(b->GetBlockId());
-  }
-
- private:
-  const BitVector& inner_;
-};
-
 // A representation of a particular section of the graph. The graph is split
 // into an excluded and included area and is used to track escapes.
 //
@@ -107,18 +80,10 @@ class BlockIdFilterThunk {
 // cohort-exit block to reach any cohort-entry block. This means we can use the
 // boundary between the cohort and the rest of the graph to insert
 // materialization blocks for partial LSE.
-//
-// TODO We really should expand this to take into account where the object
-// allocation takes place directly. Currently we always act as though it were
-// allocated in the entry block. This is a massively simplifying assumption but
-// means we can't partially remove objects that are repeatedly allocated in a
-// loop.
 class ExecutionSubgraph : public ArenaObject<kArenaAllocLSA> {
  public:
   using BitVecBlockRange =
       IterationRange<TransformIterator<BitVector::IndexIterator, BlockIdToBlockTransformer>>;
-  using FilteredBitVecBlockRange = IterationRange<
-      FilterIterator<ArenaVector<HBasicBlock*>::const_iterator, BlockIdFilterThunk>>;
 
   // A set of connected blocks which are connected and removed from the
   // ExecutionSubgraph. See above comment for explanation.
@@ -145,15 +110,6 @@ class ExecutionSubgraph : public ArenaObject<kArenaAllocLSA> {
       return BlockIterRange(entry_blocks_);
     }
 
-    FilteredBitVecBlockRange EntryBlocksReversePostOrder() const {
-      return Filter(MakeIterationRange(graph_->GetReversePostOrder()),
-                    BlockIdFilterThunk(entry_blocks_));
-    }
-
-    bool IsEntryBlock(const HBasicBlock* blk) const {
-      return entry_blocks_.IsBitSet(blk->GetBlockId());
-    }
-
     // Blocks that have successors outside of the cohort. The successors of
     // these blocks will need to have PHI's to restore state.
     BitVecBlockRange ExitBlocks() const {
-- 
cgit v1.2.3-59-g8ed1b