summaryrefslogtreecommitdiffstats
path: root/mlir/test/Dialect/SPIRV/Serialization
diff options
context:
space:
mode:
authorLei Zhang <antiagainst@google.com>2019-09-13 15:25:56 -0700
committerA. Unique TensorFlower <gardener@tensorflow.org>2019-09-13 15:26:32 -0700
commit113aadddf99377d7205ef840b3292bbf55648d97 (patch)
tree9524c9fd06d6d922d4b94e3524f450b37a25ff2e /mlir/test/Dialect/SPIRV/Serialization
parentf1b100c77ba005899c60f3dea74607d5daad3f52 (diff)
downloadbcm5719-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/test/Dialect/SPIRV/Serialization')
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/entry.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/load_store.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir4
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/select.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/struct.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/variables.mlir2
-rw-r--r--mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir2
13 files changed, 14 insertions, 14 deletions
diff --git a/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir b/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
index e2172f6e100..34af0fd6e40 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @access_chain(%arg0 : !spv.ptr<!spv.array<4x!spv.array<4xf32>>, Function>,
%arg1 : i32, %arg2 : i32) {
// CHECK: {{%.*}} = spv.AccessChain {{%.*}}[{{%.*}}] : !spv.ptr<!spv.array<4 x !spv.array<4 x f32>>, Function>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir b/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
index fa76c8a4c44..9356c7de309 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @array_stride(%arg0 : !spv.ptr<!spv.array<4x!spv.array<4xf32 [4]> [128]>, StorageBuffer>,
%arg1 : i32, %arg2 : i32) {
// CHECK: {{%.*}} = spv.AccessChain {{%.*}}[{{%.*}}, {{%.*}}] : !spv.ptr<!spv.array<4 x !spv.array<4 x f32 [4]> [128]>, StorageBuffer>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir b/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
index 891d9fd142a..0a699b2ce11 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @fmul(%arg0 : f32, %arg1 : f32) {
// CHECK: {{%.*}}= spv.FMul {{%.*}}, {{%.*}} : f32
%0 = spv.FMul %arg0, %arg1 : f32
diff --git a/mlir/test/Dialect/SPIRV/Serialization/entry.mlir b/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
index cd48e209886..c58134ab48a 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @noop() -> () {
spv.Return
}
diff --git a/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir b/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
index 1c8488f8518..924318b4f12 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
// CHECK: spv.globalVariable @var2 : !spv.ptr<f32, Input>
// CHECK-NEXT: spv.globalVariable @var3 : !spv.ptr<f32, Output>
// CHECK-NEXT: func @noop({{%.*}}: !spv.ptr<f32, Input>, {{%.*}}: !spv.ptr<f32, Output>)
diff --git a/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir b/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
index b8bd23095ce..278fe1b77c0 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @foo() -> () {
spv.Return
}
diff --git a/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir b/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
index 07ec6da3429..b6c02634c32 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
@@ -4,7 +4,7 @@
// CHECK-NEXT: [[VALUE:%.*]] = spv.Load "Input" [[ARG1]] : f32
// CHECK-NEXT: spv.Store "Output" [[ARG2]], [[VALUE]] : f32
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @load_store(%arg0 : !spv.ptr<f32, Input>, %arg1 : !spv.ptr<f32, Output>) {
%1 = spv.Load "Input" %arg0 : f32
spv.Store "Output" %arg1, %1 : f32
diff --git a/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir b/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
index 8754a67cb2c..82b7aee69cc 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
@@ -1,12 +1,12 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-// CHECK: spv.module "Logical" "VulkanKHR" {
+// CHECK: spv.module "Logical" "GLSL450" {
// CHECK-NEXT: func @foo() {
// CHECK-NEXT: spv.Return
// CHECK-NEXT: }
// CHECK-NEXT: } attributes {major_version = 1 : i32, minor_version = 0 : i32}
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
func @foo() -> () {
spv.Return
}
diff --git a/mlir/test/Dialect/SPIRV/Serialization/select.mlir b/mlir/test/Dialect/SPIRV/Serialization/select.mlir
index aec39e825f5..614d71aa100 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/select.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/select.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
spv.specConstant @condition_scalar = true
func @select() -> () {
%0 = spv.constant 4.0 : f32
diff --git a/mlir/test/Dialect/SPIRV/Serialization/struct.mlir b/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
index 98481e142c3..086e5778ba9 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
// CHECK: !spv.ptr<!spv.struct<!spv.array<128 x f32 [4]> [0]>, Input>
spv.globalVariable @var0 bind(0, 1) : !spv.ptr<!spv.struct<!spv.array<128 x f32 [4]> [0]>, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir b/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
index 544197632bf..9e5d9e19abb 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
spv.globalVariable @globalInvocationID built_in("GlobalInvocationId") : !spv.ptr<vector<3xi32>, Input>
func @foo() {
// CHECK: %[[ADDR:.*]] = spv._address_of @globalInvocationID : !spv.ptr<vector<3xi32>, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/variables.mlir b/mlir/test/Dialect/SPIRV/Serialization/variables.mlir
index d87b944b93d..990a1a60c7b 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variables.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variables.mlir
@@ -5,7 +5,7 @@
// CHECK-NEXT: spv.globalVariable @var2 built_in("GlobalInvocationId") : !spv.ptr<vector<3xi32>, Input>
// CHECK-NEXT: spv.globalVariable @var3 built_in("GlobalInvocationId") : !spv.ptr<vector<3xi32>, Input>
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
spv.globalVariable @var0 bind(1, 0) : !spv.ptr<f32, Input>
spv.globalVariable @var1 bind(0, 1) : !spv.ptr<f32, Output>
spv.globalVariable @var2 {built_in = "GlobalInvocationId"} : !spv.ptr<vector<3xi32>, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir b/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
index 7432d482ff4..64849ffba3d 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
@@ -1,6 +1,6 @@
// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
-spv.module "Logical" "VulkanKHR" {
+spv.module "Logical" "GLSL450" {
// CHECK: spv.globalVariable @var1 : !spv.ptr<f32, Input>
// CHECK-NEXT: spv.globalVariable @var2 initializer(@var1) bind(1, 0) : !spv.ptr<f32, Input>
spv.globalVariable @var1 : !spv.ptr<f32, Input>
OpenPOWER on IntegriCloud