From d6fbd59c1aff40c41117588b54320ef0a5ae2436 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 1 Sep 2016 13:18:08 -0400 Subject: [PATCH] P4 to Git Change 1309857 by lmoriche@lmoriche_opencl_dev on 2016/09/01 13:09:36 SWDEV-94610 - Restore the amdgpu_metadata.[ch]pp namespaces (amd::hsa::code) Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.hpp#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#24 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#12 edit --- .../runtime/device/rocm/amdgpu_metadata.cpp | 6 +++-- .../runtime/device/rocm/amdgpu_metadata.hpp | 12 +++++---- rocclr/runtime/device/rocm/rockernel.cpp | 26 +++++++++---------- rocclr/runtime/device/rocm/rockernel.hpp | 2 +- rocclr/runtime/device/rocm/rocprogram.cpp | 2 +- rocclr/runtime/device/rocm/rocprogram.hpp | 4 +-- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/rocclr/runtime/device/rocm/amdgpu_metadata.cpp b/rocclr/runtime/device/rocm/amdgpu_metadata.cpp index 833a690712..796ac5fdca 100644 --- a/rocclr/runtime/device/rocm/amdgpu_metadata.cpp +++ b/rocclr/runtime/device/rocm/amdgpu_metadata.cpp @@ -46,8 +46,9 @@ #include "amdgpu_metadata.hpp" -namespace roc { -namespace RuntimeMD { +namespace amd { +namespace hsa { +namespace code { template bool Read(std::istream& in, T& v); @@ -492,3 +493,4 @@ namespace RuntimeMD { } } +} diff --git a/rocclr/runtime/device/rocm/amdgpu_metadata.hpp b/rocclr/runtime/device/rocm/amdgpu_metadata.hpp index 53c0593301..5fb6d0fd2b 100644 --- a/rocclr/runtime/device/rocm/amdgpu_metadata.hpp +++ b/rocclr/runtime/device/rocm/amdgpu_metadata.hpp @@ -40,8 +40,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#ifndef ROC_METADATA_HPP_ -#define ROC_METADATA_HPP_ +#ifndef AMDGPU_METADATA_HPP_ +#define AMDGPU_METADATA_HPP_ #include #include @@ -52,8 +52,9 @@ #undef None #include "AMDGPURuntimeMetadata.h" -namespace roc { -namespace RuntimeMD { +namespace amd { +namespace hsa { +namespace code { namespace KernelArg { class Metadata { @@ -187,5 +188,6 @@ namespace RuntimeMD { } } +} -#endif // ROC_METADATA_HPP_ +#endif // AMDGPU_METADATA_HPP_ diff --git a/rocclr/runtime/device/rocm/rockernel.cpp b/rocclr/runtime/device/rocm/rockernel.cpp index 87f6da4b6e..6125819c06 100644 --- a/rocclr/runtime/device/rocm/rockernel.cpp +++ b/rocclr/runtime/device/rocm/rockernel.cpp @@ -17,7 +17,7 @@ namespace roc { #if defined(WITH_LIGHTNING_COMPILER) inline static HSAIL_ARG_TYPE -GetHSAILArgType(const RuntimeMD::KernelArg::Metadata* lcArg) +GetHSAILArgType(const amd::hsa::code::KernelArg::Metadata* lcArg) { switch (lcArg->TypeKind()) { case AMDGPU::RuntimeMD::KernelArg::Pointer: @@ -54,7 +54,7 @@ GetHSAILArgType(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static size_t -GetHSAILArgAlignment(const RuntimeMD::KernelArg::Metadata* lcArg) +GetHSAILArgAlignment(const amd::hsa::code::KernelArg::Metadata* lcArg) { if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) return lcArg->Align(); @@ -76,7 +76,7 @@ GetHSAILArgAlignment(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static HSAIL_ACCESS_TYPE -GetHSAILArgAccessType(const RuntimeMD::KernelArg::Metadata* lcArg) +GetHSAILArgAccessType(const amd::hsa::code::KernelArg::Metadata* lcArg) { if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) { switch (lcArg->AccQual()) { @@ -112,7 +112,7 @@ GetHSAILArgAccessType(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static HSAIL_ADDRESS_QUALIFIER -GetHSAILAddrQual(const RuntimeMD::KernelArg::Metadata* lcArg) +GetHSAILAddrQual(const amd::hsa::code::KernelArg::Metadata* lcArg) { if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) { switch (lcArg->AddrQual()) { @@ -163,7 +163,7 @@ GetHSAILAddrQual(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) /* f16 returns f32 - workaround due to comp lib */ inline static HSAIL_DATA_TYPE -GetHSAILDataType(const RuntimeMD::KernelArg::Metadata* lcArg) +GetHSAILDataType(const amd::hsa::code::KernelArg::Metadata* lcArg) { aclArgDataType dataType; @@ -298,7 +298,7 @@ GetHSAILArgSize(const aclArgData *argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static clk_value_type_t -GetOclType(const RuntimeMD::KernelArg::Metadata* lcArg) +GetOclType(const amd::hsa::code::KernelArg::Metadata* lcArg) { static const clk_value_type_t ClkValueMapType[6][6] = { { T_CHAR, T_CHAR2, T_CHAR3, T_CHAR4, T_CHAR8, T_CHAR16 }, @@ -433,7 +433,7 @@ GetOclType(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static cl_kernel_arg_address_qualifier -GetOclAddrQual(const RuntimeMD::KernelArg::Metadata* lcArg) +GetOclAddrQual(const amd::hsa::code::KernelArg::Metadata* lcArg) { if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) { switch (lcArg->AddrQual()) { @@ -483,7 +483,7 @@ GetOclAddrQual(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static cl_kernel_arg_access_qualifier -GetOclAccessQual(const RuntimeMD::KernelArg::Metadata* lcArg) +GetOclAccessQual(const amd::hsa::code::KernelArg::Metadata* lcArg) { if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Image) { switch (lcArg->AccQual()) { @@ -521,7 +521,7 @@ GetOclAccessQual(const aclArgData* argInfo) #if defined(WITH_LIGHTNING_COMPILER) inline static cl_kernel_arg_type_qualifier -GetOclTypeQual(const RuntimeMD::KernelArg::Metadata* lcArg) +GetOclTypeQual(const amd::hsa::code::KernelArg::Metadata* lcArg) { cl_kernel_arg_type_qualifier rv = CL_KERNEL_ARG_TYPE_NONE; if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) { @@ -705,7 +705,7 @@ Kernel::initArgList(const aclArgData* aclArg) #if defined(WITH_LIGHTNING_COMPILER) void -Kernel::initArgsParams( const RuntimeMD::KernelArg::Metadata* lcArg, size_t* kOffset, +Kernel::initArgsParams( const amd::hsa::code::KernelArg::Metadata* lcArg, size_t* kOffset, device::Kernel::parameters_t& params, size_t* pOffset ) { HsailKernelArg* arg = new HsailKernelArg; @@ -814,13 +814,13 @@ bool Kernel::init_LC(){ hsa_agent_t hsaDevice = program_->hsaDevice(); // Pull out metadata from the ELF - const RuntimeMD::Program::Metadata* runtimeMD = program_->metadata(); + const amd::hsa::code::Program::Metadata* runtimeMD = program_->metadata(); if (!runtimeMD) { return false; } size_t idx = runtimeMD->KernelIndexByName(name()); - const RuntimeMD::Kernel::Metadata& kernelMD = runtimeMD->GetKernelMetadata(idx); + const amd::hsa::code::Kernel::Metadata& kernelMD = runtimeMD->GetKernelMetadata(idx); size_t sizeOfArgList = kernelMD.KernelArgCount(); @@ -828,7 +828,7 @@ bool Kernel::init_LC(){ size_t pOffset = 0; device::Kernel::parameters_t params; for (uint32_t i=0; i < sizeOfArgList; i++) { - const RuntimeMD::KernelArg::Metadata& kernelArg = kernelMD.GetKernelArgMetadata(i); + const amd::hsa::code::KernelArg::Metadata& kernelArg = kernelMD.GetKernelArgMetadata(i); initArgsParams(&kernelArg, &kOffset, params, &pOffset); } createSignature(params); diff --git a/rocclr/runtime/device/rocm/rockernel.hpp b/rocclr/runtime/device/rocm/rockernel.hpp index 73ba7cc1aa..4aa25b1ae8 100644 --- a/rocclr/runtime/device/rocm/rockernel.hpp +++ b/rocclr/runtime/device/rocm/rockernel.hpp @@ -179,7 +179,7 @@ private: #if defined(WITH_LIGHTNING_COMPILER) //! Initializes Hsail Argument metadata and info for LC - void initArgsParams( const RuntimeMD::KernelArg::Metadata* lcArg, size_t* kOffset, + void initArgsParams( const amd::hsa::code::KernelArg::Metadata* lcArg, size_t* kOffset, device::Kernel::parameters_t& params, size_t* pOffset ); #endif // defined(WITH_LIGHTNING_COMPILER) diff --git a/rocclr/runtime/device/rocm/rocprogram.cpp b/rocclr/runtime/device/rocm/rocprogram.cpp index 2ca5ff9ce5..fe1264478e 100644 --- a/rocclr/runtime/device/rocm/rocprogram.cpp +++ b/rocclr/runtime/device/rocm/rocprogram.cpp @@ -1038,7 +1038,7 @@ HSAILProgram::linkImpl_LC(amd::option::Options *options) return false; } - metadata_ = new roc::RuntimeMD::Program::Metadata(); + metadata_ = new amd::hsa::code::Program::Metadata(); if (!metadata_->ReadFrom((void *) data, size)) { buildLog_ += "Error while parsing runtime metadata.\n"; return false; diff --git a/rocclr/runtime/device/rocm/rocprogram.hpp b/rocclr/runtime/device/rocm/rocprogram.hpp index 9b7101ae29..b5067873b1 100644 --- a/rocclr/runtime/device/rocm/rocprogram.hpp +++ b/rocclr/runtime/device/rocm/rocprogram.hpp @@ -46,7 +46,7 @@ public: #if defined(WITH_LIGHTNING_COMPILER) //! Returns the program metadata. - const RuntimeMD::Program::Metadata* metadata() const { return metadata_; } + const amd::hsa::code::Program::Metadata* metadata() const { return metadata_; } #endif // defined(WITH_LIGHTNING_COMPILER) //! Return a typecasted GPU device @@ -172,7 +172,7 @@ private: hsa_executable_t hsaExecutable_; //!< Handle to HSA executable #if defined(WITH_LIGHTNING_COMPILER) - RuntimeMD::Program::Metadata* metadata_; //!< Runtime metadata + amd::hsa::code::Program::Metadata* metadata_; //!< Runtime metadata //! Return a new transient compiler instance. static std::auto_ptr newCompilerInstance(); #endif // defined(WITH_LIGHTNING_COMPILER)