Split test-specific passes out of mlir-opt

Instead put their impl in test/lib and link them into mlir-test-opt

PiperOrigin-RevId: 254837439

diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
index eb1846d..c3f3420 100644 (file)
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -16,8 +16,6 @@ add_llvm_library(MLIRTransforms
   PipelineDataTransfer.cpp
   SimplifyAffineStructures.cpp
   StripDebugInfo.cpp
-  TestConstantFold.cpp
-  TestLoopFusion.cpp
   Utils/FoldUtils.cpp
   Utils/GreedyPatternRewriteDriver.cpp
   Utils/LoopFusionUtils.cpp
@@ -26,7 +24,6 @@ add_llvm_library(MLIRTransforms
   Utils/Utils.cpp
   Vectorization
   Vectorize.cpp
-  Vectorization/VectorizerTestPass.cpp
   ViewFunctionGraph.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
index f377ce4..a57505d 100644 (file)
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(EDSC)
 add_subdirectory(mlir-cpu-runner)
 add_subdirectory(SDBM)
-add_subdirectory(TestDialect)
+add_subdirectory(lib)
 
 llvm_canonicalize_cmake_booleans(
   LLVM_BUILD_EXAMPLES
@@ -32,7 +32,6 @@ set(MLIR_TEST_DEPENDS
   mlir-opt
   mlir-sdbm-api-test
   mlir-tblgen
-  mlir-test-opt
   mlir-translate
   cblas
   cblas_interface

diff --git a/mlir/test/IR/attribute.mlir b/mlir/test/IR/attribute.mlir
index 4963e8f..09c5382 100644 (file)
--- a/mlir/test/IR/attribute.mlir
+++ b/mlir/test/IR/attribute.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Test TypeArrayAttr

diff --git a/mlir/test/IR/operand.mlir b/mlir/test/IR/operand.mlir
index b000277..3ca8832 100644 (file)
--- a/mlir/test/IR/operand.mlir
+++ b/mlir/test/IR/operand.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Test mixed normal and variadic operands

diff --git a/mlir/test/IR/region.mlir b/mlir/test/IR/region.mlir
index 7516a37..27e19d6 100644 (file)
--- a/mlir/test/IR/region.mlir
+++ b/mlir/test/IR/region.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Test the number of regions

diff --git a/mlir/test/IR/result.mlir b/mlir/test/IR/result.mlir
index 34eccfb..cef89b2 100644 (file)
--- a/mlir/test/IR/result.mlir
+++ b/mlir/test/IR/result.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Test mixed normal and variadic results

diff --git a/mlir/test/IR/traits.mlir b/mlir/test/IR/traits.mlir
index 40c3709..281e3c0 100644 (file)
--- a/mlir/test/IR/traits.mlir
+++ b/mlir/test/IR/traits.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 // CHECK: succeededSameOperandAndResultElementType
 func @succeededSameOperandAndResultElementType(%t10x10 : tensor<10x10xf32>, %t1: tensor<1xf32>, %v1: vector<1xf32>, %t1i: tensor<1xi32>) {

diff --git a/mlir/test/Transforms/test-legalizer.mlir b/mlir/test/Transforms/test-legalizer.mlir
index 449fba9..1661175 100644 (file)
--- a/mlir/test/Transforms/test-legalizer.mlir
+++ b/mlir/test/Transforms/test-legalizer.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt -test-legalize-patterns -split-input-file -verify-diagnostics %s | FileCheck %s --dump-input=fail
+// RUN: mlir-opt -test-legalize-patterns -split-input-file -verify-diagnostics %s | FileCheck %s --dump-input=fail
 
 // CHECK-LABEL: verifyDirectPattern
 func @verifyDirectPattern() -> i32 {

diff --git a/mlir/test/lib/CMakeLists.txt b/mlir/test/lib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..860376b
--- /dev/null
+++ b/mlir/test/lib/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(TestDialect)
+add_subdirectory(Transforms)

diff --git a/mlir/test/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
similarity index 61%
rename from mlir/test/TestDialect/CMakeLists.txt
rename to mlir/test/lib/TestDialect/CMakeLists.txt
index dfd9686..163af2f 100644 (file)
--- a/mlir/test/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -15,25 +15,10 @@ add_llvm_library(MLIRTestDialect
 )
 add_dependencies(MLIRTestDialect
   MLIRTestOpsIncGen
+  MLIRTypeUtilities
   LLVMSupport
 )
 target_link_libraries(MLIRTestDialect
-  LLVMSupport
-)
-
-add_llvm_executable(mlir-test-opt
-  ${MLIR_MAIN_SRC_DIR}/../tools/mlir-opt/mlir-opt.cpp
-  TestDialect.cpp
-  TestPatterns.cpp
-)
-llvm_update_compile_flags(mlir-test-opt)
-whole_archive_link(mlir-test-opt
-  MLIRStandardOps
-)
-target_link_libraries(mlir-test-opt
-  PRIVATE
-  MLIRMlirOptLib
-  MLIROptMain
   MLIRTypeUtilities
   LLVMSupport
 )

diff --git a/mlir/test/TestDialect/TestDialect.cpp b/mlir/test/lib/TestDialect/TestDialect.cpp
similarity index 100%
rename from mlir/test/TestDialect/TestDialect.cpp
rename to mlir/test/lib/TestDialect/TestDialect.cpp

diff --git a/mlir/test/TestDialect/TestDialect.h b/mlir/test/lib/TestDialect/TestDialect.h
similarity index 100%
rename from mlir/test/TestDialect/TestDialect.h
rename to mlir/test/lib/TestDialect/TestDialect.h

diff --git a/mlir/test/TestDialect/TestOps.td b/mlir/test/lib/TestDialect/TestOps.td
similarity index 100%
rename from mlir/test/TestDialect/TestOps.td
rename to mlir/test/lib/TestDialect/TestOps.td

diff --git a/mlir/test/TestDialect/TestPatterns.cpp b/mlir/test/lib/TestDialect/TestPatterns.cpp
similarity index 100%
rename from mlir/test/TestDialect/TestPatterns.cpp
rename to mlir/test/lib/TestDialect/TestPatterns.cpp

diff --git a/mlir/test/TestDialect/lit.local.cfg b/mlir/test/lib/TestDialect/lit.local.cfg
similarity index 100%
rename from mlir/test/TestDialect/lit.local.cfg
rename to mlir/test/lib/TestDialect/lit.local.cfg

diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cb7048b
--- /dev/null
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_llvm_library(MLIRTestTransforms
+  TestConstantFold.cpp
+  TestLoopFusion.cpp
+  TestVectorizationUtils.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
+  )
+add_dependencies(MLIRTestTransforms MLIRStandardOpsIncGen)
+target_link_libraries(MLIRTestTransforms
+  MLIRAffineOps
+  MLIRAnalysis
+  MLIRPass
+  MLIRVectorOps
+  )

diff --git a/mlir/lib/Transforms/TestConstantFold.cpp b/mlir/test/lib/Transforms/TestConstantFold.cpp
similarity index 100%
rename from mlir/lib/Transforms/TestConstantFold.cpp
rename to mlir/test/lib/Transforms/TestConstantFold.cpp

diff --git a/mlir/lib/Transforms/TestLoopFusion.cpp b/mlir/test/lib/Transforms/TestLoopFusion.cpp
similarity index 100%
rename from mlir/lib/Transforms/TestLoopFusion.cpp
rename to mlir/test/lib/Transforms/TestLoopFusion.cpp

diff --git a/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp b/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
similarity index 100%
rename from mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp
rename to mlir/test/lib/Transforms/TestVectorizationUtils.cpp

diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py
index d978e9d..3e6dfc3 100644 (file)
--- a/mlir/test/lit.cfg.py
+++ b/mlir/test/lit.cfg.py
@@ -55,7 +55,6 @@ tool_dirs = [config.mlir_tools_dir, config.llvm_tools_dir]
 tools = [
     'mlir-opt',
     'mlir-tblgen',
-    'mlir-test-opt',
     'mlir-translate',
     'mlir-edsc-builder-api-test',
 ]

diff --git a/mlir/test/mlir-tblgen/pattern.mlir b/mlir/test/mlir-tblgen/pattern.mlir
index 22a9129..3ed678c 100644 (file)
--- a/mlir/test/mlir-tblgen/pattern.mlir
+++ b/mlir/test/mlir-tblgen/pattern.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt -test-patterns -mlir-print-debuginfo %s | FileCheck %s
+// RUN: mlir-opt -test-patterns -mlir-print-debuginfo %s | FileCheck %s
 
 // CHECK-LABEL: verifyConstantAttr
 func @verifyConstantAttr(%arg0 : i32) -> i32 {

diff --git a/mlir/test/mlir-tblgen/types.mlir b/mlir/test/mlir-tblgen/types.mlir
index 044f822..f498ba3 100644 (file)
--- a/mlir/test/mlir-tblgen/types.mlir
+++ b/mlir/test/mlir-tblgen/types.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt %s -split-input-file -verify-diagnostics | FileCheck %s
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 // -----
 

diff --git a/mlir/test/mlir-tblgen/verify-unused-value.mlir b/mlir/test/mlir-tblgen/verify-unused-value.mlir
index 36ce869..f5f524d 100644 (file)
--- a/mlir/test/mlir-tblgen/verify-unused-value.mlir
+++ b/mlir/test/mlir-tblgen/verify-unused-value.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-test-opt -test-patterns %s | FileCheck %s
+// RUN: mlir-opt -test-patterns %s | FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Test 'verifyUnusedValue'

diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
index 737c26c..f49cbc3 100644 (file)
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -35,6 +35,8 @@ set(LIBS
   MLIRStandardOps
   MLIRStandardToLLVM
   MLIRTransforms
+  MLIRTestDialect
+  MLIRTestTransforms
   MLIRSupport
   MLIRVectorOps
 )