[PATCH] D75066: [mlir][spirv] NFC: Move test passes to test/lib

[Lei Zhang via Phabricator via llvm-commits]

antiagainst created this revision.
antiagainst added reviewers: denis13, rriddle.
Herald added subscribers: llvm-commits, bader, Joonsoo, liufengdb, aartbik, lucyrfox, mgester, arpith-jacob, nicolasvasilache, shauheen, burmako, jpienaar, mehdi_amini, mgorny.
Herald added a reviewer: mravishankar.
Herald added a project: LLVM.

Previously C++ test passes for SPIR-V were put under
test/Dialect/SPIRV. Move them to test/lib/Dialect/SPIRV
to create a better structure.

Also fixed one of the test pass to use new
PassRegistration mechanism.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D75066

Files:
  mlir/test/CMakeLists.txt
  mlir/test/Dialect/CMakeLists.txt
  mlir/test/Dialect/SPIRV/CMakeLists.txt
  mlir/test/Dialect/SPIRV/TestAvailability.cpp
  mlir/test/lib/CMakeLists.txt
  mlir/test/lib/Dialect/CMakeLists.txt
  mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
  mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
  mlir/tools/mlir-opt/mlir-opt.cpp


Index: mlir/tools/mlir-opt/mlir-opt.cpp
===================================================================
--- mlir/tools/mlir-opt/mlir-opt.cpp
+++ mlir/tools/mlir-opt/mlir-opt.cpp
@@ -32,6 +32,7 @@
 void registerMemRefBoundCheck();
 void registerPassManagerTestPass();
 void registerPatternsTestPass();
+void registerPrintOpAvailabilityPass();
 void registerSimpleParametricTilingPass();
 void registerSymbolTestPasses();
 void registerTestAffineDataCopyPass();
@@ -84,6 +85,7 @@
   registerMemRefBoundCheck();
   registerPassManagerTestPass();
   registerPatternsTestPass();
+  registerPrintOpAvailabilityPass();
   registerSimpleParametricTilingPass();
   registerSymbolTestPasses();
   registerTestAffineDataCopyPass();
Index: mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
===================================================================
--- mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
+++ mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
@@ -75,9 +75,12 @@
   });
 }
 
-static PassRegistration<PrintOpAvailability>
-    printOpAvailabilityPass("test-spirv-op-availability",
-                            "Test SPIR-V op availability");
+namespace mlir {
+void registerPrintOpAvailabilityPass() {
+  PassRegistration<PrintOpAvailability> printOpAvailabilityPass(
+      "test-spirv-op-availability", "Test SPIR-V op availability");
+}
+} // namespace mlir
 
 //===----------------------------------------------------------------------===//
 // Converting target environment pass
Index: mlir/test/Dialect/SPIRV/CMakeLists.txt
===================================================================
--- /dev/null
+++ mlir/test/Dialect/SPIRV/CMakeLists.txt
@@ -1,14 +0,0 @@
-add_llvm_library(MLIRSPIRVTestPasses
-  TestAvailability.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
-  )
-
-target_link_libraries(MLIRSPIRVTestPasses PRIVATE
-  MLIRIR
-  MLIRPass
-  MLIRSPIRV
-  MLIRSupport
-  )
Index: mlir/test/Dialect/CMakeLists.txt
===================================================================
--- /dev/null
+++ mlir/test/Dialect/CMakeLists.txt
@@ -1 +0,0 @@
-add_subdirectory(SPIRV)
Index: mlir/test/lib/CMakeLists.txt
===================================================================
--- mlir/test/lib/CMakeLists.txt
+++ mlir/test/lib/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(DeclarativeTransforms)
+add_subdirectory(Dialect)
 add_subdirectory(IR)
 add_subdirectory(Pass)
 add_subdirectory(TestDialect)
Index: mlir/test/CMakeLists.txt
===================================================================
--- mlir/test/CMakeLists.txt
+++ mlir/test/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(Dialect)
 add_subdirectory(EDSC)
 add_subdirectory(mlir-cpu-runner)
 add_subdirectory(SDBM)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75066.246255.patch
Type: text/x-patch
Size: 2781 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200224/b43d92b7/attachment.bin>