P4 to Git Change 1306607 by lmoriche@lmoriche_opencl_dev on 2016/08/24 13:05:06
SWDEV-94644 - Fix the build after the latest update from git
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmetadata.hpp#2 edit
[ROCm/clr commit: f3612fa220]
This commit is contained in:
@@ -116,10 +116,10 @@ GetHSAILAddrQual(const RuntimeMD::KernelArg::Metadata* lcArg)
|
||||
{
|
||||
if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) {
|
||||
switch (lcArg->AddrQual()) {
|
||||
case AMDGPUAS::GLOBAL_ADDRESS:
|
||||
case AMDGPUAS::CONSTANT_ADDRESS:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Global:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Constant:
|
||||
return HSAIL_ADDRESS_GLOBAL;
|
||||
case AMDGPUAS::LOCAL_ADDRESS:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Local:
|
||||
return HSAIL_ADDRESS_LOCAL;
|
||||
default:
|
||||
LogError("Unsupported address type");
|
||||
@@ -437,11 +437,11 @@ GetOclAddrQual(const RuntimeMD::KernelArg::Metadata* lcArg)
|
||||
{
|
||||
if (lcArg->TypeKind() == AMDGPU::RuntimeMD::KernelArg::Pointer) {
|
||||
switch (lcArg->AddrQual()) {
|
||||
case AMDGPUAS::GLOBAL_ADDRESS:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Global:
|
||||
return CL_KERNEL_ARG_ADDRESS_GLOBAL;
|
||||
case AMDGPUAS::CONSTANT_ADDRESS:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Constant:
|
||||
return CL_KERNEL_ARG_ADDRESS_CONSTANT;
|
||||
case AMDGPUAS::LOCAL_ADDRESS:
|
||||
case AMDGPU::RuntimeMD::KernelArg::Local:
|
||||
return CL_KERNEL_ARG_ADDRESS_LOCAL;
|
||||
default:
|
||||
return CL_KERNEL_ARG_ADDRESS_PRIVATE;
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
#include <ostream>
|
||||
|
||||
#undef None
|
||||
#include "AMDGPU.h"
|
||||
#include "AMDGPURuntimeMetadata.h"
|
||||
|
||||
namespace roc {
|
||||
|
||||
Reference in New Issue
Block a user