[vulkan] Support Vulkan 1.3 (taichi-dev#4211)

Co-authored-by: Taichi Gardener <[email protected]>
zerolyj · Feb 7, 2022 · 6636922 · 6636922
1 parent c8d5b3f
commit 6636922
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 18 deletions.
diff --git a/external/SPIRV-Cross b/external/SPIRV-Cross
diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
diff --git a/external/SPIRV-Reflect b/external/SPIRV-Reflect
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
diff --git a/external/Vulkan-Headers b/external/Vulkan-Headers
diff --git a/external/VulkanMemoryAllocator b/external/VulkanMemoryAllocator
diff --git a/external/volk b/external/volk
diff --git a/taichi/backends/vulkan/vulkan_device.cpp b/taichi/backends/vulkan/vulkan_device.cpp
@@ -1811,9 +1811,8 @@ void VulkanDevice::create_vma_allocator() {
   allocatorInfo.device = device_;
   allocatorInfo.instance = instance_;
 
-#ifndef __APPLE__
   VolkDeviceTable table;
-  VmaVulkanFunctions vk_vma_functions;
+  VmaVulkanFunctions vk_vma_functions{0};
 
   volkLoadDeviceTable(&table, device_);
   vk_vma_functions.vkGetPhysicalDeviceProperties =
@@ -1851,7 +1850,6 @@ void VulkanDevice::create_vma_allocator() {
           volkGetLoadedInstance(), "vkGetPhysicalDeviceMemoryProperties2KHR"));
 
   allocatorInfo.pVulkanFunctions = &vk_vma_functions;
-#endif
 
   vmaCreateAllocator(&allocatorInfo, &allocator_);
 

diff --git a/taichi/backends/vulkan/vulkan_device_creator.cpp b/taichi/backends/vulkan/vulkan_device_creator.cpp
@@ -228,7 +228,7 @@ void VulkanDeviceCreator::create_instance() {
     app_info.apiVersion = params_.api_version.value();
   } else {
     // The highest version designed to use
-    app_info.apiVersion = VK_API_VERSION_1_2;
+    app_info.apiVersion = VK_API_VERSION_1_3;
   }
 
   VkInstanceCreateInfo create_info{};
@@ -372,13 +372,24 @@ void VulkanDeviceCreator::create_logical_device() {
   create_info.queueCreateInfoCount = queue_create_infos.size();
 
   // Get device properties
-  VkPhysicalDeviceProperties physical_device_properties;
+  VkPhysicalDeviceProperties physical_device_properties{};
   vkGetPhysicalDeviceProperties(physical_device_, &physical_device_properties);
+  TI_INFO("Vulkan Device \"{}\" supports Vulkan {} version {}.{}.{}",
+          physical_device_properties.deviceName,
+          VK_API_VERSION_VARIANT(physical_device_properties.apiVersion),
+          VK_API_VERSION_MAJOR(physical_device_properties.apiVersion),
+          VK_API_VERSION_MINOR(physical_device_properties.apiVersion),
+          VK_API_VERSION_PATCH(physical_device_properties.apiVersion));
+
   ti_device_->set_cap(DeviceCapability::vk_api_version,
                       physical_device_properties.apiVersion);
   ti_device_->set_cap(DeviceCapability::spirv_version, 0x10000);
 
-  if (physical_device_properties.apiVersion >= VK_API_VERSION_1_1) {
+  if (physical_device_properties.apiVersion >= VK_API_VERSION_1_3) {
+    ti_device_->set_cap(DeviceCapability::spirv_version, 0x10600);
+  } else if (physical_device_properties.apiVersion >= VK_API_VERSION_1_2) {
+    ti_device_->set_cap(DeviceCapability::spirv_version, 0x10500);
+  } else if (physical_device_properties.apiVersion >= VK_API_VERSION_1_1) {
     ti_device_->set_cap(DeviceCapability::spirv_version, 0x10300);
   }
 
@@ -392,7 +403,7 @@ void VulkanDeviceCreator::create_logical_device() {
   vkEnumerateDeviceExtensionProperties(
       physical_device_, nullptr, &extension_count, extension_properties.data());
 
-  bool has_surface = false, has_swapchain = false;
+  bool has_swapchain = false;
 
   bool portability_subset_enabled = false;
 
@@ -420,8 +431,10 @@ void VulkanDeviceCreator::create_logical_device() {
     } else if (name == VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME) {
       enabled_extensions.push_back(ext.extensionName);
     } else if (name == VK_KHR_SPIRV_1_4_EXTENSION_NAME) {
-      ti_device_->set_cap(DeviceCapability::spirv_version, 0x10400);
-      enabled_extensions.push_back(ext.extensionName);
+      if (ti_device_->get_cap(DeviceCapability::spirv_version) < 0x10400) {
+        ti_device_->set_cap(DeviceCapability::spirv_version, 0x10400);
+        enabled_extensions.push_back(ext.extensionName);
+      }
     } else if (name == VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME ||
                name == VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME) {
       ti_device_->set_cap(DeviceCapability::vk_has_external_memory, true);
@@ -430,6 +443,12 @@ void VulkanDeviceCreator::create_logical_device() {
       enabled_extensions.push_back(ext.extensionName);
     } else if (name == VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME) {
       enabled_extensions.push_back(ext.extensionName);
+    } else if (name == VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME) {
+      enabled_extensions.push_back(ext.extensionName);
+    } else if (name == VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME) {
+      enabled_extensions.push_back(ext.extensionName);
+    } else if (name == VK_KHR_BIND_MEMORY_2_EXTENSION_NAME) {
+      enabled_extensions.push_back(ext.extensionName);
     } else if (std::find(params_.additional_device_extensions.begin(),
                          params_.additional_device_extensions.end(),
                          name) != params_.additional_device_extensions.end()) {

diff --git a/taichi/backends/vulkan/vulkan_memory_allocator.cpp b/taichi/backends/vulkan/vulkan_memory_allocator.cpp
@@ -2,4 +2,5 @@
 
 #define VMA_IMPLEMENTATION
 #define VMA_DEDICATED_ALLOCATION 0
+#define VMA_DYNAMIC_VULKAN_FUNCTIONS 0
 #include "vk_mem_alloc.h"
diff --git a/taichi/codegen/spirv/spirv_codegen.cpp b/taichi/codegen/spirv/spirv_codegen.cpp
@@ -1797,13 +1797,27 @@ static void spriv_message_consumer(spv_message_level_t level,
 
 KernelCodegen::KernelCodegen(const Params &params)
     : params_(params), ctx_attribs_(*params.kernel) {
-  spirv_opt_ = std::make_unique<spvtools::Optimizer>(SPV_ENV_VULKAN_1_2);
+  spv_target_env target_env = SPV_ENV_VULKAN_1_0;
+  uint32_t spirv_version =
+      params.device->get_cap(DeviceCapability::spirv_version);
+
+  if (spirv_version >= 0x10600) {
+    target_env = SPV_ENV_VULKAN_1_3;
+  } else if (spirv_version >= 0x10500) {
+    target_env = SPV_ENV_VULKAN_1_2;
+  } else if (spirv_version >= 0x10400) {
+    target_env = SPV_ENV_VULKAN_1_1_SPIRV_1_4;
+  } else if (spirv_version >= 0x10300) {
+    target_env = SPV_ENV_VULKAN_1_1;
+  }
+
+  spirv_opt_ = std::make_unique<spvtools::Optimizer>(target_env);
   spirv_opt_->SetMessageConsumer(spriv_message_consumer);
   if (params.enable_spv_opt)
     spirv_opt_->RegisterPerformancePasses();
   spirv_opt_options_.set_run_validator(false);
 
-  spirv_tools_ = std::make_unique<spvtools::SpirvTools>(SPV_ENV_VULKAN_1_2);
+  spirv_tools_ = std::make_unique<spvtools::SpirvTools>(target_env);
 }
 
 void KernelCodegen::run(TaichiKernelAttributes &kernel_attribs,
+43 −24		CMakeLists.txt
+77 −14		common/output_stream.cpp
+9 −3		examples/main_io_variables.cpp
+313 −7		include/spirv/unified1/spirv.h
+144 −67		spirv_reflect.c
+80 −17		spirv_reflect.h
+1 −0		tests/build_all_shaders.py
+15 −0		tests/entry_exec_mode/comp_local_size.glsl
+ −		tests/entry_exec_mode/comp_local_size.spv
+112 −0		tests/entry_exec_mode/comp_local_size.spv.yaml
+13 −0		tests/entry_exec_mode/geom_inv_out_vert.glsl
+ −		tests/entry_exec_mode/geom_inv_out_vert.spv
+393 −0		tests/entry_exec_mode/geom_inv_out_vert.spv.yaml
+67 −0		tests/glsl/matrix_major_order_glsl.glsl
+ −		tests/glsl/matrix_major_order_glsl.spv
+1,051 −0		tests/glsl/matrix_major_order_glsl.spv.yaml
+24 −0		tests/glsl/runtime_array_of_array_of_struct.glsl
+ −		tests/glsl/runtime_array_of_array_of_struct.spv
+368 −0		tests/glsl/runtime_array_of_array_of_struct.spv.yaml
+23 −40		tests/hlsl/append_consume.spv.yaml
+2 −2		tests/hlsl/array_of_structured_buffer.spv.yaml
+6 −6		tests/hlsl/binding_types.spv.yaml
+14 −48		tests/hlsl/counter_buffers.spv.yaml
+64 −0		tests/hlsl/matrix_major_order_hlsl.hlsl
+ −		tests/hlsl/matrix_major_order_hlsl.spv
+1,051 −0		tests/hlsl/matrix_major_order_hlsl.spv.yaml
+1 −1		tests/hlsl/semantics.spv.yaml
+16 −262		tests/hlsl/structuredbuffer.spv.yaml
+50 −0		tests/test-spirv-reflect.cpp
+6 −3		util/stripper/stripper.cpp
+10 −6		BUILD.gn
+235 −226		include/vk_video/vulkan_video_codec_h264std.h
+60 −49		include/vk_video/vulkan_video_codec_h264std_decode.h
+56 −53		include/vk_video/vulkan_video_codec_h264std_encode.h
+292 −287		include/vk_video/vulkan_video_codec_h265std.h
+32 −31		include/vk_video/vulkan_video_codec_h265std_decode.h
+85 −77		include/vk_video/vulkan_video_codec_h265std_encode.h
+14 −4		include/vk_video/vulkan_video_codecs_common.h
+2 −2		include/vulkan/vk_platform.h
+1 −1		include/vulkan/vulkan.h
+4,638 −4,251		include/vulkan/vulkan.hpp
+2 −2		include/vulkan/vulkan_android.h
+131 −44		include/vulkan/vulkan_beta.h
+1,793 −894		include/vulkan/vulkan_core.h
+1 −1		include/vulkan/vulkan_directfb.h
+5,278 −1,512		include/vulkan/vulkan_enums.hpp
+1 −1		include/vulkan/vulkan_fuchsia.h
+1,745 −717		include/vulkan/vulkan_funcs.hpp
+1 −1		include/vulkan/vulkan_ggp.h
+754 −289		include/vulkan/vulkan_handles.hpp
+13,191 −0		include/vulkan/vulkan_hash.hpp
+1 −1		include/vulkan/vulkan_ios.h
+1 −1		include/vulkan/vulkan_macos.h
+1 −1		include/vulkan/vulkan_metal.h
+3,904 −1,757		include/vulkan/vulkan_raii.hpp
+1 −1		include/vulkan/vulkan_screen.h
+27,281 −6,223		include/vulkan/vulkan_structs.hpp
+1 −1		include/vulkan/vulkan_vi.h
+1 −1		include/vulkan/vulkan_wayland.h
+1 −1		include/vulkan/vulkan_win32.h
+1 −1		include/vulkan/vulkan_xcb.h
+1 −1		include/vulkan/vulkan_xlib.h
+1 −1		include/vulkan/vulkan_xlib_xrandr.h
+11 −0		registry/apiconventions.py
+10 −6		registry/cgenerator.py
+3 −3		registry/conventions.py
+58 −16		registry/generator.py
+141 −24		registry/genvk.py
+271 −93		registry/reg.py
+1 −1		registry/spec_tools/util.py
+6,233 −2,943		registry/validusage.json
+3,155 −765		registry/vk.xml
+6 −5		registry/vkconventions.py