Make mlir-opt --show-dialects option print on a single line

Differential Revision: https://reviews.llvm.org/D145398

diff --git a/mlir/examples/standalone/test/Standalone/standalone-opt.mlir b/mlir/examples/standalone/test/Standalone/standalone-opt.mlir
index 1a78a9d..101f901 100644 (file)
--- a/mlir/examples/standalone/test/Standalone/standalone-opt.mlir
+++ b/mlir/examples/standalone/test/Standalone/standalone-opt.mlir
@@ -1,3 +1,3 @@
 // RUN: standalone-opt --show-dialects | FileCheck %s
 // CHECK: Available Dialects:
-// CHECK: standalone
+// CHECK-SAME: standalone

diff --git a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
index fb4fbee..d1c5637 100644 (file)
--- a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
+++ b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
@@ -238,8 +238,8 @@ LogicalResult mlir::MlirOptMain(llvm::raw_ostream &outputStream,
                                 DialectRegistry &registry,
                                 const MlirOptMainConfig &config) {
   if (config.shouldShowDialects()) {
-    llvm::outs() << "Available Dialects:\n";
-    interleave(registry.getDialectNames(), llvm::outs(), "\n");
+    llvm::outs() << "Available Dialects: ";
+    interleave(registry.getDialectNames(), llvm::outs(), ",");
     llvm::outs() << "\n";
   }
 

diff --git a/mlir/test/mlir-opt/commandline.mlir b/mlir/test/mlir-opt/commandline.mlir
index b953155..7076649 100644 (file)
--- a/mlir/test/mlir-opt/commandline.mlir
+++ b/mlir/test/mlir-opt/commandline.mlir
@@ -1,45 +1,45 @@
 // RUN: echo "" | mlir-opt --show-dialects | FileCheck %s
 // CHECK: Available Dialects:
-// CHECK-NEXT: acc
-// CHECK-NEXT: affine
-// CHECK-NEXT: amdgpu
-// CHECK-NEXT: amx
-// CHECK-NEXT: arith
-// CHECK-NEXT: arm_neon
-// CHECK-NEXT: arm_sve
-// CHECK-NEXT: async
-// CHECK-NEXT: bufferization
-// CHECK-NEXT: builtin
-// CHECK-NEXT: cf
-// CHECK-NEXT: complex
-// CHECK-NEXT: dlti
-// CHECK-NEXT: emitc
-// CHECK-NEXT: func
-// CHECK-NEXT: gpu
-// CHECK-NEXT: index
-// CHECK-NEXT: linalg
-// CHECK-NEXT: llvm
-// CHECK-NEXT: math
-// CHECK-NEXT: memref
-// CHECK-NEXT: ml_program
-// CHECK-NEXT: nvgpu
-// CHECK-NEXT: nvvm
-// CHECK-NEXT: omp
-// CHECK-NEXT: pdl
-// CHECK-NEXT: pdl_interp
-// CHECK-NEXT: quant
-// CHECK-NEXT: rocdl
-// CHECK-NEXT: scf
-// CHECK-NEXT: shape
-// CHECK-NEXT: sparse_tensor
-// CHECK-NEXT: spirv
-// CHECK-NEXT: tensor
-// CHECK-NEXT: test
-// CHECK-NEXT: test_dyn
-// CHECK-NEXT: tosa
-// CHECK-NEXT: transform
-// CHECK-NEXT: vector
-// CHECK-NEXT: x86vector
+// CHECK-SAME: acc
+// CHECK-SAME: affine
+// CHECK-SAME: amdgpu
+// CHECK-SAME: amx
+// CHECK-SAME: arith
+// CHECK-SAME: arm_neon
+// CHECK-SAME: arm_sve
+// CHECK-SAME: async
+// CHECK-SAME: bufferization
+// CHECK-SAME: builtin
+// CHECK-SAME: cf
+// CHECK-SAME: complex
+// CHECK-SAME: dlti
+// CHECK-SAME: emitc
+// CHECK-SAME: func
+// CHECK-SAME: gpu
+// CHECK-SAME: index
+// CHECK-SAME: linalg
+// CHECK-SAME: llvm
+// CHECK-SAME: math
+// CHECK-SAME: memref
+// CHECK-SAME: ml_program
+// CHECK-SAME: nvgpu
+// CHECK-SAME: nvvm
+// CHECK-SAME: omp
+// CHECK-SAME: pdl
+// CHECK-SAME: pdl_interp
+// CHECK-SAME: quant
+// CHECK-SAME: rocdl
+// CHECK-SAME: scf
+// CHECK-SAME: shape
+// CHECK-SAME: sparse_tensor
+// CHECK-SAME: spirv
+// CHECK-SAME: tensor
+// CHECK-SAME: test
+// CHECK-SAME: test_dyn
+// CHECK-SAME: tosa
+// CHECK-SAME: transform
+// CHECK-SAME: vector
+// CHECK-SAME: x86vector
 
 // RUN: mlir-opt --help-hidden | FileCheck %s -check-prefix=CHECK-HELP
 // CHECK-HELP: -p - Alias for --pass-pipeline