Skip to content

Commit

Permalink
add support for mixing in-order recording with out-of-order replay
Browse files Browse the repository at this point in the history
  • Loading branch information
@bashbaug
bashbaug committed Jan 19, 2025
1 parent 4ac575d commit a1461f0
Showing 1 changed file with 59 additions and 11 deletions.
70 changes: 59 additions & 11 deletions layers/10_cmdbufemu/emulate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "emulate.h"

// TODO: bump to 0.9.7 when tests are ready.
static constexpr cl_version version_cl_khr_command_buffer =
CL_MAKE_VERSION(0, 9, 6);
static constexpr cl_version version_cl_khr_command_buffer_mutable_dispatch =
Expand Down Expand Up @@ -1069,9 +1070,9 @@ struct NDRangeKernel : Command
queue,
kernel,
work_dim,
global_work_offset.size() ? global_work_offset.data() : NULL,
global_work_offset.size() ? global_work_offset.data() : nullptr,
global_work_size.data(),
local_work_size.size() ? local_work_size.data() : NULL,
local_work_size.size() ? local_work_size.data() : nullptr,
static_cast<cl_uint>(wait_list.size()),
wait_list.data(),
signal);
Expand Down Expand Up @@ -1126,14 +1127,14 @@ typedef struct _cl_command_buffer_khr
const cl_command_buffer_properties_khr* properties,
cl_int* errcode_ret)
{
cl_command_buffer_khr cmdbuf = NULL;
cl_command_buffer_khr cmdbuf = nullptr;
cl_int errorCode = CL_SUCCESS;

ptrdiff_t numProperties = 0;
cl_command_buffer_flags_khr flags = 0;
cl_mutable_dispatch_asserts_khr mutableDispatchAsserts = 0;

if( num_queues != 1 || queues == NULL )
if( num_queues != 1 || queues == nullptr )
{
errorCode = CL_INVALID_VALUE;
}
Expand Down Expand Up @@ -1179,6 +1180,20 @@ typedef struct _cl_command_buffer_khr
}
numProperties = check - properties + 1;
}
for( cl_uint q = 0; q < num_queues && queues != nullptr; q++ )
{
cl_uint refCount = 0;
if( g_pNextDispatch->clGetCommandQueueInfo(
queues[q],
CL_QUEUE_REFERENCE_COUNT,
sizeof(refCount),
&refCount,
nullptr) != CL_SUCCESS )
{
errorCode = CL_INVALID_COMMAND_QUEUE;
break;
}
}
if( errcode_ret )
{
errcode_ret[0] = errorCode;
Expand All @@ -1196,12 +1211,24 @@ typedef struct _cl_command_buffer_khr
properties,
properties + numProperties );

cmdbuf->IsInOrder.reserve(num_queues);
cmdbuf->TestQueues.reserve(num_queues);
cmdbuf->BlockingEvents.reserve(num_queues);

for( auto queue : cmdbuf->Queues )
{
g_pNextDispatch->clRetainCommandQueue(queue);

cl_command_queue_properties props = 0;
g_pNextDispatch->clGetCommandQueueInfo(
queue,
CL_QUEUE_PROPERTIES,
sizeof(props),
&props,
nullptr);
cmdbuf->IsInOrder.push_back(
(props & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE) == 0 );

cmdbuf->setupTestQueue(queue);
}
}
Expand Down Expand Up @@ -1424,17 +1451,17 @@ typedef struct _cl_command_buffer_khr
{
return CL_INVALID_OPERATION;
}
if( ( queues == NULL && num_queues > 0 ) ||
( queues != NULL && num_queues == 0 ) )
if( ( queues == nullptr && num_queues > 0 ) ||
( queues != nullptr && num_queues == 0 ) )
{
return CL_INVALID_VALUE;
}
if( num_queues > 1 )
{
return CL_INVALID_VALUE;
}
if( ( event_wait_list == NULL && num_events_in_wait_list > 0 ) ||
( event_wait_list != NULL && num_events_in_wait_list == 0 ) )
if( ( event_wait_list == nullptr && num_events_in_wait_list > 0 ) ||
( event_wait_list != nullptr && num_events_in_wait_list == 0 ) )
{
return CL_INVALID_EVENT_WAIT_LIST;
}
Expand All @@ -1449,7 +1476,7 @@ typedef struct _cl_command_buffer_khr

for( cl_uint q = 0; q < num_queues && queues; q++ )
{
if( queues[q] == NULL )
if( queues[q] == nullptr )
{
return CL_INVALID_COMMAND_QUEUE;
}
Expand Down Expand Up @@ -1534,12 +1561,32 @@ typedef struct _cl_command_buffer_khr
{
cl_int errorCode = CL_SUCCESS;

cl_command_queue_properties props = 0;
g_pNextDispatch->clGetCommandQueueInfo(
queue,
CL_QUEUE_PROPERTIES,
sizeof(props),
&props,
nullptr);
bool isRecordQueueInOrder = IsInOrder[0];
bool isReplayQueueInOrder =
(props & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE) == 0;

const uint32_t numSyncPoints = NextSyncPoint.load(std::memory_order_relaxed);
std::vector<cl_event> deps(numSyncPoints, nullptr);

for( const auto& command : Commands )
{
errorCode = command->playback(queue, deps);
if( (errorCode == CL_SUCCESS) &&
isRecordQueueInOrder && !isReplayQueueInOrder )
{
errorCode = g_pNextDispatch->clEnqueueBarrierWithWaitList(
queue,
0,
nullptr,
nullptr);
}
if( errorCode != CL_SUCCESS )
{
break;
Expand Down Expand Up @@ -1622,6 +1669,7 @@ typedef struct _cl_command_buffer_khr

std::atomic<uint32_t> RefCount;

std::vector<bool> IsInOrder;
std::vector<cl_command_queue> TestQueues;
std::vector<cl_event> BlockingEvents;

Expand Down Expand Up @@ -1801,7 +1849,7 @@ std::unique_ptr<NDRangeKernel> NDRangeKernel::create(
new NDRangeKernel(cmdbuf, queue));

command->original_kernel = kernel;
command->kernel = g_pNextDispatch->clCloneKernel(kernel, NULL);
command->kernel = g_pNextDispatch->clCloneKernel(kernel, nullptr);
command->work_dim = work_dim;

command->mutableFields = mutableFields;
Expand Down Expand Up @@ -1959,7 +2007,7 @@ cl_int CL_API_CALL clEnqueueCommandBufferKHR_EMU(
errorCode = g_pNextDispatch->clEnqueueBarrierWithWaitList(
queue,
0,
NULL,
nullptr,
event );
}

Expand Down

0 comments on commit a1461f0

Please sign in to comment.