[Mesa-dev] [PATCH v2 1/5] anv: implementation of VK_EXT_debug_report extension
Tapani Pälli
tapani.palli at intel.com
Thu Aug 31 15:15:05 UTC 2017
On 08/29/2017 08:44 AM, Tapani Pälli wrote:
> Patch adds required functionality for extension to manage a list of
> application provided callbacks and handle debug reporting from driver
> and application side.
>
> v2: remove useless helper anv_debug_report_call
> add locking around callbacks list
> use vk_alloc2, vk_free2 helpers
> refactor CreateDebugReportCallbackEXT
> fix bugs found with crucible testing
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
> src/intel/Makefile.sources | 1 +
> src/intel/vulkan/anv_debug_report.c | 124 ++++++++++++++++++++++++++++++++++++
> src/intel/vulkan/anv_device.c | 46 +++++++++++++
> src/intel/vulkan/anv_extensions.py | 1 +
> src/intel/vulkan/anv_private.h | 24 +++++++
> 5 files changed, 196 insertions(+)
> create mode 100644 src/intel/vulkan/anv_debug_report.c
8<
> +void
> +anv_debug_report(struct anv_instance *instance,
> + VkDebugReportFlagsEXT flags,
> + VkDebugReportObjectTypeEXT object_type,
> + uint64_t handle,
> + size_t location,
> + int32_t messageCode,
> + const char* pLayerPrefix,
> + const char *pMessage)
> +{
> + /* Allow NULL for convinience, return if no callbacks registered. */
> + if (!instance || list_empty(&instance->callbacks))
> + return;
> +
> + pthread_mutex_lock(&instance->callbacks_mutex);
> +
> + /* Section 33.2 of the Vulkan 1.0.59 spec says:
> + *
> + * "callback is an externally synchronized object and must not be
> + * used on more than one thread at a time. This means that
> + * vkDestroyDebugReportCallbackEXT must not be called when a callback
> + * is active."
> + */
> + list_for_each_entry_safe(struct anv_debug_callback, cb,
self-review, I forgot to take away '_safe', this is now fixed locally.
> + &instance->callbacks, link) {
> + if (cb->flags & flags)
> + cb->callback(flags, object_type, handle, location, messageCode,
> + pLayerPrefix, pMessage, cb->data);
> + }
> +
> + pthread_mutex_unlock(&instance->callbacks_mutex);
> +}
> diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
> index 2e0fa19b1a..7e091246a8 100644
> --- a/src/intel/vulkan/anv_device.c
> +++ b/src/intel/vulkan/anv_device.c
> @@ -443,9 +443,28 @@ VkResult anv_CreateInstance(
> VkInstance* pInstance)
> {
> struct anv_instance *instance;
> + VkDebugReportCallbackCreateInfoEXT *ctor_cb = NULL;
>
> assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO);
>
> + /* Check if user passed a debug report callback to be used during
> + * Create/Destroy of instance.
> + */
> + vk_foreach_struct(ext, pCreateInfo->pNext) {
> + switch (ext->sType) {
> + case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT: {
> + ctor_cb = (VkDebugReportCallbackCreateInfoEXT *) ext;
> + break;
> + }
> + default:
> + /* We ignore any other type by purpose here, we are only
> + * interested if debug report callback was found for instance
> + * ctor/dtor.
> + */
> + break;
> + }
> + };
> +
> uint32_t client_version;
> if (pCreateInfo->pApplicationInfo &&
> pCreateInfo->pApplicationInfo->apiVersion != 0) {
> @@ -456,6 +475,17 @@ VkResult anv_CreateInstance(
>
> if (VK_MAKE_VERSION(1, 0, 0) > client_version ||
> client_version > VK_MAKE_VERSION(1, 0, 0xfff)) {
> +
> + if (ctor_cb && ctor_cb->flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
> + ctor_cb->pfnCallback(VK_DEBUG_REPORT_ERROR_BIT_EXT,
> + VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT,
> + 0, /* No handle available yet. */
> + __LINE__,
> + 0,
> + "anv",
> + "incompatible driver version",
> + ctor_cb->pUserData);
> +
> return vk_errorf(VK_ERROR_INCOMPATIBLE_DRIVER,
> "Client requested version %d.%d.%d",
> VK_VERSION_MAJOR(client_version),
> @@ -484,6 +514,20 @@ VkResult anv_CreateInstance(
> instance->apiVersion = client_version;
> instance->physicalDeviceCount = -1;
>
> + if (pthread_mutex_init(&instance->callbacks_mutex, NULL) != 0) {
> + vk_free2(&default_alloc, pAllocator, instance);
> + return vk_error(VK_ERROR_INITIALIZATION_FAILED);
> + }
> +
> + list_inithead(&instance->callbacks);
> +
> + /* Store report debug callback to be used during DestroyInstance. */
> + if (ctor_cb) {
> + instance->dtor_cb.flags = ctor_cb->flags;
> + instance->dtor_cb.callback = ctor_cb->pfnCallback;
> + instance->dtor_cb.data = ctor_cb->pUserData;
> + }
> +
> _mesa_locale_init();
>
> VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false));
> @@ -510,6 +554,8 @@ void anv_DestroyInstance(
>
> VG(VALGRIND_DESTROY_MEMPOOL(instance));
>
> + pthread_mutex_destroy(&instance->callbacks_mutex);
> +
> _mesa_locale_fini();
>
> vk_free(&instance->alloc, instance);
> diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
> index 6b3d72e4b4..acec785959 100644
> --- a/src/intel/vulkan/anv_extensions.py
> +++ b/src/intel/vulkan/anv_extensions.py
> @@ -75,6 +75,7 @@ EXTENSIONS = [
> Extension('VK_KHR_xcb_surface', 6, 'VK_USE_PLATFORM_XCB_KHR'),
> Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
> Extension('VK_KHX_multiview', 1, True),
> + Extension('VK_EXT_debug_report', 8, True),
> ]
>
> class VkVersion:
> diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
> index b30b71f336..ae66c5439b 100644
> --- a/src/intel/vulkan/anv_private.h
> +++ b/src/intel/vulkan/anv_private.h
> @@ -61,6 +61,8 @@ typedef uint32_t xcb_window_t;
> struct anv_buffer;
> struct anv_buffer_view;
> struct anv_image_view;
> +struct anv_instance;
> +struct anv_debug_callback;
>
> struct gen_l3_config;
>
> @@ -237,6 +239,15 @@ void __anv_perf_warn(const char *file, int line, const char *format, ...)
> void anv_loge(const char *format, ...) anv_printflike(1, 2);
> void anv_loge_v(const char *format, va_list va);
>
> +void anv_debug_report(struct anv_instance *instance,
> + VkDebugReportFlagsEXT flags,
> + VkDebugReportObjectTypeEXT object_type,
> + uint64_t handle,
> + size_t location,
> + int32_t messageCode,
> + const char* pLayerPrefix,
> + const char *pMessage);
> +
> /**
> * Print a FINISHME message, including its source location.
> */
> @@ -666,6 +677,14 @@ struct anv_physical_device {
> int local_fd;
> };
>
> +struct anv_debug_callback {
> + /* Link in the 'callbacks' list in anv_instance struct. */
> + struct list_head link;
> + VkDebugReportFlagsEXT flags;
> + PFN_vkDebugReportCallbackEXT callback;
> + void * data;
> +};
> +
> struct anv_instance {
> VK_LOADER_DATA _loader_data;
>
> @@ -674,6 +693,11 @@ struct anv_instance {
> uint32_t apiVersion;
> int physicalDeviceCount;
> struct anv_physical_device physicalDevice;
> +
> + /* VK_EXT_debug_report debug callbacks */
> + pthread_mutex_t callbacks_mutex;
> + struct list_head callbacks;
> + struct anv_debug_callback dtor_cb;
> };
>
> VkResult anv_init_wsi(struct anv_physical_device *physical_device);
>
More information about the mesa-dev
mailing list