From 2a7605d2f149a766927194483f1493980308a751 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 5 Jan 2015 17:44:48 -0500 Subject: [PATCH] P4 to Git Change 1108891 by bwicakso@opencl-hsa-stg-bwicakso on 2015/01/05 17:32:58 ECR #333755 - Part 2 - Update to spec 20141215 Reviewer: hthangir, gandryey, kanarayan Test: TC precheckin, image conformance (local machine) Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#16 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc-hsa/Interface/hsa_ext_finalize.h#4 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#271 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#186 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsablit.cpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#22 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#8 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsamemory.cpp#7 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsamemory.hpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsavirtual.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsavirtual.hpp#14 edit --- rocclr/runtime/device/gpu/gpukernel.cpp | 2 +- rocclr/runtime/device/gpu/gpuprogram.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp index b97fd9dcca..4549d10494 100644 --- a/rocclr/runtime/device/gpu/gpukernel.cpp +++ b/rocclr/runtime/device/gpu/gpukernel.cpp @@ -4084,7 +4084,7 @@ HSAILKernel::loadArguments( hsaDisp->kernarg_address = reinterpret_cast(argList); hsaDisp->reserved2 = 0; - hsaDisp->completion_signal = 0; + hsaDisp->completion_signal.handle = 0; memList.push_back(cb); memList.push_back(gpuAqlCode()); diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp index 3443fb7254..1ff6c16070 100644 --- a/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -102,26 +102,26 @@ InitializeSamplerObject(void* userData, uint64_t offset, bool unnormalize, uint32_t state = (unnormalize) ? amd::Sampler::StateNormalizedCoordsFalse : amd::Sampler::StateNormalizedCoordsTrue; - if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) { + if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) { state |= amd::Sampler::StateFilterNearest; } - else if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) { + else if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) { state |= amd::Sampler::StateFilterLinear; } switch (boundaryU) { - case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_EDGE: + case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE: state |= amd::Sampler::StateAddressClampToEdge; break; - case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_BORDER: + case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_BORDER: state |= amd::Sampler::StateAddressClamp; break; - case HSA_EXT_SAMPLER_ADDRESSING_REPEAT: + case HSA_EXT_SAMPLER_ADDRESSING_MODE_REPEAT: state |= amd::Sampler::StateAddressRepeat; break; - case HSA_EXT_SAMPLER_ADDRESSING_MIRRORED_REPEAT: + case HSA_EXT_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT: state |= amd::Sampler::StateAddressMirroredRepeat; break; - case HSA_EXT_SAMPLER_ADDRESSING_UNDEFINED: + case HSA_EXT_SAMPLER_ADDRESSING_MODE_UNDEFINED: default: break; }