From 2af2557e262b8c1891d996f78bc5c045393ed792 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 11 Feb 2015 13:06:36 -0500 Subject: [PATCH] P4 to Git Change 1121131 by bwicakso@opencl-hsa-stg-bwicakso on 2015/02/11 12:55:55 EPR #414268 - Back out changelist 1121106 Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc-hsa/Interface/hsa_ext_finalize.h#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#279 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#190 edit --- rocclr/runtime/device/gpu/gpukernel.cpp | 4 ++-- rocclr/runtime/device/gpu/gpuprogram.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp index 9f19041cd3..edab454abd 100644 --- a/rocclr/runtime/device/gpu/gpukernel.cpp +++ b/rocclr/runtime/device/gpu/gpukernel.cpp @@ -3817,7 +3817,7 @@ const uint16_t kDispatchPacketHeader = (HSA_PACKET_TYPE_KERNEL_DISPATCH << HSA_PACKET_HEADER_TYPE) | (1 << HSA_PACKET_HEADER_BARRIER) | (HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_ACQUIRE_FENCE_SCOPE) | - (HSA_FENCE_SCOPE_COMPONENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE); + (HSA_FENCE_SCOPE_AGENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE); hsa_kernel_dispatch_packet_t* HSAILKernel::loadArguments( @@ -4096,7 +4096,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 4cf9f6edc0..c477183204 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; }