[PATCH] D72764: [mlir][spirv] Fix SPV_MM_Vulkan extension reqirements

[Lei Zhang via Phabricator via llvm-commits]

antiagainst created this revision.
antiagainst added reviewers: benvanik, denis13.
Herald added subscribers: llvm-commits, liufengdb, lucyrfox, mgester, arpith-jacob, nicolasvasilache, shauheen, burmako, jpienaar, rriddle, mehdi_amini.
Herald added a reviewer: mravishankar.
Herald added a project: LLVM.

SPV_MM_Vulkan can be enabled by the SPV_KHR_vulkan_memory_model extension.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D72764

Files:
  mlir/include/mlir/Dialect/SPIRV/SPIRVBase.td
  mlir/test/Dialect/SPIRV/availability.mlir


Index: mlir/test/Dialect/SPIRV/availability.mlir
===================================================================
--- mlir/test/Dialect/SPIRV/availability.mlir
+++ mlir/test/Dialect/SPIRV/availability.mlir
@@ -44,7 +44,7 @@
 func @module_physical_storage_buffer64_vulkan() {
   // CHECK: spv.module min version: V_1_5
   // CHECK: spv.module max version: V_1_5
-  // CHECK: spv.module extensions: [ [SPV_EXT_physical_storage_buffer, SPV_KHR_physical_storage_buffer] ]
+  // CHECK: spv.module extensions: [ [SPV_EXT_physical_storage_buffer, SPV_KHR_physical_storage_buffer] [SPV_KHR_vulkan_memory_model] ]
   // CHECK: spv.module capabilities: [ [PhysicalStorageBufferAddresses] [VulkanMemoryModel] ]
   spv.module "PhysicalStorageBuffer64" "Vulkan" { }
   return
Index: mlir/include/mlir/Dialect/SPIRV/SPIRVBase.td
===================================================================
--- mlir/include/mlir/Dialect/SPIRV/SPIRVBase.td
+++ mlir/include/mlir/Dialect/SPIRV/SPIRVBase.td
@@ -2750,6 +2750,7 @@
 def SPV_MM_Vulkan  : I32EnumAttrCase<"Vulkan", 3> {
   list<Availability> availability = [
     MinVersion<SPV_V_1_5>,
+    Extension<[SPV_KHR_vulkan_memory_model]>,
     Capability<[SPV_C_VulkanMemoryModel]>
   ];
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72764.238232.patch
Type: text/x-patch
Size: 1225 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200115/25fe244a/attachment.bin>