fixme! save work on setting command node to failed.

Author: RABijl

include/pocl.h

@@ -506,6 +506,17 @@ typedef union
 typedef struct _pocl_buffer_migration_info
   pocl_buffer_migration_info;
 
+/**
+ * Enum that represents different possible states of a command node.
+ */
+typedef enum
+{
+  POCL_COMMAND_FAILED = -1,
+  /* Default unless set to ready. */
+  POCL_COMMAND_NOT_READY = 0,
+  POCL_COMMAND_READY = 1,
+} pocl_command_state;
+
 /* One item in a command queue or a command buffer. */
 typedef struct _cl_command_node _cl_command_node;
 struct _cl_command_node
@@ -538,7 +549,10 @@ struct _cl_command_node
   cl_device_id device;
   /* The index of the targeted device in the **program** device list. */
   unsigned program_device_i;
-  cl_int ready;
+
+  /* Used to indicate if a node is ready to be executed or failed. */
+  pocl_command_state state;
+
   /* true if the node belongs to a cl_command_buffer_khr */
   cl_int buffered;
 

lib/CL/devices/basic/basic.c

@@ -524,14 +524,14 @@ pocl_basic_submit (_cl_command_node *node, cl_command_queue cq)
             {
               pocl_update_event_running_unlocked (node->sync.event.event);
               POCL_UNLOCK_OBJ (node->sync.event.event);
-              POCL_UPDATE_EVENT_FAILED (node->sync.event.event);
+              POCL_UPDATE_EVENT_FAILED (CL_FAILED, node->sync.event.event);
               return;
             }
           node->command.run.device_data = handle;
         }
     }
 
-  node->ready = 1;
+  node->state = POCL_COMMAND_READY;
   POCL_LOCK (d->cq_lock);
   pocl_command_push(node, &d->ready_list, &d->command_list);
 
@@ -575,8 +575,13 @@ pocl_basic_notify (cl_device_id device, cl_event event, cl_event finished)
       return;
     }
 
-  if (!node->ready)
-    return;
+  if (node->state != POCL_COMMAND_READY)
+    {
+      POCL_MSG_PRINT_EVENTS (
+        "basic: command related to the notified event %lu not ready\n",
+        event->id);
+      return;
+    }
 
   if (pocl_command_is_ready (event))
     {

lib/CL/devices/common.c

@@ -823,7 +823,7 @@ pocl_exec_command (_cl_command_node *node)
     default:
       pocl_update_event_running (event);
       POCL_UPDATE_EVENT_FAILED_MSG (
-        event, "pocl_exec_command: Unknown command type\n");
+        CL_FAILED, event, "pocl_exec_command: Unknown command type\n");
       break;
     }
 }

lib/CL/devices/pthread/pthread.c

@@ -215,7 +215,7 @@ pocl_pthread_run (void *data, _cl_command_node *cmd)
 void
 pocl_pthread_submit (_cl_command_node *node, cl_command_queue cq)
 {
-  node->ready = 1;
+  node->state = POCL_COMMAND_READY;
   if (pocl_command_is_ready (node->sync.event.event))
     {
       pocl_update_event_submitted (node->sync.event.event);
@@ -262,8 +262,13 @@ pocl_pthread_notify (cl_device_id device, cl_event event, cl_event finished)
       return;
     }
 
-  if (!node->ready)
-    return;
+  if (node->state != POCL_COMMAND_READY)
+    {
+      POCL_MSG_PRINT_EVENTS (
+        "pthread: command related to the notified event %lu not ready\n",
+        event->id);
+      return;
+    }
 
   if (pocl_command_is_ready (node->sync.event.event))
     {

lib/CL/devices/pthread/pthread_scheduler.c

@@ -443,7 +443,7 @@ pocl_pthread_prepare_kernel (void *data, _cl_command_node *cmd)
       != 0)
     {
       pocl_update_event_running (cmd->sync.event.event);
-      POCL_UPDATE_EVENT_FAILED_MSG (cmd->sync.event.event,
+      POCL_UPDATE_EVENT_FAILED_MSG (CL_FAILED, cmd->sync.event.event,
                                     "CPU: failed to compile GVar init kernel");
       return NULL;
     }
@@ -456,7 +456,7 @@ pocl_pthread_prepare_kernel (void *data, _cl_command_node *cmd)
   if (ci == NULL)
     {
       pocl_update_event_running (cmd->sync.event.event);
-      POCL_UPDATE_EVENT_FAILED_MSG (cmd->sync.event.event,
+      POCL_UPDATE_EVENT_FAILED_MSG (CL_FAILED, cmd->sync.event.event,
                                     "CPU: failed to compile kernel");
       return NULL;
     }

lib/CL/devices/remote/remote.c

@@ -1536,7 +1536,7 @@ pocl_remote_submit (_cl_command_node *node, cl_command_queue cq)
   POCL_INIT_COND (e_d->event_cond);
   e->data = (void *)e_d;
 
-  node->ready = 1;
+  node->state = POCL_COMMAND_READY;
   if (pocl_command_is_ready (node->sync.event.event))
     {
       pocl_update_event_submitted (node->sync.event.event);
@@ -1599,7 +1599,7 @@ pocl_remote_notify (cl_device_id device, cl_event event, cl_event finished)
       return;
     }
 
-  if (!node->ready)
+  if (node->state != POCL_COMMAND_READY)
     {
       POCL_MSG_PRINT_EVENTS (
           "remote: command related to the notified event %lu not ready\n",
@@ -2424,7 +2424,8 @@ remote_start_command (remote_device_data_t *d, _cl_command_node *node)
 
   if (*(cq->device->available) == CL_FALSE)
     {
-      pocl_update_event_device_lost (event);
+      //      pocl_update_event_device_lost (event);
+      node->state = POCL_COMMAND_FAILED;
       goto EARLY_FINISH;
     }
   pocl_update_event_running (event);
@@ -2739,7 +2740,18 @@ pocl_remote_driver_pthread (void *cldev)
           char msg[128] = "Event ";
           strcat (msg, cstr);
 
-          POCL_UPDATE_EVENT_COMPLETE_MSG (event, msg);
+          /* update event status */
+          if (finished->state == POCL_COMMAND_READY)
+            {
+              POCL_UPDATE_EVENT_COMPLETE_MSG (event, msg);
+            }
+          else
+            {
+              cl_int status = CL_FAILED;
+              if (*(event->queue->device->available) == CL_FALSE)
+                status = CL_DEVICE_NOT_AVAILABLE;
+              POCL_UPDATE_EVENT_FAILED_MSG (status, event, msg);
+            }
 
           POCL_LOCK (d->wq_lock);
         }

lib/CL/pocl_util.c

@@ -2103,12 +2103,15 @@ pocl_update_event_finished (cl_int status, const char *func, unsigned line,
 }
 
 void
-pocl_update_event_failed (const char *func,
+pocl_update_event_failed (cl_int status,
+                          const char *func,
                           unsigned line,
                           cl_event event,
                           const char *msg)
 {
-  pocl_update_event_finished (CL_FAILED, func, line, event, msg);
+  /* Should only be used with error statuses. */
+  assert (status < 0);
+  pocl_update_event_finished (status, func, line, event, msg);
 }
 
 void

lib/CL/pocl_util.h

@@ -286,16 +286,25 @@ void pocl_update_event_complete (const char *func, unsigned line,
                                  cl_event event, const char *msg);
 
 /**
- * Should be called by a driver when the event execution fails for some reason
+ * Mark the event as failed with the status and do all the required
+ * cleanup work (releasing memory, notifying others waiting on the event, etc).
  *
- * Sets the event status to failure (CL_FAILED) and does all the required
- * cleanup work (releasing memory, notifying others waiting on the event, etc)
+ * \warning Call with event unlocked.
+ * \warning Eventually clReleaseEvent is called, so this function can end up
+ * freeing the event.
+ * \param status [in] Status to be set for the event. Should be an error status
+ * like CL_FAILED or CL_DEVICE_NOT_AVAILABLE.
+ * \param func [in] Can be NULL, the function name calling this function.
+ * \param line [in] Can be 0, the line number which failed.
+ * \param event [in/out] Event to be marked as failed.
+ * \param msg [in] Can be NULL, informative error message.
  */
-POCL_EXPORT
-void pocl_update_event_failed (const char *func,
-                               unsigned line,
-                               cl_event event,
-                               const char *msg);
+POCL_EXPORT void
+pocl_update_event_failed (cl_int status,
+                          const char *func,
+                          unsigned line,
+                          cl_event event,
+                          const char *msg);
 
 /**
  * Same as pocl_update_event_failed, except assumes the event is locked.
@@ -313,11 +322,11 @@ void pocl_update_event_device_lost (cl_event event);
 #define POCL_UPDATE_EVENT_COMPLETE(__event)                                   \
   pocl_update_event_complete (__func__, __LINE__, (__event), NULL)
 
-#define POCL_UPDATE_EVENT_FAILED(__event)                                     \
-pocl_update_event_failed (__func__, __LINE__, (__event), NULL)
+#define POCL_UPDATE_EVENT_FAILED(status, __event)                             \
+pocl_update_event_failed ((status), __func__, __LINE__, (__event), NULL)
 
-#define POCL_UPDATE_EVENT_FAILED_MSG(__event, msg)                            \
-pocl_update_event_failed (__func__, __LINE__, (__event), msg)
+#define POCL_UPDATE_EVENT_FAILED_MSG(status, __event, msg)                    \
+pocl_update_event_failed ((status), __func__, __LINE__, (__event), msg)
 
 POCL_EXPORT
 int pocl_copy_command_node (_cl_command_node *dst_node,