P4 to Git Change 1595251 by chui@chui-cnchuiw8-ocl-hsa-stg on 2018/08/17 17:06:54

SWDEV-160930 - Back out CL1594730 as it is failing OCL/LC and HIP tests

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#59 edit
This commit is contained in:
foreman
2018-08-17 17:52:29 -04:00
rodzic 812ec48f9e
commit c6280baa3c
+2 -10
Wyświetl plik
@@ -716,10 +716,7 @@ bool HSAILKernel::init(amd::hsa::loader::Symbol* sym, bool finalize) {
workGroupInfo_.size_ = workGroupInfo_.compileSize_[0] * workGroupInfo_.compileSize_[1] *
workGroupInfo_.compileSize_[2];
} else {
size_t nItems = (workGroupInfo_.availableVGPRs_ / workGroupInfo_.usedVGPRs_) *
dev().hwInfo()->simdPerCU_ * workGroupInfo_.wavefrontSize_;
workGroupInfo_.size_ = nItems > dev().info().preferredWorkGroupSize_ ?
std::min(size_t(1024) , nItems) : dev().info().preferredWorkGroupSize_;
workGroupInfo_.size_ = dev().info().preferredWorkGroupSize_;
}
// Pull out printf metadata from the ELF
@@ -1438,12 +1435,7 @@ bool LightningKernel::init(amd::hsa::loader::Symbol* symbol) {
// Copy wavefront size
workGroupInfo_.wavefrontSize_ = dev().info().wavefrontWidth_;
size_t nItems = (workGroupInfo_.availableVGPRs_ / workGroupInfo_.usedVGPRs_) *
dev().hwInfo()->simdPerCU_ * workGroupInfo_.wavefrontSize_;
workGroupInfo_.size_ = nItems > kernelMD->mCodeProps.mMaxFlatWorkGroupSize ?
std::min(size_t(1024), nItems) : kernelMD->mCodeProps.mMaxFlatWorkGroupSize;
workGroupInfo_.size_ = kernelMD->mCodeProps.mMaxFlatWorkGroupSize;
if (workGroupInfo_.size_ == 0) {
return false;
}