[vulkan] Reduce descriptor sets, use official headers, improve allocator, remove module destructor

CMakeLists.txt

@@ -242,6 +242,15 @@ Halide_feature(WITH_TESTS "Halide's unit test suite" TOP_LEVEL)
 Halide_feature(WITH_TUTORIALS "Halide's tutorial code" TOP_LEVEL)
 Halide_feature(WITH_UTILS "Optional utility programs for Halide, including HalideTraceViz" TOP_LEVEL)
 
+##
+# FIXME: Disable other GPU backends 
+if (Halide_TARGET MATCHES "vulkan")
+    message(WARNING "Building Vulkan runtime support!")
+else ()
+    message(FATAL_ERROR "Target disabled for testing ...")
+endif()
+
+
 ##
 # Add source directories
 

src/runtime/vulkan.cpp

@@ -200,7 +200,11 @@ WEAK int halide_vulkan_device_sync(void *user_context, halide_buffer_t *) {
     uint64_t t_before = halide_current_time_ns(user_context);
 #endif
 
-    vkQueueWaitIdle(ctx.queue);
+    VkResult result = vkQueueWaitIdle(ctx.queue);
+    if (result != VK_SUCCESS) {
+        error(user_context) << "Vulkan: vkQueueWaitIdle returned " << vk_get_error_name(result) << "\n";
+        return halide_error_code_generic_error;
+    }
 
 #ifdef DEBUG_RUNTIME
     uint64_t t_after = halide_current_time_ns(user_context);
@@ -1383,13 +1387,7 @@ WEAK int halide_vulkan_release_unused_device_allocations(void *user_context) {
 }
 
 WEAK void halide_vulkan_release_all() {
-// Disable custom JIT destructor until we resolve driver issues for segfaults on cleanup
-#if 0
-    debug(nullptr) << "halide_vulkan_release_all()\n";
-    if (halide_vulkan_is_initialized()) {
-        halide_vulkan_device_release(nullptr);
-    }
-#endif
+    // Disable custom JIT destructor until we resolve driver issues for segfaults on cleanup
 }
 
 namespace {
@@ -1418,6 +1416,13 @@ WEAK __attribute__((destructor)) void halide_vulkan_cleanup() {
     //       For JIT, we register a custom destructor in JITModule.cpp that
     //       calls halide_vulkan_release_all() when the module refcount
     //       reaches zero and the module is destroyed.
+    //
+
+    // WIP: Attempt cleanup to see if driver issues are still present.
+    debug(nullptr) << "halide_vulkan_cleanup()\n";
+    if (halide_vulkan_is_initialized()) {
+        halide_vulkan_device_release(nullptr);
+    }
 }
 
 // --------------------------------------------------------------------------

src/runtime/vulkan_context.h

@@ -514,30 +514,31 @@ int vk_destroy_context(void *user_context, VulkanMemoryAllocator *allocator,
         return halide_error_code_success;
     }
 
-    if (device != nullptr) {
-        vk_load_vulkan_device_functions(user_context, device);
-        if (vkAllocateMemory == nullptr) {
-            debug(user_context) << "Vulkan: Lost device interface ... \n";
-            vk_unload_vulkan_device_functions(user_context);
-            vk_unload_vulkan_instance_functions(user_context);
-            return halide_error_code_device_interface_no_device;
+    if (queue != VK_NULL_HANDLE) {
+        VkResult result = vkQueueWaitIdle(queue);
+        if (result != VK_SUCCESS) {
+            error(user_context) << "Vulkan: vkQueueWaitIdle returned " << vk_get_error_name(result) << "\n";
+            return halide_error_code_generic_error;
         }
     }
-
-    if (device != nullptr) {
-        vkDeviceWaitIdle(device);
+    if (device != VK_NULL_HANDLE) {
+        VkResult result = vkDeviceWaitIdle(device);
+        if (result != VK_SUCCESS) {
+            error(user_context) << "Vulkan: vkDeviceWaitIdle returned " << vk_get_error_name(result) << "\n";
+            return halide_error_code_generic_error;
+        }
     }
-
+    
     if (allocator != nullptr) {
         vk_destroy_shader_modules(user_context, allocator);
         vk_destroy_memory_allocator(user_context, allocator);
     }
 
     const VkAllocationCallbacks *alloc_callbacks = halide_vulkan_get_allocation_callbacks(user_context);
-    if (device != nullptr) {
+    if (device != VK_NULL_HANDLE) {
         vk_destroy_device(user_context, device, alloc_callbacks);
     }
-    if (instance != nullptr) {
+    if (instance != VK_NULL_HANDLE) {
         vk_destroy_instance(user_context, instance, alloc_callbacks);
     }
     return halide_error_code_success;