Add query for recommended granularity size

Add new query for recommended granularity size. This is the
internal blocksize used. While the existing query for granularity
size returns the minimum size possible, it is recommended that
allocations and mappings are multiple of the recommended granularity
size to minimise internal memory fragmentation.

This is part of patch series for Virtual Memory API.

Change-Id: Ia82c8f073b2a2c47ecd26fbb0aba27b8b7cd965f

runtime/hsa-runtime/core/runtime/amd_memory_region.cpp

@@ -420,6 +420,21 @@ hsa_status_t MemoryRegion::GetInfo(hsa_region_info_t attribute,
         case HSA_AMD_REGION_INFO_MAX_CLOCK_FREQUENCY:
           *((uint32_t*)value) = MaxMemCloc();
           break;
+        case HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_REC_GRANULE:
+          switch (mem_props_.HeapType) {
+            case HSA_HEAPTYPE_SYSTEM:
+              *((size_t*)value) = kPageSize_;
+              break;
+            case HSA_HEAPTYPE_FRAME_BUFFER_PRIVATE:
+            case HSA_HEAPTYPE_FRAME_BUFFER_PUBLIC:
+              *((size_t*)value) = core::Runtime::runtime_singleton_->flag().disable_fragment_alloc()
+                  ? kPageSize_ : fragment_allocator_.default_block_size();
+              break;
+            default:
+              *((size_t*)value) = 0;
+              break;
+          }
+          break;
         default:
           return HSA_STATUS_ERROR_INVALID_ARGUMENT;
           break;
@@ -437,6 +452,7 @@ hsa_status_t MemoryRegion::GetPoolInfo(hsa_amd_memory_pool_info_t attribute,
     case HSA_AMD_MEMORY_POOL_INFO_SIZE:
     case HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED:
     case HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_GRANULE:
+    case HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_REC_GRANULE:
     case HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALIGNMENT:
       return GetInfo(static_cast<hsa_region_info_t>(attribute), value);
     case HSA_AMD_MEMORY_POOL_INFO_ACCESSIBLE_BY_ALL:

runtime/hsa-runtime/inc/hsa_ext_amd.h

@@ -443,7 +443,7 @@ typedef enum hsa_amd_region_info_s {
    * Max Memory Clock, the return value type is uint32_t.
    * This attribute is deprecated. Use HSA_AMD_AGENT_INFO_MEMORY_MAX_FREQUENCY.
    */
-  HSA_AMD_REGION_INFO_MAX_CLOCK_FREQUENCY = 0xA003
+  HSA_AMD_REGION_INFO_MAX_CLOCK_FREQUENCY = 0xA003,
 } hsa_amd_region_info_t;
 
 /**
@@ -1072,32 +1072,44 @@ typedef enum {
   */
   HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED = 5,
   /**
-  * Allocation granularity of buffers allocated by
-  * ::hsa_amd_memory_pool_allocate
-  * in this memory pool. The size of a buffer allocated in this pool is a
-  * multiple of the value of this attribute. The value of this attribute is
-  * only defined if ::HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED is true for
-  * this pool. The type of this attribute is size_t.
-  */
+   * Allocation granularity of buffers allocated by
+   * ::hsa_amd_memory_pool_allocate
+   * in this memory pool. The size of a buffer allocated in this pool is a
+   * multiple of the value of this attribute. While this is the minimum size of
+   * allocation allowed, it is recommened to use
+   * HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_REC_GRANULE to obtain the recommended
+   * allocation granularity size for this pool.
+   * The value of this attribute is only defined if
+   * ::HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED is true for
+   * this pool. The type of this attribute is size_t.
+   */
   HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_GRANULE = 6,
   /**
-  * Alignment of buffers allocated by ::hsa_amd_memory_pool_allocate in this
-  * pool. The value of this attribute is only defined if
-  * ::HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED is true for this pool, and
-  * must be a power of 2. The type of this attribute is size_t.
-  */
+   * Alignment of buffers allocated by ::hsa_amd_memory_pool_allocate in this
+   * pool. The value of this attribute is only defined if
+   * ::HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED is true for this pool, and
+   * must be a power of 2. The type of this attribute is size_t.
+   */
   HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALIGNMENT = 7,
   /**
-  * This memory_pool can be made directly accessible by all the agents in the
-  * system (::hsa_amd_agent_memory_pool_get_info does not return 
-  * ::HSA_AMD_MEMORY_POOL_ACCESS_NEVER_ALLOWED for any agent). The type of this
-  * attribute is bool.
-  */
+   * Internal block size for allocations. This would also be the recommended
+   * granularity size for allocations as this prevents internal fragmentation.
+   * The value of this attribute is only defined if
+   * ::HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_ALLOWED is true for this pool.
+   * The size of this attribute is size_t.
+   */
+  HSA_AMD_MEMORY_POOL_INFO_RUNTIME_ALLOC_REC_GRANULE = 8,
+  /**
+   * This memory_pool can be made directly accessible by all the agents in the
+   * system (::hsa_amd_agent_memory_pool_get_info does not return
+   * ::HSA_AMD_MEMORY_POOL_ACCESS_NEVER_ALLOWED for any agent). The type of this
+   * attribute is bool.
+   */
   HSA_AMD_MEMORY_POOL_INFO_ACCESSIBLE_BY_ALL = 15,
   /**
-  * Maximum aggregate allocation size in bytes. The type of this attribute
-  * is size_t.
-  */
+   * Maximum aggregate allocation size in bytes. The type of this attribute
+   * is size_t.
+   */
   HSA_AMD_MEMORY_POOL_INFO_ALLOC_MAX_SIZE = 16,
   /**
    * Location of this memory pool. The type of this attribute