memory allocation refactoring

Change-Id: Ic63b4f5ea44f2dc5e009e3e58652a661e957b7d6

test/ctrl/test_kernel.h

@@ -28,22 +28,23 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TEST_CTRL_TEST_KERNEL_H_
 #define TEST_CTRL_TEST_KERNEL_H_
 
+#include <string.h>
 #include <stdint.h>
 #include <map>
 
-#include "util/hsa_rsrc_factory.h"
-
 // Class implements kernel test
 class TestKernel {
  public:
+  // Exported buffers IDs
+  enum buf_id_t { KERNARG_EXP_ID, OUTPUT_EXP_ID, REFOUT_EXP_ID };
   // Memory descriptors IDs
-  enum { INPUT_DES_ID, OUTPUT_DES_ID, LOCAL_DES_ID, MASK_DES_ID, KERNARG_DES_ID, REFOUT_DES_ID };
+  enum des_id_t { NULL_DES_ID, LOCAL_DES_ID, KERNARG_DES_ID, SYS_DES_ID, REFOUT_DES_ID };
 
   // Memory descriptors vector declaration
   struct mem_descr_t {
+    des_id_t id;
     void* ptr;
     uint32_t size;
-    bool local;
   };
 
   // Memory map declaration
@@ -51,12 +52,7 @@ class TestKernel {
   typedef mem_map_t::iterator mem_it_t;
   typedef mem_map_t::const_iterator mem_const_it_t;
 
-  virtual ~TestKernel() {
-    for (auto& entry : mem_map_) {
-      void* ptr = entry.second.ptr;
-      if (ptr != NULL) HsaRsrcFactory::MemoryFree(ptr);
-    }
-  }
+  virtual ~TestKernel() {}
 
   // Initialize method
   virtual void Init() = 0;
@@ -65,50 +61,79 @@ class TestKernel {
   mem_map_t& GetMemMap() { return mem_map_; }
 
   // Return NULL descriptor
-  static mem_descr_t NullDescriptor() { return {NULL, 0, 0}; }
+  static mem_descr_t NullDescriptor() { return {NULL_DES_ID, NULL, 0}; }
+
+  // Check if decripter is local
+  bool IsLocal(const mem_descr_t& descr) const { return (descr.id == LOCAL_DES_ID); }
 
   // Methods to get the kernel attributes
-  void* GetKernargPtr() const { return GetDescr(KERNARG_DES_ID).ptr; }
-  uint32_t GetKernargSize() const { return GetDescr(KERNARG_DES_ID).size; }
-  void* GetOutputPtr() const { return GetDescr(OUTPUT_DES_ID).ptr; }
-  uint32_t GetOutputSize() const { return GetDescr(OUTPUT_DES_ID).size; }
-  void* GetLocalPtr() const { return GetDescr(LOCAL_DES_ID).ptr; }
-  void* GetRefoutPtr() const { return GetDescr(REFOUT_DES_ID).ptr; }
+  const mem_descr_t& GetKernargDescr() { return *test_map_[KERNARG_EXP_ID]; };
+  const mem_descr_t& GetOutputDescr() { return *test_map_[OUTPUT_EXP_ID]; };
+  void* GetKernargPtr() { return GetKernargDescr().ptr; }
+  uint32_t GetKernargSize() { return GetKernargDescr().size; }
+  void* GetOutputPtr() { return GetOutputDescr().ptr; }
+  uint32_t GetOutputSize() { return GetOutputDescr().size; }
+  bool IsOutputLocal() { return IsLocal(GetOutputDescr()); }
   virtual uint32_t GetGridSize() const = 0;
 
+  // Return reference output
+  void* GetRefOut() { return test_map_[REFOUT_EXP_ID]->ptr; };
+
   // Print output
-  virtual void PrintOutput() const = 0;
+  virtual void PrintOutput(const void* ptr) const = 0;
 
   // Return name
   virtual std::string Name() const = 0;
 
  protected:
-  // Set system memory descriptor
-  bool SetSysDescr(const uint32_t& id, const uint32_t& size) {
-    return SetMemDescr(id, size, false);
+  // Set buffer descriptor
+  bool SetInDescr(const uint32_t& buf_id, const des_id_t& des_id, const uint32_t& size) {
+    bool suc = SetMemDescr(buf_id, des_id, size);
+    if (des_id == KERNARG_DES_ID) {
+      test_map_[KERNARG_EXP_ID] = &mem_map_[buf_id];
+    }
+    return suc;
   }
 
-  // Set local memory descriptor
-  bool SetLocalDescr(const uint32_t& id, const uint32_t& size) {
-    return SetMemDescr(id, size, true);
+  // Set results descriptor
+  bool SetOutDescr(const uint32_t& buf_id, const des_id_t& des_id, const uint32_t& size) {
+    bool suc = SetMemDescr(buf_id, des_id, size);
+    test_map_[OUTPUT_EXP_ID] = &mem_map_[buf_id];
+    return suc;
+  }
+
+  // Set host descriptor
+  bool SetHostDescr(const uint32_t& buf_id, const des_id_t& des_id, const uint32_t& size) {
+    bool suc = SetMemDescr(buf_id, des_id, size);
+    if (suc) {
+      mem_descr_t& descr = mem_map_[buf_id];
+      descr.ptr = malloc(size);
+      if (des_id == REFOUT_DES_ID) {
+        test_map_[REFOUT_EXP_ID] = &descr;
+      }
+      if (descr.ptr == NULL) suc = false;
+    }
+    return suc;
   }
 
   // Get memory descriptor
-  mem_descr_t GetDescr(const uint32_t& id) const {
-    mem_const_it_t it = mem_map_.find(id);
+  mem_descr_t GetDescr(const uint32_t& buf_id) const {
+    mem_const_it_t it = mem_map_.find(buf_id);
     return (it != mem_map_.end()) ? it->second : NullDescriptor();
   }
 
  private:
   // Set memory descriptor
-  bool SetMemDescr(const uint32_t& id, const uint32_t& size, const bool& local) {
-    const mem_descr_t des = {NULL, size, local};
-    auto ret = mem_map_.insert(mem_map_t::value_type(id, des));
+  bool SetMemDescr(const uint32_t& buf_id, const des_id_t& des_id, const uint32_t& size) {
+    const mem_descr_t des = {des_id, NULL, size};
+    auto ret = mem_map_.insert(mem_map_t::value_type(buf_id, des));
     return ret.second;
   }
 
   // Kernel memory map object
   mem_map_t mem_map_;
+  // Test memory map object
+  std::map<uint32_t, mem_descr_t*> test_map_;
 };
 
 #endif  // TEST_CTRL_TEST_KERNEL_H_