P4 to Git Change 1149454 by yaxunl@yaxunl_stg_win50 on 2015/05/11 15:00:43
EPR #419065 - [CQE OCL][ISV][QR][G] FAHBenchmark application is crashing.
Two issues:
1. Remove clearing of profileEnabled_ since it may cause incorrect kernel execution time measurement.
2. Blit kernels causes assertion in getWavesPerSH since they do not have wave limiters. Remove the assert. If a kernel has no wave limiter, returns 0 in getWavesPerSH.
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#361 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.cpp#5 edit
[ROCm/clr commit: 7a956a4aa7]
This commit is contained in:
@@ -2806,7 +2806,6 @@ VirtualGPU::awaitCompletion(CommandBatch* cb, const amd::Event* waitingEvent)
|
|||||||
|
|
||||||
// Make sure that profiling is enabled
|
// Make sure that profiling is enabled
|
||||||
if (profileEnabled_) {
|
if (profileEnabled_) {
|
||||||
profileEnabled_ = false;
|
|
||||||
return profilingCollectResults(cb, waitingEvent);
|
return profilingCollectResults(cb, waitingEvent);
|
||||||
}
|
}
|
||||||
// Mark the first command in the batch as running
|
// Mark the first command in the batch as running
|
||||||
|
|||||||
@@ -228,7 +228,9 @@ uint WaveLimiterManager::getWavesPerSH(const device::VirtualDevice *vdev) const
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
auto loc = limiters_.find(vdev);
|
auto loc = limiters_.find(vdev);
|
||||||
assert (loc != limiters_.end());
|
if (loc == limiters_.end()) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
assert(loc->second != NULL);
|
assert(loc->second != NULL);
|
||||||
return loc->second->getWavesPerSH();
|
return loc->second->getWavesPerSH();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user