Initial test for numrical and backend tests for nnpa

Signed-off-by: Haruki Imai <imaihal@jp.ibm.com>
onnx · imaihal · May 30, 2022 · Apr 8, 2022 · Apr 8, 2022 · Apr 11, 2022
commit 2bfeeca826e869c4e182c91e7f52fd7ebac30515
diff --git a/test/backend/CMakeLists.txt b/test/backend/CMakeLists.txt
@@ -86,14 +86,17 @@ if (EXISTS ${LIBSTDCXX_LIB})
   set(LD_PRELOADS ${LIBSTDCXX_LIB}:${LD_PRELOADS})
 endif()
 
+set(ZDNN_LIBRARY_DIR $ENV{ZDNN_LIBRARY_DIR})
+set(ZDNN_LIB "${ZDNN_LIBRARY_DIR}/libzdnn.so")
+
 # ${ONNX_HOME} is the directory where onnx downloads real model files.
 # Model files are saved under ${ONNX_HOME}/models/model_name/model.onnx.
 # C/C++ and JNI tests run in parallel so they must use a different
 # ONNX_HOME to avoid conflicts.
 add_custom_target(check-onnx-backend
   COMMAND
     ONNX_HOME=${CMAKE_CURRENT_BINARY_DIR}/cpp
-    ${BACKEND_TEST_COMMAND} ${BACKEND_TEST_ARGS} ${FILE_GENERATE_DIR}/test.py
+    LD_PRELOAD=${ZDNN_LIB} ${BACKEND_TEST_COMMAND} ${BACKEND_TEST_ARGS} ${FILE_GENERATE_DIR}/test.py
   DEPENDS
     ${FILE_GENERATE_DIR}/test.py
     ${FILE_GENERATE_DIR}/test_config.py

diff --git a/test/backend/common.py b/test/backend/common.py
@@ -114,6 +114,7 @@ def compile_model(model, emit):
     command_list.append(target[emit])
     command_list.append(model_name)
     command_list.append('-O3')
+    command_list.append('--maccel=NNPA')
     command_list.append("-o=" + exec_base)
 
     # Call frontend to process model_name.onnx, bit code will be generated.

diff --git a/test/numerical/CMakeLists.txt b/test/numerical/CMakeLists.txt
@@ -3,6 +3,9 @@
 add_custom_target(numerical)
 set_target_properties(numerical PROPERTIES FOLDER "Tests")
 
+set(ZDNN_LIBRARY_DIR $ENV{ZDNN_LIBRARY_DIR})
+set(ZDNN_LIB "${ZDNN_LIBRARY_DIR}/libzdnn.so")
+
 add_custom_target(check-onnx-numerical
   COMMENT "Running the ONNX-MLIR numerical regression tests"
   COMMAND "${CMAKE_CTEST_COMMAND}" -L numerical --output-on-failure -C $<CONFIG> --force-new-ctest-process
@@ -31,8 +34,11 @@ function(add_numerical_unittest test_name)
 
   # Force -O3 when invoking the numerical tests, so that the models in the test
   # are compiled with -O3. TODO: make that a runtime env variable.
-  add_test(NAME ${test_name} COMMAND ${test_name} -O3 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  add_test(NAME ${test_name} COMMAND ${test_name} -O3 --maccel=NNPA WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   set_tests_properties(${test_name} PROPERTIES LABELS numerical)
+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT TEST_ATOL=0.01)
+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT TEST_RTOL=0.05)
+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT LD_PRELOAD=${ZDNN_LIB})
 
   if (WIN32)
     # On Windows, we need a .def file to specify the export functions from a DLL.
@@ -56,6 +62,7 @@ llvm_update_compile_flags(rapidcheck)
 # The CompilerUtils ExecutionSession are also included in ModelLib,
 # but it did not compile when I removed these two. TODO, figure out why.
 set(TEST_LINK_LIBS rapidcheck ModelLib)
+# set(TEST_LINK_LIBS rapidcheck ModelLib ${ZDNN_LIBRARY_DIR}/libzdnn.so)
 
 add_numerical_unittest(TestConv
   TestConv.cpp