P4 to Git Change 1252154 by emankov@em-hsa-amd on 2016/03/29 07:23:56

SWDEV-79309 - Compiler Lib memory consumption decreasing by aclQueryInfo refactoring.

	[Problem] Memcpy on every aclQueryInfo for metadata. As a result an unreasonable memory consumption on every compiled binary (on Runtime).

	[Solution] Once extracted kernel Metadata is cached, secondary extraction doesn't happen. Blits are also affected.

	[Testing] precheckin
	http://ocltc.amd.com:8111/viewModification.html?modId=69016&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true

	[Reviewers] Stanislav Mekhanoshin, Nikolay Haustov

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/include/v0_8/aclStructs.h#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/include/v0_8/aclTypes.h#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#92 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.cpp#66 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclStructs.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclTypes.h#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#24 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLAssumptionCheck.cpp#49 edit

rocclr/compiler/lib/utils/v0_8/libUtils.cpp

@@ -1052,3 +1052,39 @@ void dump(aclBinary *bin) {
   bifbase *elfBin = reinterpret_cast<bifbase*>(bin->bin);
   elfBin->dump();
 }
+
+const void*
+aclutGetKernelMetadata(aclCompiler *cl, const aclBinary *bin, size_t *symbolSize, const char *symbol, acl_error *error_code) {
+  aclutKernelMetadata* md = bin->binData->kernelMetadata;
+  std::string s(symbol);
+  aclutKernelMetadata::iterator it = md->find(s);
+  if (md->end() == it) {
+    const oclBIFSymbolStruct* sym = findBIF30SymStruct(symOpenclMeta);
+    assert(sym && "symbol not found");
+    const void* symbolData = cl->clAPI.extSym(cl, bin, symbolSize, sym->sections[0], symbol, error_code);
+    if (symbolData && *symbolSize != 0) {
+      md->insert(std::make_pair(s, std::make_pair(symbolData, *symbolSize)));
+      return symbolData;
+    }
+  } else {
+    aclutDataSizePair ds = it->second;
+    *symbolSize = ds.second;
+    *error_code = ACL_SUCCESS;
+    return ds.first;
+  }
+  return NULL;
+}
+
+acl_error
+aclutSetKernelMetadata(aclCompiler *cl, aclBinary *bin, const void *symbolData, size_t symbolSize, const char *symbol) {
+  const oclBIFSymbolStruct* sym = findBIF30SymStruct(symOpenclMeta);
+  assert(sym && "symbol not found");
+  acl_error err = cl->clAPI.insSym(cl, bin, symbolData, symbolSize, sym->sections[0], symbol);
+  if (err != ACL_SUCCESS) return err;
+  aclutKernelMetadata* md = bin->binData->kernelMetadata;
+  std::string s(symbol);
+  if (md->end() != md->find(s)) {
+    md->erase(s);
+  }
+  return ACL_SUCCESS;
+}

rocclr/compiler/lib/utils/v0_8/libUtils.h

@@ -4,15 +4,23 @@
 #ifndef _CL_LIB_UTILS_0_8_H_
 #define _CL_LIB_UTILS_0_8_H_
 #include "acl.h"
-#include <string>
 #include <sstream>
-#include <iterator>
+#include <map>
 #include <cstdlib>
 #include <cassert>
 #include "library.hpp"
 #include "utils/bif_section_labels.hpp"
 using namespace bif;
 
+typedef std::pair<const void*, size_t> aclutDataSizePair;
+typedef std::map<std::string, aclutDataSizePair> aclutKernelMetadata;
+
+//! Structure for storing temporary aclBinary information (non-serializable).
+typedef struct _acl_binary_data_0_8_2 {
+  ACL_STRUCT_HEADER;
+  aclutKernelMetadata* kernelMetadata;  // Opaque pointer to the cached kernel's Metadata.
+} aclBinaryData_0_8_2;
+
 // Utility function to set a flag in option structure
 // of the aclDevCaps.
 void
@@ -178,6 +186,18 @@ aclutAlloc(const aclCompilerOptions *bin);
 FreeFunc
 aclutFree(const aclCompilerOptions *bin);
 
+// Wrapper function for extracting symbol with particular kernel Metadata from the binary bin,
+// once extracted kernel Metadata is cached, secondary extraction doesn't happen.
+// This function have to be used instead of extSym function for symOpenclMeta.
+const void*
+aclutGetKernelMetadata(aclCompiler *cl, const aclBinary *bin, size_t *symbolSize, const char *symbol, acl_error *error_code);
+
+// Wrapper function for inserting symbol with particular kernel Metadata into the binary bin,
+// once inserted kernel Metadata is cached.
+// This function have to be used instead of insSym function for symOpenclMeta.
+acl_error
+aclutSetKernelMetadata(aclCompiler *cl, aclBinary *bin, const void *symbolData, size_t symbolSize, const char *symbol);
+
 inline std::vector<std::string> splitSpaceSeparatedString(char *str)
 {
   std::string s(str);