P4 to Git Change 1110331 by wchau@wchau_WINDOWS7_OCL on 2015/01/09 12:05:43
ECR #399840 - OpenCL Runtime HW Debug support development - Back out changelist 1109955 to avoid Cypass OpenCL Sanity timeout. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.cpp#3 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.h#3 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#237 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugger.hpp#2 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.hpp#2 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#489 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#136 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#274 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#105 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#199 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#296 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#345 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#123 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#68 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#41 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.hpp#3 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#222 edit
This commit is contained in:
@@ -440,7 +440,7 @@ CALGSLContext::isDone(GpuEvent* event)
|
||||
if (m_eventQueue[event->engineId_].isDone(event->id))
|
||||
{
|
||||
event->invalidate();
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -1269,10 +1269,10 @@ CALGSLContext::writeTimer(bool sdma, const gslMemObject mem, uint32 offset) cons
|
||||
void
|
||||
CALGSLContext::runAqlDispatch(GpuEvent& event, const void* aqlPacket,
|
||||
const gslMemObject* mems, uint32 numMems, gslMemObject scratch, uint32 scratchOffset,
|
||||
const void* cpuKernelCode, uint64 hsaQueueVA, const void* kernelInfo)
|
||||
const void* cpuKernelCode, uint64 hsaQueueVA)
|
||||
{
|
||||
eventBegin(MainEngine);
|
||||
m_cs->AqlDispatch(aqlPacket, mems, numMems, scratch, scratchOffset, cpuKernelCode, hsaQueueVA, kernelInfo);
|
||||
m_cs->AqlDispatch(aqlPacket, mems, numMems, scratch, scratchOffset, cpuKernelCode, hsaQueueVA);
|
||||
eventEnd(MainEngine, event);
|
||||
}
|
||||
|
||||
@@ -1299,30 +1299,3 @@ CALGSLContext::virtualQueueHandshake(GpuEvent& event, const gslMemObject mem, mc
|
||||
m_cs->VirtualQueueHandshake(mem, parentState, newStateValue, parentChildCounter, signal, dedicatedQueue);
|
||||
eventEnd(MainEngine, event);
|
||||
}
|
||||
|
||||
bool
|
||||
CALGSLContext::RegisterHwDebugger(uint64 debugMessages)
|
||||
{
|
||||
return m_cs->registerHwDebugger(debugMessages);
|
||||
}
|
||||
|
||||
bool
|
||||
CALGSLContext::ExceptionNotification(osEventHandle debugEvent)
|
||||
{
|
||||
return m_cs->exceptionNotification(debugEvent);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::InvalidateSqCaches(bool instInvalidate, bool dataInvalidate, bool tcL1, bool tcL2)
|
||||
{
|
||||
// invalidating instruction/data L1 caches using Escape
|
||||
if (instInvalidate || dataInvalidate) {
|
||||
m_cs->invalidateSqCaches(instInvalidate, dataInvalidate);
|
||||
}
|
||||
|
||||
if (tcL1) {
|
||||
flushCUCaches(tcL2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user