tidy up semaphore emulation for consistency (#120)

Author: bashbaug

layers/11_semaemu/emulate.cpp

@@ -264,50 +264,60 @@ cl_int CL_API_CALL clEnqueueWaitSemaphoresKHR_EMU(
         return CL_INVALID_VALUE;
     }
 
-    cl_context q_context;
+    cl_context q_context = nullptr;
     retVal = g_pNextDispatch->clGetCommandQueueInfo(
-        command_queue, CL_QUEUE_CONTEXT, sizeof(q_context), &q_context, nullptr);
-    if (retVal != CL_SUCCESS)
-      return retVal;
+        command_queue,
+        CL_QUEUE_CONTEXT,
+        sizeof(q_context),
+        &q_context,
+        nullptr);
+    if( retVal != CL_SUCCESS )
+    {
+        return retVal;
+    }
 
-    // CL_INVALID_EVENT_WAIT_LIST
-    // -event_wait_list is NULL and num_events_in_wait_list is not 0, or
-    // -event_wait_list is not NULL and num_events_in_wait_list is 0, or
-    if((num_events_in_wait_list>0&&event_wait_list==nullptr) ||
-       (num_events_in_wait_list==0&&event_wait_list!=nullptr))
+    if( (num_events_in_wait_list > 0 && event_wait_list == nullptr) ||
+        (num_events_in_wait_list == 0 && event_wait_list != nullptr) )
     {
         return CL_INVALID_EVENT_WAIT_LIST;
     }
-    else
+
+    for( cl_uint i = 0; i < num_events_in_wait_list; i++ )
     {
-        for (cl_uint i=0; i<num_events_in_wait_list; i++)
+        if( event_wait_list[i] == nullptr )
         {
-          // CL_INVALID_EVENT_WAIT_LIST - event objects in event_wait_list are
-          // not valid events.
-          if (event_wait_list[i] == nullptr)
             return CL_INVALID_EVENT_WAIT_LIST;
+        }
 
-          // CL_INVALID_CONTEXT - the context associated with command_queue and
-          // that associated with events in event_wait_list are not the same
-          cl_context e_context;
-          retVal = g_pNextDispatch->clGetEventInfo(
-              event_wait_list[i], CL_EVENT_CONTEXT, sizeof(e_context),
-              &e_context, nullptr);
-          if (retVal != CL_SUCCESS)
-            return retVal;
-          if (q_context != e_context)
+        cl_context e_context = nullptr;
+        retVal = g_pNextDispatch->clGetEventInfo(
+            event_wait_list[i],
+            CL_EVENT_CONTEXT,
+            sizeof(e_context),
+            &e_context,
+            nullptr);
+        if( retVal != CL_SUCCESS )
+        {
+            return retVal; // or CL_INVALID_EVENT_WAIT_LIST?
+        }
+        if( q_context != e_context )
+        {
             return CL_INVALID_CONTEXT;
+        }
 
-          // CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST - the execution status
-          // of any of the events in event_wait_list is a negative integer
-          // value.
-          cl_int status = 0;
-          retVal = g_pNextDispatch->clGetEventInfo(
-              event_wait_list[i], CL_EVENT_COMMAND_EXECUTION_STATUS,
-              sizeof(status), &status, nullptr);
-          if (retVal != CL_SUCCESS)
-            return retVal;
-          if (status < 0)
+        cl_int status = 0;
+        retVal = g_pNextDispatch->clGetEventInfo(
+            event_wait_list[i],
+            CL_EVENT_COMMAND_EXECUTION_STATUS,
+            sizeof(status),
+            &status,
+            nullptr);
+        if( retVal != CL_SUCCESS )
+        {
+            return retVal; // or CL_INVALID_EVENT_WAIT_LIST?
+        }
+        if( status < 0 )
+        {
             return CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST;
         }
     }
@@ -324,11 +334,9 @@ cl_int CL_API_CALL clEnqueueWaitSemaphoresKHR_EMU(
         {
             return CL_INVALID_SEMAPHORE_KHR;
         }
-        if( semaphores[i]->Context != q_context)
+        if( semaphores[i]->Context != q_context )
         {
-          // CL_INVALID_CONTEXT - the context associated with command_queue and
-          // any of the semaphore objects in sema_objects are not the same
-          return CL_INVALID_CONTEXT;
+            return CL_INVALID_CONTEXT;
         }
         if( semaphores[i]->Event == nullptr )
         {
@@ -376,51 +384,61 @@ cl_int CL_API_CALL clEnqueueSignalSemaphoresKHR_EMU(
         return CL_INVALID_VALUE;
     }
 
-    cl_context q_context;
+    cl_context q_context = nullptr;
     retVal = g_pNextDispatch->clGetCommandQueueInfo(
-        command_queue, CL_QUEUE_CONTEXT, sizeof(q_context), &q_context, nullptr);
+        command_queue,
+        CL_QUEUE_CONTEXT,
+        sizeof(q_context),
+        &q_context,
+        nullptr);
     if (retVal != CL_SUCCESS)
-      return retVal;
+    {
+        return retVal;
+    }
 
-    // CL_INVALID_EVENT_WAIT_LIST
-    // -event_wait_list is NULL and num_events_in_wait_list is not 0, or
-    // -event_wait_list is not NULL and num_events_in_wait_list is 0, or
-    if((num_events_in_wait_list>0&&event_wait_list==nullptr) ||
-       (num_events_in_wait_list==0&&event_wait_list!=nullptr))
+    if( (num_events_in_wait_list > 0 && event_wait_list == nullptr) ||
+        (num_events_in_wait_list == 0 && event_wait_list != nullptr) )
     {
         return CL_INVALID_EVENT_WAIT_LIST;
     }
-    else
+
+    for( cl_uint i = 0; i < num_events_in_wait_list; i++ )
     {
-        for (cl_uint i=0; i<num_events_in_wait_list; i++)
-        {
-            // CL_INVALID_EVENT_WAIT_LIST - event objects in event_wait_list are
-            // not valid events.
-            if (event_wait_list[i] == nullptr)
-              return CL_INVALID_EVENT_WAIT_LIST;
-
-            // CL_INVALID_CONTEXT - the context associated with command_queue and
-            // that associated with events in event_wait_list are not the same
-            cl_context e_context;
-            retVal = g_pNextDispatch->clGetEventInfo(
-                event_wait_list[i], CL_EVENT_CONTEXT, sizeof(e_context),
-                &e_context, nullptr);
-            if (retVal != CL_SUCCESS)
-              return retVal;
-            if (q_context != e_context)
-              return CL_INVALID_CONTEXT;
-
-            // CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST - the execution status
-            // of any of the events in event_wait_list is a negative integer
-            // value.
-            cl_int status = 0;
-            retVal = g_pNextDispatch->clGetEventInfo(
-                event_wait_list[i], CL_EVENT_COMMAND_EXECUTION_STATUS,
-                sizeof(status), &status, nullptr);
-            if (retVal != CL_SUCCESS)
-              return retVal;
-            if (status < 0)
-              return CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST;
+        if (event_wait_list[i] == nullptr)
+        {
+            return CL_INVALID_EVENT_WAIT_LIST;
+        }
+
+        cl_context e_context = nullptr;
+        retVal = g_pNextDispatch->clGetEventInfo(
+            event_wait_list[i],
+            CL_EVENT_CONTEXT,
+            sizeof(e_context),
+            &e_context,
+            nullptr);
+        if( retVal != CL_SUCCESS )
+        {
+            return retVal;
+        }
+        if( q_context != e_context )
+        {
+            return CL_INVALID_CONTEXT;
+        }
+
+        cl_int status = 0;
+        retVal = g_pNextDispatch->clGetEventInfo(
+            event_wait_list[i],
+            CL_EVENT_COMMAND_EXECUTION_STATUS,
+            sizeof(status),
+            &status,
+            nullptr);
+        if( retVal != CL_SUCCESS )
+        {
+            return retVal;
+        }
+        if( status < 0 )
+        {
+            return CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST;
         }
     }
 
@@ -430,11 +448,9 @@ cl_int CL_API_CALL clEnqueueSignalSemaphoresKHR_EMU(
         {
             return CL_INVALID_SEMAPHORE_KHR;
         }
-        if( semaphores[i]->Context != q_context)
+        if( semaphores[i]->Context != q_context )
         {
-          // CL_INVALID_CONTEXT - the context associated with command_queue and
-          // any of the semaphore objects in sema_objects are not the same
-          return CL_INVALID_CONTEXT;
+            return CL_INVALID_CONTEXT;
         }
         if( semaphores[i]->Event != nullptr )
         {