Register a -test-spirv-roundtrip hook to mlir-translate

This CL registers a new mlir-translate hook, -test-spirv-roundtrip,
for testing SPIR-V serialization and deserialization round-trip.

This CL also moves the existing -serialize-spirv and
-deserialize-spirv hooks to one source file.

PiperOrigin-RevId: 269659528

21 files changed, 21 insertions, 21 deletions

diff --git a/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir b/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
index 34af0fd6e40..a8830498f14 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/access_chain.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @access_chain(%arg0 : !spv.ptr<!spv.array<4x!spv.array<4xf32>>, Function>,
diff --git a/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir b/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
index 9356c7de309..691a67f108a 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/array_stride.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @array_stride(%arg0 : !spv.ptr<!spv.array<4x!spv.array<4xf32 [4]> [128]>, StorageBuffer>,
diff --git a/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir b/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
index 0a699b2ce11..0521cf7a729 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/bin_ops.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @fmul(%arg0 : f32, %arg1 : f32) {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/capability.mlir b/mlir/test/Dialect/SPIRV/Serialization/capability.mlir
index 2de67b0853d..32885b2de21 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/capability.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/capability.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
 } attributes {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/constant.mlir b/mlir/test/Dialect/SPIRV/Serialization/constant.mlir
index 3c34b0c31db..acfa40a06cd 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/constant.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/constant.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK-LABEL: @bool_const
diff --git a/mlir/test/Dialect/SPIRV/Serialization/entry.mlir b/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
index c58134ab48a..93cf953775d 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/entry.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @noop() -> () {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir b/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
index 924318b4f12..6ce06f02ca1 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/entry_interface.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK:       spv.globalVariable @var2 : !spv.ptr<f32, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir b/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
index 278fe1b77c0..ad3ba1eb5da 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/execution_mode.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @foo() -> () {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/extension.mlir b/mlir/test/Dialect/SPIRV/Serialization/extension.mlir
index 9e61eb56e8e..4c9f52b831b 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/extension.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/extension.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
 } attributes {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/function_call.mlir b/mlir/test/Dialect/SPIRV/Serialization/function_call.mlir
index 59023c42f01..530be05bcd3 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/function_call.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/function_call.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   spv.globalVariable @var1 : !spv.ptr<!spv.array<4xf32>, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/glslops.mlir b/mlir/test/Dialect/SPIRV/Serialization/glslops.mlir
index 5dba6cee724..b6c95d52869 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/glslops.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/glslops.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   func @fmul(%arg0 : f32) {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir b/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
index b6c02634c32..3293f9a5456 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/load_store.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 // CHECK:           func {{@.*}}([[ARG1:%.*]]: !spv.ptr<f32, Input>, [[ARG2:%.*]]: !spv.ptr<f32, Output>) {
 // CHECK-NEXT:        [[VALUE:%.*]] = spv.Load "Input" [[ARG1]] : f32
diff --git a/mlir/test/Dialect/SPIRV/Serialization/loop.mlir b/mlir/test/Dialect/SPIRV/Serialization/loop.mlir
index 6d11b4c4a5d..dcfed79e28b 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/loop.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/loop.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // for (int i = 0; i < count; ++i) {}
diff --git a/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir b/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
index 82b7aee69cc..18312f22a76 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/minimal-module.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 // CHECK:      spv.module "Logical" "GLSL450" {
 // CHECK-NEXT:   func @foo() {
diff --git a/mlir/test/Dialect/SPIRV/Serialization/select.mlir b/mlir/test/Dialect/SPIRV/Serialization/select.mlir
index 614d71aa100..f6c69c160ba 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/select.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/select.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   spv.specConstant @condition_scalar = true
diff --git a/mlir/test/Dialect/SPIRV/Serialization/spec_constant.mlir b/mlir/test/Dialect/SPIRV/Serialization/spec_constant.mlir
index 24bf65d3f20..5859d829b27 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/spec_constant.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/spec_constant.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK: spv.specConstant @sc_true = true
diff --git a/mlir/test/Dialect/SPIRV/Serialization/struct.mlir b/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
index 086e5778ba9..b061dfebcc6 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/struct.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK: !spv.ptr<!spv.struct<!spv.array<128 x f32 [4]> [0]>, Input>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/terminator.mlir b/mlir/test/Dialect/SPIRV/Serialization/terminator.mlir
index 679ac087c36..ba30986d614 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/terminator.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/terminator.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK-LABEL: @ret
diff --git a/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir b/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
index 9e5d9e19abb..2fd51dd8802 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variable_reference.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   spv.globalVariable @globalInvocationID built_in("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 990a1a60c7b..537dab2eca4 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variables.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variables.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 // CHECK:      spv.globalVariable @var0 bind(1, 0) : !spv.ptr<f32, Input>
 // CHECK-NEXT: spv.globalVariable @var1 bind(0, 1) : !spv.ptr<f32, Output>
diff --git a/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir b/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
index 64849ffba3d..866262bb133 100644
--- a/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
+++ b/mlir/test/Dialect/SPIRV/Serialization/variables_init.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-translate -serialize-spirv %s | mlir-translate -deserialize-spirv | FileCheck %s
+// RUN: mlir-translate -test-spirv-roundtrip %s | FileCheck %s
 
 spv.module "Logical" "GLSL450" {
   // CHECK:         spv.globalVariable @var1 : !spv.ptr<f32, Input>