Command buffer profiling (#1598)

* Added test cases for profiling command-buffers according to issue description #1369, p.3.2:

https://github.com/KhronosGroup/OpenCL-CTS/issues/1369

* Added cosmetic fixes (#1369, p.3.2)

* Corrected the path of initialization profiling event for simultaneous test (#1369, p.3.2):

https://github.com/KhronosGroup/OpenCL-CTS/issues/1369

* clang format fix

* Added correction related to macos build error (#1369, p.3.2)

* Applied corrections related to code review (#1369, p.3.2)

* Corrected query of queue properies (issue #1369, command buffer profiling)

* Reverted formating of unrelated header

* Added code review corrections for type consistency and fail condition (issue #1369, p.3.2)

* Reordered initialization of attributes.

* Reverted correct order of initialization.

test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt

@@ -3,6 +3,7 @@ set(MODULE_NAME CL_KHR_COMMAND_BUFFER)
 set(${MODULE_NAME}_SOURCES
     main.cpp
     basic_command_buffer.cpp
+    command_buffer_profiling.cpp
     command_buffer_queue_substitution.cpp
     command_buffer_test_fill.cpp
     command_buffer_test_copy.cpp

test_conformance/extensions/cl_khr_command_buffer/basic_command_buffer.cpp

@@ -21,6 +21,7 @@
 #include <vector>
 
 
+//--------------------------------------------------------------------------
 BasicCommandBufferTest::BasicCommandBufferTest(cl_device_id device,
                                                cl_context context,
                                                cl_command_queue queue)
@@ -31,7 +32,6 @@ BasicCommandBufferTest::BasicCommandBufferTest(cl_device_id device,
       simultaneous_use_requested(true),
       // due to simultaneous cases extend buffer size
       buffer_size_multiplier(1), command_buffer(this)
-
 {
     cl_int error = clRetainCommandQueue(queue);
     if (error != CL_SUCCESS)
@@ -41,6 +41,7 @@ BasicCommandBufferTest::BasicCommandBufferTest(cl_device_id device,
     this->queue = queue;
 }
 
+//--------------------------------------------------------------------------
 bool BasicCommandBufferTest::Skip()
 {
     cl_command_queue_properties required_properties;
@@ -75,29 +76,20 @@ bool BasicCommandBufferTest::Skip()
     return required_properties != (required_properties & queue_properties);
 }
 
-cl_int BasicCommandBufferTest::SetUp(int elements)
+//--------------------------------------------------------------------------
+cl_int BasicCommandBufferTest::SetUpKernel()
 {
-    cl_int error = init_extension_functions();
-    if (error != CL_SUCCESS)
-    {
-        return error;
-    }
-
-    if (elements <= 0)
-    {
-        return CL_INVALID_VALUE;
-    }
-    num_elements = static_cast<size_t>(elements);
+    cl_int error = CL_SUCCESS;
 
     // Kernel performs a parallel copy from an input buffer to output buffer
     // is created.
     const char *kernel_str =
         R"(
-    __kernel void copy(__global int* in, __global int* out, __global int* offset) {
-        size_t id = get_global_id(0);
-        int ind = offset[0] + id;
-        out[ind] = in[ind];
-    })";
+  __kernel void copy(__global int* in, __global int* out, __global int* offset) {
+      size_t id = get_global_id(0);
+      int ind = offset[0] + id;
+      out[ind] = in[ind];
+  })";
 
     error = create_single_kernel_helper_create_program(context, &program, 1,
                                                        &kernel_str);
@@ -106,6 +98,16 @@ cl_int BasicCommandBufferTest::SetUp(int elements)
     error = clBuildProgram(program, 1, &device, nullptr, nullptr, nullptr);
     test_error(error, "Failed to build program");
 
+    kernel = clCreateKernel(program, "copy", &error);
+    test_error(error, "Failed to create copy kernel");
+
+    return CL_SUCCESS;
+}
+
+//--------------------------------------------------------------------------
+cl_int BasicCommandBufferTest::SetUpKernelArgs()
+{
+    cl_int error = CL_SUCCESS;
     in_mem =
         clCreateBuffer(context, CL_MEM_READ_ONLY,
                        sizeof(cl_int) * num_elements * buffer_size_multiplier,
@@ -123,9 +125,6 @@ cl_int BasicCommandBufferTest::SetUp(int elements)
                              sizeof(cl_int), &offset, &error);
     test_error(error, "clCreateBuffer failed");
 
-    kernel = clCreateKernel(program, "copy", &error);
-    test_error(error, "Failed to create copy kernel");
-
     error = clSetKernelArg(kernel, 0, sizeof(in_mem), &in_mem);
     test_error(error, "clSetKernelArg failed");
 
@@ -135,6 +134,25 @@ cl_int BasicCommandBufferTest::SetUp(int elements)
     error = clSetKernelArg(kernel, 2, sizeof(off_mem), &off_mem);
     test_error(error, "clSetKernelArg failed");
 
+    return CL_SUCCESS;
+}
+
+//--------------------------------------------------------------------------
+cl_int BasicCommandBufferTest::SetUp(int elements)
+{
+    cl_int error = init_extension_functions();
+    if (error != CL_SUCCESS)
+    {
+        return error;
+    }
+    num_elements = static_cast<size_t>(elements);
+
+    error = SetUpKernel();
+    test_error(error, "SetUpKernel failed");
+
+    error = SetUpKernelArgs();
+    test_error(error, "SetUpKernelArgs failed");
+
     if (simultaneous_use_support)
     {
         cl_command_buffer_properties_khr properties[3] = {

test_conformance/extensions/cl_khr_command_buffer/basic_command_buffer.h

@@ -43,13 +43,15 @@ struct BasicCommandBufferTest : CommandBufferTestBase
                            cl_command_queue queue);
 
     virtual bool Skip();
+    virtual cl_int SetUpKernel(void);
+    virtual cl_int SetUpKernelArgs(void);
     virtual cl_int SetUp(int elements);
 
     // Test body returning an OpenCL error code
     virtual cl_int Run() = 0;
 
 protected:
-    size_t data_size() const { return num_elements * sizeof(cl_int); }
+    virtual size_t data_size() const { return num_elements * sizeof(cl_int); }
 
     cl_context context;
     clCommandQueueWrapper queue;

test_conformance/extensions/cl_khr_command_buffer/command_buffer_profiling.cpp

@@ -0,0 +1,303 @@
+//
+// Copyright (c) 2022 The Khronos Group Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "basic_command_buffer.h"
+#include "procs.h"
+
+#include <vector>
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+// Command-buffer profiling test cases:
+// -all commands are recorded to a single command-queue
+// -profiling a command-buffer with simultaneous use
+
+template <bool simultaneous_request>
+struct CommandBufferProfiling : public BasicCommandBufferTest
+{
+    CommandBufferProfiling(cl_device_id device, cl_context context,
+                           cl_command_queue queue)
+        : BasicCommandBufferTest(device, context, queue), wait_event(nullptr)
+    {
+        simultaneous_use_requested = simultaneous_request;
+        if (simultaneous_request) buffer_size_multiplier = 2;
+    }
+
+    //--------------------------------------------------------------------------
+    bool Skip() override
+    {
+        if (BasicCommandBufferTest::Skip()) return true;
+
+        Version version = get_device_cl_version(device);
+        const cl_device_info host_queue_query = version >= Version(2, 0)
+            ? CL_DEVICE_QUEUE_ON_HOST_PROPERTIES
+            : CL_DEVICE_QUEUE_PROPERTIES;
+
+        cl_command_queue_properties host_queue_props = 0;
+        int error =
+            clGetDeviceInfo(device, host_queue_query, sizeof(host_queue_props),
+                            &host_queue_props, NULL);
+        if (error != CL_SUCCESS)
+        {
+            print_error(
+                error, "clGetDeviceInfo for CL_DEVICE_QUEUE_PROPERTIES failed");
+            return true;
+        }
+
+        if ((host_queue_props & CL_QUEUE_PROFILING_ENABLE) == 0)
+        {
+            log_info(
+                "Queue property CL_QUEUE_PROFILING_ENABLE not supported \n");
+            return true;
+        }
+        return (simultaneous_use_requested && !simultaneous_use_support);
+    }
+
+    //--------------------------------------------------------------------------
+    cl_int SetUp(int elements) override
+    {
+        cl_int error = CL_SUCCESS;
+        queue = clCreateCommandQueue(context, device, CL_QUEUE_PROFILING_ENABLE,
+                                     &error);
+        test_error(error, "clCreateCommandQueue failed");
+
+        return BasicCommandBufferTest::SetUp(elements);
+    }
+
+    //--------------------------------------------------------------------------
+    cl_int Run() override
+    {
+        cl_int error = CL_SUCCESS;
+
+        // record command buffer
+        error = RecordCommandBuffer();
+        test_error(error, "RecordCommandBuffer failed");
+
+        if (simultaneous_use_requested)
+        {
+            // enqueue simultaneous command-buffers with profiling command queue
+            error = RunSimultaneous();
+            test_error(error, "RunSimultaneous failed");
+        }
+        else
+        {
+            // enqueue single command-buffer with profiling command queue
+            error = RunSingle();
+            test_error(error, "RunSingle failed");
+        }
+
+        return CL_SUCCESS;
+    }
+
+    //--------------------------------------------------------------------------
+    cl_int RecordCommandBuffer()
+    {
+        cl_int error = CL_SUCCESS;
+
+        error = clCommandNDRangeKernelKHR(
+            command_buffer, nullptr, nullptr, kernel, 1, nullptr, &num_elements,
+            nullptr, 0, nullptr, nullptr, nullptr);
+        test_error(error, "clCommandNDRangeKernelKHR failed");
+
+        error = clFinalizeCommandBufferKHR(command_buffer);
+        test_error(error, "clFinalizeCommandBufferKHR failed");
+        return CL_SUCCESS;
+    }
+
+    //--------------------------------------------------------------------------
+#define ADD_PROF_PARAM(prop)                                                   \
+    {                                                                          \
+        prop, #prop, 0                                                         \
+    }
+    struct ProfilingParam
+    {
+        cl_profiling_info param;
+        std::string name;
+        cl_ulong value;
+    };
+
+    //--------------------------------------------------------------------------
+    cl_int VerifyResult(const clEventWrapper& event)
+    {
+        cl_int error = CL_SUCCESS;
+        cl_int status;
+        error = clGetEventInfo(event, CL_EVENT_COMMAND_EXECUTION_STATUS,
+                               sizeof(status), &status, NULL);
+        test_error(error, "clGetEventInfo() failed");
+
+        if (status != CL_SUCCESS)
+            test_fail("Kernel execution status %d! (%s:%d)\n", status, __FILE__,
+                      __LINE__);
+
+        std::vector<ProfilingParam> prof_params = {
+            ADD_PROF_PARAM(CL_PROFILING_COMMAND_QUEUED),
+            ADD_PROF_PARAM(CL_PROFILING_COMMAND_SUBMIT),
+            ADD_PROF_PARAM(CL_PROFILING_COMMAND_START),
+            ADD_PROF_PARAM(CL_PROFILING_COMMAND_END),
+        };
+
+        // gather profiling timestamps
+        for (auto&& p : prof_params)
+        {
+            error = clGetEventProfilingInfo(event, p.param, sizeof(p.value),
+                                            &p.value, NULL);
+            test_error(error, "clGetEventProfilingInfo() failed");
+        }
+
+        // verify the results by comparing timestamps
+        bool all_vals_0 = prof_params.front().value != 0;
+        for (int i = 1; i < prof_params.size(); i++)
+        {
+            all_vals_0 = (prof_params[i].value != 0) ? false : all_vals_0;
+            if (prof_params[i - 1].value > prof_params[i].value)
+            {
+                log_error("Profiling %s=0x%x should be smaller than or equal "
+                          "to %s=0x%x for "
+                          "kernels that use the on-device queue",
+                          prof_params[i - 1].name.c_str(),
+                          prof_params[i - 1].param, prof_params[i].name.c_str(),
+                          prof_params[i].param);
+                return TEST_FAIL;
+            }
+        }
+
+        if (all_vals_0)
+        {
+            log_error("All values are 0. This is exceedingly unlikely.\n");
+            return TEST_FAIL;
+        }
+
+        log_info("Profiling info for command-buffer kernel succeeded.\n");
+        return TEST_PASS;
+    }
+
+    //--------------------------------------------------------------------------
+    cl_int RunSingle()
+    {
+        cl_int error = CL_SUCCESS;
+        std::vector<cl_int> output_data(num_elements);
+
+        error = clEnqueueFillBuffer(queue, in_mem, &pattern, sizeof(cl_int), 0,
+                                    data_size(), 0, nullptr, nullptr);
+        test_error(error, "clEnqueueFillBuffer failed");
+
+        clEventWrapper query_event;
+        error = clEnqueueCommandBufferKHR(0, nullptr, command_buffer, 0,
+                                          nullptr, &query_event);
+        test_error(error, "clEnqueueCommandBufferKHR failed");
+
+        error = clEnqueueReadBuffer(queue, out_mem, CL_TRUE, 0, data_size(),
+                                    output_data.data(), 0, nullptr, nullptr);
+        test_error(error, "clEnqueueReadBuffer failed");
+
+        error = VerifyResult(query_event);
+        test_error(error, "VerifyResult failed");
+
+        return CL_SUCCESS;
+    }
+
+    //--------------------------------------------------------------------------
+    struct SimulPassData
+    {
+        cl_int offset;
+        std::vector<cl_int> output_buffer;
+        clEventWrapper query_event;
+    };
+
+    //--------------------------------------------------------------------------
+    cl_int EnqueueSimultaneousPass(SimulPassData& pd)
+    {
+        cl_int error = clEnqueueFillBuffer(
+            queue, out_mem, &pattern, sizeof(cl_int),
+            pd.offset * sizeof(cl_int), data_size(), 0, nullptr, nullptr);
+        test_error(error, "clEnqueueFillBuffer failed");
+
+        error = clEnqueueFillBuffer(queue, off_mem, &pd.offset, sizeof(cl_int),
+                                    0, sizeof(cl_int), 0, nullptr, nullptr);
+        test_error(error, "clEnqueueFillBuffer failed");
+
+        if (!wait_event)
+        {
+            wait_event = clCreateUserEvent(context, &error);
+            test_error(error, "clCreateUserEvent failed");
+        }
+
+        error = clEnqueueCommandBufferKHR(0, nullptr, command_buffer, 1,
+                                          &wait_event, &pd.query_event);
+        test_error(error, "clEnqueueCommandBufferKHR failed");
+
+        error = clEnqueueReadBuffer(
+            queue, out_mem, CL_FALSE, pd.offset * sizeof(cl_int), data_size(),
+            pd.output_buffer.data(), 0, nullptr, nullptr);
+        test_error(error, "clEnqueueReadBuffer failed");
+
+        return CL_SUCCESS;
+    }
+
+    //--------------------------------------------------------------------------
+    cl_int RunSimultaneous()
+    {
+        cl_int error = CL_SUCCESS;
+        cl_int offset = static_cast<cl_int>(num_elements);
+
+        std::vector<SimulPassData> simul_passes = {
+            { 0, std::vector<cl_int>(num_elements) },
+            { offset, std::vector<cl_int>(num_elements) }
+        };
+
+        for (auto&& pass : simul_passes)
+        {
+            error = EnqueueSimultaneousPass(pass);
+            test_error(error, "EnqueueSimultaneousPass failed");
+        }
+
+        error = clSetUserEventStatus(wait_event, CL_COMPLETE);
+        test_error(error, "clSetUserEventStatus failed");
+
+        error = clFinish(queue);
+        test_error(error, "clFinish failed");
+
+        for (auto&& pass : simul_passes)
+        {
+            error = VerifyResult(pass.query_event);
+            test_error(error, "VerifyResult failed");
+        }
+
+        return CL_SUCCESS;
+    }
+
+    //--------------------------------------------------------------------------
+    clEventWrapper wait_event;
+
+    const cl_int pattern = 0xA;
+};
+
+} // anonymous namespace
+
+int test_basic_profiling(cl_device_id device, cl_context context,
+                         cl_command_queue queue, int num_elements)
+{
+    return MakeAndRunTest<CommandBufferProfiling<false>>(device, context, queue,
+                                                         num_elements);
+}
+
+int test_simultaneous_profiling(cl_device_id device, cl_context context,
+                                cl_command_queue queue, int num_elements)
+{
+    return MakeAndRunTest<CommandBufferProfiling<true>>(device, context, queue,
+                                                        num_elements);
+}

test_conformance/extensions/cl_khr_command_buffer/main.cpp

@@ -21,6 +21,8 @@ test_definition test_list[] = { ADD_TEST(single_ndrange),
                                 ADD_TEST(explicit_flush),
                                 ADD_TEST(user_events),
                                 ADD_TEST(out_of_order),
+                                ADD_TEST(basic_profiling),
+                                ADD_TEST(simultaneous_profiling),
                                 ADD_TEST(queue_substitution),
                                 ADD_TEST(properties_queue_substitution),
                                 ADD_TEST(simultaneous_queue_substitution),
@@ -38,7 +40,6 @@ test_definition test_list[] = { ADD_TEST(single_ndrange),
                                 ADD_TEST(event_info_context),
                                 ADD_TEST(event_info_reference_count) };
 
-
 int main(int argc, const char *argv[])
 {
     // A device may report the required properties of a queue that

test_conformance/extensions/cl_khr_command_buffer/procs.h

@@ -31,6 +31,11 @@ extern int test_user_events(cl_device_id device, cl_context context,
                             cl_command_queue queue, int num_elements);
 extern int test_out_of_order(cl_device_id device, cl_context context,
                              cl_command_queue queue, int num_elements);
+extern int test_basic_profiling(cl_device_id device, cl_context context,
+                                cl_command_queue queue, int num_elements);
+extern int test_simultaneous_profiling(cl_device_id device, cl_context context,
+                                       cl_command_queue queue,
+                                       int num_elements);
 extern int test_queue_substitution(cl_device_id device, cl_context context,
                                    cl_command_queue queue, int num_elements);
 extern int test_properties_queue_substitution(cl_device_id device,