diff options
| author | Lei Zhang <antiagainst@google.com> | 2019-09-13 15:25:56 -0700 |
|---|---|---|
| committer | A. Unique TensorFlower <gardener@tensorflow.org> | 2019-09-13 15:26:32 -0700 |
| commit | 113aadddf99377d7205ef840b3292bbf55648d97 (patch) | |
| tree | 9524c9fd06d6d922d4b94e3524f450b37a25ff2e /mlir/lib/Conversion/GPUToSPIRV | |
| parent | f1b100c77ba005899c60f3dea74607d5daad3f52 (diff) | |
| download | bcm5719-llvm-113aadddf99377d7205ef840b3292bbf55648d97.tar.gz bcm5719-llvm-113aadddf99377d7205ef840b3292bbf55648d97.zip | |
Update SPIR-V symbols and use GLSL450 instead of VulkanKHR
SPIR-V recently publishes v1.5, which brings a bunch of symbols
into core. So the suffix "KHR"/"EXT"/etc. is removed from the
symbols. We use a script to pull information from the spec
directly.
Also changed conversion and tests to use GLSL450 instead of
VulkanKHR memory model. GLSL450 is still the main memory model
supported by Vulkan shaders and it does not require extra
capability to enable.
PiperOrigin-RevId: 268992661
Diffstat (limited to 'mlir/lib/Conversion/GPUToSPIRV')
| -rw-r--r-- | mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp index 544232e9860..4760ed0e1ce 100644 --- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp +++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp @@ -134,7 +134,7 @@ void GPUToSPIRVPass::runOnModule() { builder.getI32IntegerAttr( static_cast<int32_t>(spirv::AddressingModel::Logical)), builder.getI32IntegerAttr( - static_cast<int32_t>(spirv::MemoryModel::VulkanKHR))); + static_cast<int32_t>(spirv::MemoryModel::GLSL450))); OpBuilder moduleBuilder(spvModule.getOperation()->getRegion(0)); moduleBuilder.clone(*funcOp.getOperation()); spirvModules.push_back(spvModule); |

