Consolidate tests in a single location (#126)

Author: kurapov-peter

CMakeLists.txt

@@ -104,5 +104,4 @@ target_compile_options(graph_compiler PRIVATE -fvisibility=hidden)
 target_link_options(graph_compiler PRIVATE -Wl,--gc-sections)
 target_link_libraries(graph_compiler PRIVATE ${GC_LIB_LINKED_LIBS})
 
-add_subdirectory(unittests)
 add_subdirectory(test)

test/CMakeLists.txt

@@ -10,44 +10,4 @@ add_library(graph_compiler_static STATIC ${GC_LIB_SOURCES})
 target_include_directories(graph_compiler_static PUBLIC ${GC_LIB_INCLUDES})
 
 add_subdirectory(dnnl)
-
-llvm_canonicalize_cmake_booleans(
-        GC_ENABLE_BINDINGS_PYTHON
-)
-configure_lit_site_cfg(
-        ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-        ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
-        MAIN_CONFIG
-        ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
-)
-
-configure_lit_site_cfg(
-        ${CMAKE_CURRENT_SOURCE_DIR}/gc/Unit/lit.site.cfg.py.in
-        ${CMAKE_CURRENT_BINARY_DIR}/gc/Unit/lit.site.cfg.py
-        MAIN_CONFIG
-        ${CMAKE_CURRENT_SOURCE_DIR}/gc/Unit/lit.cfg.py
-)
-
-set(GC_OPT_TEST_DEPENDS
-        FileCheck count not
-        # mlir-gen
-        gc-opt
-        gc-cpu-runner
-        GCUnitTests
-        )
-
-if(GC_ENABLE_BINDINGS_PYTHON)
-        list(APPEND GC_OPT_TEST_DEPENDS GcPythonModules)
-endif()
-
-add_lit_testsuite(gc-check "Running the regression tests"
-        ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS ${GC_OPT_TEST_DEPENDS}
-        )
-
-# Looks that this property is suitable for IDE
-# TODO: Check is this fine for IDE
-set_target_properties(gc-check PROPERTIES FOLDER "Tests")
-
-add_lit_testsuites(GC_OPT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${GC_OPT_TEST_DEPENDS})
-
+add_subdirectory(mlir)

test/README.md

@@ -0,0 +1,23 @@
+# GC Tests
+
+Tests structured the way MLIR part is similar to what one finds in the upstream (`mlir/unittest` for C++ tests and `mlir/test` for lits). These can be invoked by `gc-check` cmake target.
+
+Backend specific tests are separate, gtest-based.
+
+```
+tests
+       \
+        dnnl
+               \
+                 dnnl-specific tests
+        mlir    <-------- file structure kept same as upstream
+              \
+                tests
+                       \
+                         mlir lit tests
+                        lit.cfg.py
+                        lit.site.cfg.py.in
+                unittest
+                        \
+                          mlir unittests
+```

test/gc/Unit/lit.cfg.py

@@ -0,0 +1,2 @@
+add_subdirectory(test)
+add_subdirectory(unittests)

test/gc/Unit/lit.site.cfg.py.in

@@ -0,0 +1,33 @@
+llvm_canonicalize_cmake_booleans(
+        GC_ENABLE_BINDINGS_PYTHON
+)
+
+configure_lit_site_cfg(
+        ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+        ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+        MAIN_CONFIG
+        ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
+)
+
+set(GC_OPT_TEST_DEPENDS
+        FileCheck count not split-file
+        # mlir-gen
+        gc-opt
+        gc-cpu-runner
+        GCUnitTests
+)
+
+if(GC_ENABLE_BINDINGS_PYTHON)
+        list(APPEND GC_OPT_TEST_DEPENDS GcPythonModules)
+endif()
+
+add_lit_testsuite(gc-check "Running the regression tests"
+        ${CMAKE_CURRENT_BINARY_DIR}
+        DEPENDS ${GC_OPT_TEST_DEPENDS}
+)
+
+# Looks that this property is suitable for IDE
+# TODO: Check is this fine for IDE
+set_target_properties(gc-check PROPERTIES FOLDER "Tests")
+
+add_lit_testsuites(GC_OPT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${GC_OPT_TEST_DEPENDS})

test/mlir/CMakeLists.txt

@@ -24,6 +24,7 @@
 
 # test_exec_root: The root path where tests should be run.
 config.test_exec_root = os.path.join(config.gc_obj_root, "test")
+config.gc_tools_dir = os.path.join(config.gc_obj_root, "bin")
 
 config.substitutions.append(("%PATH%", config.environment["PATH"]))
 config.substitutions.append(("%shlibext", config.llvm_shlib_ext))
@@ -39,10 +40,6 @@
 # directories.
 config.excludes = []
 
-# test_exec_root: The root path where tests should be run.
-config.test_exec_root = os.path.join(config.gc_obj_root, "test")
-config.gc_tools_dir = os.path.join(config.gc_obj_root, "bin")
-
 # Tweak the PATH to include the tools dir.
 llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True)
 

test/mlir/test/CMakeLists.txt

@@ -36,4 +36,4 @@ import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@CMAKE_SOURCE_DIR@/test/lit.cfg.py")
+lit_config.load_config(config, "@CMAKE_SOURCE_DIR@/test/mlir/test/lit.cfg.py")

test/gc/Dialect/CPURuntime/cpu-runner/printf.mlir renamed to test/mlir/test/gc/Dialect/CPURuntime/cpu-runner/printf.mlir

@@ -1,8 +1,3 @@
-if (NOT GC_TEST_ENABLE)
-    message(STATUS "The unittests are not enabled.")
-    return()
-endif ()
-
 if(GC_MLIR_CXX_FLAGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GC_MLIR_CXX_FLAGS}")
 endif()