From 51d2ac4b33c36e3b6f114421c3bbf00a40f2b36c Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 18 Mar 2021 13:21:10 -0700
Subject: [PATCH] ircd::cl: Reorder the kern::range lists for common
 construction; minor fixes.

---
 include/ircd/cl.h |  4 ++--
 ircd/cl.cc        | 47 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/include/ircd/cl.h b/include/ircd/cl.h
index 234c086b4..a5976662b 100644
--- a/include/ircd/cl.h
+++ b/include/ircd/cl.h
@@ -123,9 +123,9 @@ struct ircd::cl::kern
 struct ircd::cl::kern::range
 {
 	std::array<size_t, 5>
-	offset { 0, 0, 0, 0, 0 },
 	global { 0, 0, 0, 0, 0 },
-	local  { 0, 0, 0, 0, 0 };
+	local  { 0, 0, 0, 0, 0 },
+	offset { 0, 0, 0, 0, 0 };
 };
 
 /// Construction enqueues the task; destruction waits for completion.
diff --git a/ircd/cl.cc b/ircd/cl.cc
index ecc76d7d7..7bae8e01b 100644
--- a/ircd/cl.cc
+++ b/ircd/cl.cc
@@ -1032,7 +1032,7 @@ namespace ircd::cl
 	struct completion;
 
 	static void handle_event(cl_event, cl_int, void *) noexcept;
-	static void handle_incomplete(work &, const int &);
+	static int handle_incomplete(work &, const int &, const int);
 }
 
 struct ircd::cl::completion
@@ -1055,9 +1055,10 @@ noexcept
 	cl::sync();
 }
 
-void
+int
 ircd::cl::handle_incomplete(work &work,
-                            const int &status)
+                            const int &status,
+                            const int desired)
 {
 	completion c
 	{
@@ -1069,17 +1070,17 @@ ircd::cl::handle_incomplete(work &work,
 	(
 		clSetEventCallback,
 		cl_event(work.handle),
-		CL_COMPLETE,
+		desired,
 		&handle_event,
 		&c
 	);
 
-	c.dock.wait([&c]
+	c.dock.wait([&c, &desired]
 	{
-		return !c.event || c.status == CL_COMPLETE;
+		return !c.event || c.status == desired;
 	});
 
-	throw_on_error(c.status);
+	return c.status;
 }
 
 void
@@ -1093,7 +1094,7 @@ noexcept
 		reinterpret_cast<completion *>(priv)
 	};
 
-	assert(c.event != nullptr);
+	assert(event != nullptr);
 	c->status = status;
 	c->dock.notify_one();
 }
@@ -1113,7 +1114,8 @@ noexcept try
 {
 	const unwind free{[this]
 	{
-		call(clReleaseEvent, cl_event(handle));
+		if(likely(handle))
+			call(clReleaseEvent, cl_event(handle));
 	}};
 
 	wait();
@@ -1131,21 +1133,40 @@ catch(const std::exception &e)
 
 bool
 ircd::cl::work::wait()
+try
 {
 	if(!handle)
 		return false;
 
-	char buf[4] {0};
-	const int status
+	char buf[4];
+	int status
 	{
 		info<int>(clGetEventInfo, cl_event(handle), CL_EVENT_COMMAND_EXECUTION_STATUS, buf)
 	};
 
-	if(status >= 0 && status != CL_COMPLETE)
-		handle_incomplete(*this, status);
+	if(likely(status == CL_COMPLETE))
+		return false;
 
+	if(unlikely(status >= 0))
+		status = handle_incomplete(*this, status, CL_COMPLETE);
+
+	if(unlikely(status < 0))
+		throw_on_error(status);
+
+	assert(status == CL_COMPLETE);
 	return true;
 }
+catch(const std::exception &e)
+{
+	log::error
+	{
+		log, "work(%p) :%s",
+		this,
+		e.what(),
+	};
+
+	throw;
+}
 
 std::array<uint64_t, 4>
 ircd::cl::work::profile()