Changeset 3683 in CLRX for CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

Timestamp:

Jan 31, 2018, 3:16:49 PM (2 years ago)

Author:

matszpk

Message:

CLRadeonExtender: ROCmBin: Detect end of metadata YAML document. Integrate ROCm metadata parser with ROCmBinary class.
Add ROCmBinary::getKernelInfo.

File:

• CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp (modified) (4 diffs)

CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

@@ -720 +720 @@
 { "Default", "ReadOnly", "WriteOnly", "ReadWrite" };
 
-void parseROCmMetadata(size_t metadataSize, const char* metadata,
+static void parseROCmMetadata(size_t metadataSize, const char* metadata,
                 ROCmMetadata& metadataInfo)
 {
@@ -797 +797 @@
         if (curLevel == 0)
         {
+            if (ptr+3 <= end && *ptr=='.' && ptr[1]=='.' && ptr[2]=='.' &&
+                (ptr+3==end || (ptr+3 < end && ptr[3]=='\n')))
+                break; // end of the document
+            
             const size_t keyIndex = parseYAMLKey(ptr, end, lineNo,
                         mainMetadataKeywordsNum, mainMetadataKeywords);
@@ -1254 +1258 @@
         mapSort(regionsMap.begin(), regionsMap.end());
     }
+    
+    if (hasMetadataInfo() && metadata != nullptr && metadataSize != 0)
+    {
+        metadataInfo.reset(new ROCmMetadata());
+        parseROCmMetadata(metadataSize, metadata, *metadataInfo);
+        
+        if (hasKernelInfoMap())
+        {
+            const std::vector<ROCmKernelMetadata>& kernels = metadataInfo->kernels;
+            kernelInfosMap.resize(kernels.size());
+            for (size_t i = 0; i < kernelInfosMap.size(); i++)
+                kernelInfosMap[i] = std::make_pair(kernels[i].name, i);
+            // sort region map
+            mapSort(kernelInfosMap.begin(), kernelInfosMap.end());
+        }
+    }
 }
 
@@ -1305 +1325 @@
         throw BinException("Can't find region name");
     return regions[it->second];
+}
+
+const ROCmKernelMetadata& ROCmBinary::getKernelInfo(const char* name) const
+{
+    if (!hasMetadataInfo())
+        throw BinException("Can't find kernel info name");
+    RegionMap::const_iterator it = binaryMapFind(kernelInfosMap.begin(),
+                             kernelInfosMap.end(), name);
+    if (it == kernelInfosMap.end())
+        throw BinException("Can't find kernel info name");
+    return metadataInfo->kernels[it->second];
 }