This is an archive of the discontinued LLVM Phabricator instance.

Differential D72764

[mlir][spirv] Fix SPV_MM_Vulkan extension reqirements
ClosedPublic

Authored by antiagainst on Jan 15 2020, 6:09 AM.

Details

Reviewers
benvanik
denis13
mravishankar
nicolasvasilache
Commits
rG961174f8787b: [mlir][spirv] Fix SPV_MM_Vulkan extension reqirements
Summary

SPV_MM_Vulkan can be enabled by the SPV_KHR_vulkan_memory_model extension.

Diff Detail

Event Timeline

antiagainst created this revision.Jan 15 2020, 6:09 AM
Herald added a reviewer: mravishankar. · View Herald TranscriptJan 15 2020, 6:09 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, liufengdb, lucyrfox and 8 others. · View Herald Transcript
antiagainst added a parent revision: D72763: [mlir][spirv] Use symbolize functions in enum attribute predicates.Jan 15 2020, 6:12 AM
antiagainst added a child revision: D72765: [mlir][spirv] Support implied extensions and capabilities.Jan 15 2020, 6:14 AM
merge_guards_bot added a subscriber: merge_guards_bot.Jan 15 2020, 6:25 AM

Unit tests: pass. 61884 tests passed, 0 failed and 782 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Harbormaster completed remote builds in B44038: Diff 238232.Jan 15 2020, 6:30 AM
benvanik accepted this revision.Jan 15 2020, 9:12 AM
This revision is now accepted and ready to land.Jan 15 2020, 9:12 AM
Closed by commit rG961174f8787b: [mlir][spirv] Fix SPV_MM_Vulkan extension reqirements (authored by antiagainst). · Explain WhyJan 16 2020, 6:34 PM
This revision was automatically updated to reflect the committed changes.
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptJan 16 2020, 6:34 PM

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
SPIRV/
1 line
test/
Dialect/
SPIRV/
2 lines

Diff 238679

mlir/include/mlir/Dialect/SPIRV/SPIRVBase.td

Show First 20 Lines • Show All 2,700 Lines • ▼ Show 20 Lines
def SPV_MM_OpenCL : I32EnumAttrCase<"OpenCL", 2> { def SPV_MM_OpenCL : I32EnumAttrCase<"OpenCL", 2> {
list<Availability> availability = [ list<Availability> availability = [
Capability<[SPV_C_Kernel]> Capability<[SPV_C_Kernel]>
]; ];
} }
def SPV_MM_Vulkan : I32EnumAttrCase<"Vulkan", 3> { def SPV_MM_Vulkan : I32EnumAttrCase<"Vulkan", 3> {
list<Availability> availability = [ list<Availability> availability = [
MinVersion<SPV_V_1_5>, MinVersion<SPV_V_1_5>,
Extension<[SPV_KHR_vulkan_memory_model]>,
Capability<[SPV_C_VulkanMemoryModel]> Capability<[SPV_C_VulkanMemoryModel]>
]; ];
} }
def SPV_MemoryModelAttr : def SPV_MemoryModelAttr :
SPV_I32EnumAttr<"MemoryModel", "valid SPIR-V MemoryModel", [ SPV_I32EnumAttr<"MemoryModel", "valid SPIR-V MemoryModel", [
SPV_MM_Simple, SPV_MM_GLSL450, SPV_MM_OpenCL, SPV_MM_Vulkan SPV_MM_Simple, SPV_MM_GLSL450, SPV_MM_OpenCL, SPV_MM_Vulkan
]>; ]>;
▲ Show 20 Lines • Show All 604 Lines • Show Last 20 Lines

mlir/test/Dialect/SPIRV/availability.mlir

Show All 38 Linesfunc @module_logical_glsl450() {
spv.module "Logical" "GLSL450" { } spv.module "Logical" "GLSL450" { }
return return
} }
// CHECK-LABEL: module_physical_storage_buffer64_vulkan // CHECK-LABEL: module_physical_storage_buffer64_vulkan
func @module_physical_storage_buffer64_vulkan() { func @module_physical_storage_buffer64_vulkan() {
// CHECK: spv.module min version: V_1_5 // CHECK: spv.module min version: V_1_5
// CHECK: spv.module max 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] ] // CHECK: spv.module capabilities: [ [PhysicalStorageBufferAddresses] [VulkanMemoryModel] ]
spv.module "PhysicalStorageBuffer64" "Vulkan" { } spv.module "PhysicalStorageBuffer64" "Vulkan" { }
return return
} }