add more unittest

modify allocator strategy
remove changes of legacy buddy_allocator
test=develop

Author: sneaxiy

paddle/fluid/framework/CMakeLists.txt

@@ -202,6 +202,8 @@ cc_test(cow_ptr_tests SRCS details/cow_ptr_test.cc)
 
 cc_test(tuple_test SRCS tuple_test.cc )
 
+cc_test(inlined_vector_test SRCS inlined_vector_test.cc)
+
 if (NOT WIN32)
 cc_test(rw_lock_test SRCS rw_lock_test.cc)
 endif (NOT WIN32)

paddle/fluid/framework/inlined_stack.h renamed to paddle/fluid/framework/inlined_vector.h

@@ -14,18 +14,18 @@
 
 #pragma once
 
-#include <deque>
+#include <vector>
 #include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
 
 template <typename T, size_t N>
-class InlinedStack {
+class InlinedVector {
   static_assert(N > 0, "N must be larger than 0");
 
  public:
-  inline void push(const T& item) {
+  inline void push_back(const T& item) {
     if (size_ < N) {
       head_[size_] = item;
     } else {
@@ -34,21 +34,21 @@ class InlinedStack {
     ++size_;
   }
 
-  inline void pop() {
-    PADDLE_ENFORCE(!empty(), "Try to pop element from empty stack.");
+  inline void pop_back() {
+    PADDLE_ENFORCE(!empty(), "Try to pop back element from empty vector.");
     if (size_ > N) {
       tail_.pop_back();
     }
     --size_;
   }
 
-  inline const T& top() const {
-    PADDLE_ENFORCE(!empty(), "Try to get top element of empty stack.");
+  inline const T& back() const {
+    PADDLE_ENFORCE(!empty(), "Try to get back element of empty vector.");
     return size_ <= N ? head_[size_ - 1] : tail_.back();
   }
 
-  inline T& top() {
-    PADDLE_ENFORCE(!empty(), "Try to get top element of empty stack.");
+  inline T& back() {
+    PADDLE_ENFORCE(!empty(), "Try to get back element of empty vector.");
     return size_ <= N ? head_[size_ - 1] : tail_.back();
   }
 
@@ -63,10 +63,19 @@ class InlinedStack {
     return i < N ? head_[i] : tail_[i - N];
   }
 
+  operator std::vector<T>() const {
+    std::vector<T> ret;
+    ret.reserve(size_);
+    for (size_t i = 0; i < size_; ++i) {
+      ret.emplace_back((*this)[i]);
+    }
+    return ret;
+  }
+
  private:
   T head_[N];
   size_t size_{0};
-  std::deque<T> tail_;
+  std::vector<T> tail_;
 };
 
 }  // namespace framework

paddle/fluid/framework/inlined_vector_test.cc

@@ -0,0 +1,53 @@
+// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/framework/inlined_vector.h"
+#include <vector>
+#include "gtest/gtest.h"
+
+namespace paddle {
+namespace framework {
+
+TEST(inlined_stack, inlined_stack) {
+  size_t max_num = 10;
+
+  InlinedVector<size_t, 5> stack;
+
+  for (size_t i = 0; i < max_num; ++i) {
+    ASSERT_EQ(stack.size(), i);
+    stack.push_back(i);
+    ASSERT_EQ(stack.size(), i + 1);
+  }
+
+  std::vector<size_t> vec = stack;
+
+  ASSERT_EQ(stack.size(), vec.size());
+
+  for (size_t i = 0; i < vec.size(); ++i) {
+    ASSERT_EQ(stack[i], vec[i]);
+  }
+
+  for (size_t i = 0; i < max_num; ++i) {
+    ASSERT_EQ(stack[i], i);
+  }
+
+  for (size_t i = 0; i < max_num; ++i) {
+    ASSERT_EQ(stack.back(), max_num - 1 - i);
+    stack.pop_back();
+    ASSERT_EQ(stack.size(), max_num - 1 - i);
+  }
+}
+
+}  // namespace framework
+}  // namespace paddle

paddle/fluid/memory/allocation/CMakeLists.txt

@@ -3,13 +3,18 @@ cc_library(cpu_allocator SRCS cpu_allocator.cc DEPS allocator)
 cc_library(best_fit_allocator SRCS best_fit_allocator.cc DEPS allocator)
 cc_library(locked_allocator SRCS locked_allocator.cc DEPS allocator)
 cc_library(buffered_allocator SRCS buffered_allocator.cc DEPS allocator)
-cc_library(multi_bin_buffered_allocator SRCS multi_bin_buffered_allocator.cc DEPS allocator)
+cc_library(multi_bin_buffered_allocator SRCS multi_bin_buffered_allocator.cc DEPS allocator gflags)
 cc_library(legacy_allocator SRCS legacy_allocator.cc DEPS allocator buddy_allocator profiler)
+cc_library(zero_size_allocator SRCS zero_size_allocator.cc DEPS allocator)
 cc_test(buffered_allocator_test SRCS buffered_allocator_test.cc DEPS best_fit_allocator locked_allocator buffered_allocator cpu_allocator)
 cc_test(multi_bin_buffered_allocator_test SRCS multi_bin_buffered_allocator_test.cc DEPS best_fit_allocator locked_allocator multi_bin_buffered_allocator cpu_allocator)
 
-cc_library(auto_increment_best_fit_allocator SRCS auto_increment_best_fit_allocator.cc DEPS allocator)
-cc_test(auto_increment_best_fit_allocator_test SRCS auto_increment_best_fit_allocator_test.cc DEPS cpu_allocator auto_increment_best_fit_allocator)
+cc_library(auto_growth_best_fit_allocator SRCS auto_growth_best_fit_allocator.cc DEPS allocator)
+cc_test(auto_growth_best_fit_allocator_test SRCS auto_growth_best_fit_allocator_test.cc DEPS cpu_allocator auto_growth_best_fit_allocator)
+
+if (NOT WIN32)
+  cc_test(test_multi_bin_buffered_allocator_division_plan SRCS test_multi_bin_buffered_allocator_division_plan.cc DEPS multi_bin_buffered_allocator)
+endif()
 
 if (WITH_GPU)
   nv_library(cuda_allocator SRCS cuda_allocator.cc DEPS allocator cuda_device_guard)
@@ -42,30 +47,20 @@ else ()
     set(AllocatorFacadeDeps)
 endif()
 
+list(APPEND AllocatorFacadeDeps cpu_allocator locked_allocator best_fit_allocator aligned_allocator auto_increment_allocator conditional_allocator retry_allocator buffered_allocator multi_bin_buffered_allocator auto_growth_best_fit_allocator legacy_allocator zero_size_allocator)
+
 cc_library(aligned_allocator SRCS aligned_allocator.cc DEPS allocator)
 cc_library(auto_increment_allocator SRCS auto_increment_allocator.cc DEPS allocator)
-cc_library(zero_size_allocator SRCS zero_size_allocator.cc DEPS allocator)
 cc_library(conditional_allocator SRCS conditional_allocator.cc DEPS allocator)
-cc_library(allocator_strategy SRCS allocator_strategy.cc DEPS gflags)
-cc_library(allocator_facade SRCS allocator_facade.cc DEPS
-        ${AllocatorFacadeDeps}
-        cpu_allocator
-        locked_allocator
-        best_fit_allocator
-        aligned_allocator
-        auto_increment_allocator
-        zero_size_allocator
-        conditional_allocator
-        retry_allocator
-        buffered_allocator
-        multi_bin_buffered_allocator
-        auto_increment_best_fit_allocator
-        allocator_strategy
-        legacy_allocator
-        )
+cc_library(allocator_strategy SRCS allocator_strategy.cc DEPS gflags ${AllocatorFacadeDeps})
+cc_library(allocator_facade SRCS allocator_facade.cc DEPS allocator_strategy)
 
 nv_test(allocation_and_eigen_test SRCS allocation_and_eigen_test.cu DEPS allocator_facade)
 
 cc_test(retry_allocator_test SRCS retry_allocator_test.cc DEPS retry_allocator best_fit_allocator locked_allocator cpu_allocator)
 
 cc_test(allocator_facade_test SRCS allocator_facade_test.cc DEPS allocator_facade)
+
+cc_test(naive_best_fit_allocator_facade_test SRCS naive_best_fit_allocator_facade_test.cc DEPS allocator_facade)
+
+cc_test(auto_growth_best_fit_allocator_facade_test SRCS auto_growth_best_fit_allocator_facade_test.cc DEPS allocator_facade)

paddle/fluid/memory/allocation/aligned_allocator.h

@@ -14,6 +14,7 @@
 
 #pragma once
 #include <memory>
+#include <utility>
 #include "paddle/fluid/memory/allocation/allocator.h"
 
 namespace paddle {

paddle/fluid/memory/allocation/allocator.cc

@@ -27,24 +27,24 @@ bool Allocator::IsAllocThreadSafe() const { return false; }
 
 AllocationPtr Allocator::Allocate(size_t size, Allocator::Attr attr) {
   auto ptr = AllocateImpl(size, attr);
-  ptr->RegisterAllocatorChain(this);
+  ptr->RegisterDecoratedAllocator(this);
   return AllocationPtr(ptr);
 }
 
 void Allocator::FreeImpl(Allocation* allocation) {
-  Allocator* allocator = allocation->TopAllocator();
+  Allocator* allocator = allocation->TopDecoratedAllocator();
   allocator->Free(allocation);
 }
 
 void Allocator::Free(Allocation* allocation) {
-  allocation->PopAllocator();
+  allocation->PopDecoratedAllocator();
   FreeImpl(allocation);
 }
 
 const char* BadAlloc::what() const noexcept { return msg_.c_str(); }
 
 void AllocationDeleter::operator()(Allocation* allocation) const {
-  Allocator* allocator = allocation->TopAllocator();
+  Allocator* allocator = allocation->TopDecoratedAllocator();
   allocator->Free(allocation);
 }
 

paddle/fluid/memory/allocation/allocator.h

@@ -15,8 +15,9 @@
 #pragma once
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
-#include "paddle/fluid/framework/inlined_stack.h"
+#include "paddle/fluid/framework/inlined_vector.h"
 #include "paddle/fluid/platform/place.h"
 
 namespace paddle {
@@ -78,29 +79,26 @@ class Allocation {
 
   virtual ~Allocation();
 
-  // This function should only be used in unittest
-  std::vector<Allocator*> GetAllocatorChain() const {
-    std::vector<Allocator*> allocators;
-    for (size_t i = 0; i < allocator_chain_.size(); ++i) {
-      allocators.push_back(allocator_chain_[i]);
-    }
-    return allocators;
+ private:
+  std::vector<Allocator*> DecoratedAllocators() const {
+    return static_cast<std::vector<Allocator*>>(decorated_allocators_);
   }
 
- private:
-  inline void RegisterAllocatorChain(Allocator* allocator) {
-    allocator_chain_.push(allocator);
+  inline void RegisterDecoratedAllocator(Allocator* allocator) {
+    decorated_allocators_.push_back(allocator);
   }
 
-  inline void PopAllocator() { allocator_chain_.pop(); }
+  inline void PopDecoratedAllocator() { decorated_allocators_.pop_back(); }
 
-  inline Allocator* TopAllocator() { return allocator_chain_.top(); }
+  inline Allocator* TopDecoratedAllocator() {
+    return decorated_allocators_.back();
+  }
 
  private:
   void* ptr_;
   size_t size_;
   platform::Place place_;
-  framework::InlinedStack<Allocator*, 8> allocator_chain_;
+  framework::InlinedVector<Allocator*, 8> decorated_allocators_;
 
   friend class Allocator;
   friend class AllocationDeleter;