Give appropriate errors for out of order execution related props

README.md

@@ -345,6 +345,11 @@ using the name of the corresponding environment variable.
 
 * `CLVK_CONFIG_FILE` specifies the path to an additional configuration file.
 
+* `CLVK_IGNORE_OUT_OF_ORDER_EXECUTION` can be used to ignore out of order execution checks
+
+   * 0: does not ignore OOOE checks and validates if hardware can support it
+   * 1: ignores the aforementioned checks
+
 * `CLVK_LOG` controls the level of logging
 
    * 0: only print fatal messages (default)

src/api.cpp

@@ -163,6 +163,16 @@ struct api_query_string : public std::string {
     size_t size_with_null() const { return size() + 1; }
 };
 
+bool out_of_order_device_support(const cl_device_id devices, cl_int err) {
+    cl_command_queue_properties device_props = 0;
+    err = clGetDeviceInfo(devices, CL_DEVICE_QUEUE_PROPERTIES,
+                          sizeof(device_props), &device_props, NULL);
+    if (err == CL_SUCCESS) {
+        return device_props & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE;
+    }
+    return false;
+}
+
 } // namespace
 
 // Platform API
@@ -1466,11 +1476,26 @@ cvk_create_command_queue(cl_context context, cl_device_id device,
         return nullptr;
     }
 
+    cl_int err = CL_SUCCESS;
+    std::string oooe_env_var = "CLVK_IGNORE_OUT_OF_ORDER_EXECUTION";
+    const char* oooe_env_var_val = getenv(oooe_env_var.c_str());
+
+    if (oooe_env_var_val == nullptr || strcmp(oooe_env_var_val, "1") != 0) {
+        // We do not support out of order command queues so this must fail
+        if (properties & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE &&
+            !out_of_order_device_support(device, err)) {
+            *errcode_ret = CL_INVALID_QUEUE_PROPERTIES;
+            if (err != CL_SUCCESS) {
+                *errcode_ret = err;
+            }
+            return nullptr;
+        }
+    }
     auto queue = std::make_unique<cvk_command_queue>(
         icd_downcast(context), icd_downcast(device), properties,
         std::move(properties_array));
 
-    cl_int err = queue->init();
+    err = queue->init();
 
     *errcode_ret = err;