P4 to Git Change 1121106 by bwicakso@opencl-hsa-stg-bwicakso on 2015/02/11 12:05:28
EPR #414268 - Back out the changes for HSAF1.0F on opencl branch (CL#1108891 & 1118596)
Affected files ...
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc-hsa/Interface/hsa_ext_finalize.h#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#278 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#189 edit
[ROCm/clr commit: 13efca9690]
This commit is contained in:
@@ -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_AGENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE);
|
||||
(HSA_FENCE_SCOPE_COMPONENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE);
|
||||
|
||||
hsa_kernel_dispatch_packet_t*
|
||||
HSAILKernel::loadArguments(
|
||||
@@ -4096,7 +4096,7 @@ HSAILKernel::loadArguments(
|
||||
|
||||
hsaDisp->kernarg_address = reinterpret_cast<void*>(argList);
|
||||
hsaDisp->reserved2 = 0;
|
||||
hsaDisp->completion_signal.handle = 0;
|
||||
hsaDisp->completion_signal = 0;
|
||||
|
||||
memList.push_back(cb);
|
||||
memList.push_back(gpuAqlCode());
|
||||
|
||||
@@ -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_MODE_LINEAR) {
|
||||
if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
|
||||
state |= amd::Sampler::StateFilterNearest;
|
||||
}
|
||||
else if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) {
|
||||
else if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
|
||||
state |= amd::Sampler::StateFilterLinear;
|
||||
}
|
||||
switch (boundaryU) {
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE:
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_EDGE:
|
||||
state |= amd::Sampler::StateAddressClampToEdge;
|
||||
break;
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_BORDER:
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_BORDER:
|
||||
state |= amd::Sampler::StateAddressClamp;
|
||||
break;
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MODE_REPEAT:
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_REPEAT:
|
||||
state |= amd::Sampler::StateAddressRepeat;
|
||||
break;
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT:
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MIRRORED_REPEAT:
|
||||
state |= amd::Sampler::StateAddressMirroredRepeat;
|
||||
break;
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_MODE_UNDEFINED:
|
||||
case HSA_EXT_SAMPLER_ADDRESSING_UNDEFINED:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user