P4 to Git Change 1309815 by lmoriche@lmoriche_opencl_dev on 2016/09/01 11:55:16

SWDEV-94610 - Restore the amdgpu_metadata.[ch]pp files. We need to share these files between different projects, and should avoid branching them. Ideally, they would be part of a metadata utility library.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.cpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.hpp#1 branch
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmetadata.cpp#3 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmetadata.hpp#4 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#11 edit

rocclr/runtime/device/rocm/amdgpu_metadata.cpp

@@ -44,7 +44,7 @@
 #include <iostream>
 #include <cassert>
 
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 
 namespace roc {
 namespace RuntimeMD {
@@ -200,7 +200,7 @@ namespace RuntimeMD {
 
       out
         << "  Access: " << AccessQualToString(accQual)
-        << "  Address: " << (uint) addrQual
+        << "  Address: " << (unsigned) addrQual
         << "  Size: " << size
         << "  Align: " << align
         << "  Type Name: " << typeName;

rocclr/runtime/device/rocm/rockernel.cpp

@@ -6,7 +6,7 @@
 #include "SCHSAInterface.h"
 #include "amd_hsa_kernel_code.h"
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 #endif // defined(WITH_LIGHTNING_COMPILER)
 
 #include <algorithm>

rocclr/runtime/device/rocm/rocprogram.hpp

@@ -18,7 +18,7 @@
 #include "HSAILItems.h"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 #include "driver/AmdCompiler.h"
 #endif // defined(WITH_LIGHTNING_COMPILER)