Update test CMakeLists to add new tests automatically and add Jenkins…

… stage for tests (#88) * add docker file and make default target buildable * add Jenkinsfile * remove empty env block * fix package stage * remove render group from docker run * clean up Jenkins file * add cppcheck as dev dependency * update cmake file * Add profiler build stage * add hip_version config file for reduction operator * correct jenkins var name * Build release instead of debug * Update test CMakeLists.txt reorg test dir add test stage * reduce compile threads to prevent compiler crash * add optional debug stage, update second test * remove old test target * fix tests to return proper results and self review * Fix package name and make test run without args * change Dockerfile to ues rocm4.3.1 * remove parallelism from build * Lower paralellism Co-authored-by: Chao Liu <[email protected]>
ROCm · Mar 3, 2022 · 992f71e · 992f71e
1 parent 6d4450e
commit 992f71e
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 100 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -240,9 +240,8 @@ file(GLOB_RECURSE DEVICE_OPS_SOURCE "device_operation/*.cpp")
 
 set(CK_HEADERS ${COMPOSABLE_KERNEL_HEADERS} ${DEVICE_OPS_HEADERS})
 set(CK_SOURCE ${DEVICE_OPS_SOURCE})
-add_library(composable_kernel
-    ${CK_SOURCE}
-)
+add_library(composable_kernel ${CK_SOURCE})
+
 
 target_include_directories(composable_kernel PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/composable_kernel/include>

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG ROCMVERSION=4.5
+ARG ROCMVERSION=4.3.1
 ARG OSDB_BKC_VERSION
 
 RUN set -xe

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,7 +17,7 @@ def cmake_build(Map conf=[:]){
     def compiler = conf.get("compiler","/opt/rocm/bin/hipcc")
     def config_targets = conf.get("config_targets","check")
     def debug_flags = "-g -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=undefined " + conf.get("extradebugflags", "")
-    def build_envs = "CTEST_PARALLEL_LEVEL=4 MIOPEN_CONV_PRECISE_ROCBLAS_TIMING=0 " + conf.get("build_env","")
+    def build_envs = "CTEST_PARALLEL_LEVEL=4 " + conf.get("build_env","")
     def prefixpath = conf.get("prefixpath","/opt/rocm")
     def setup_args = conf.get("setup_args","")
 
@@ -60,7 +60,7 @@ def cmake_build(Map conf=[:]){
             cd build
         """
     def setup_cmd = conf.get("setup_cmd", "${cmake_envs} cmake ${setup_args}   .. ")
-    def build_cmd = conf.get("build_cmd", "${build_envs} dumb-init make -j\$(nproc) ${config_targets}")
+    def build_cmd = conf.get("build_cmd", "${build_envs} dumb-init make  -j\$(( \$(nproc) / 4 )) ${config_targets}")
     def execute_cmd = conf.get("execute_cmd", "")
 
     def cmd = conf.get("cmd", """
@@ -177,15 +177,27 @@ pipeline {
                 //         buildHipClangJobAndReboot(build_cmd: build_cmd, no_reboot:true, prefixpath: '/opt/rocm', build_type: 'debug')
                 //     }
                 // }
-                stage('Build Profiler: gfx908')
+                stage('Build Profiler: Release, gfx908')
                 {
-                    agent { label rocmnode("gfx908")}
+                    agent { label rocmnode("nogpu")}
                     environment{
                         setup_args = """ -D CMAKE_CXX_FLAGS="-DCK_AMD_GPU_GFX908 --amdgpu-target=gfx908 -O3 " -DBUILD_DEV=On """
-                        build_cmd = "make -j\$(nproc) -k ckProfiler"
                     }
                     steps{
-                        buildHipClangJobAndReboot(setup_args:setup_args, build_cmd:build_cmd, no_reboot:true, build_type: 'Release')
+                        buildHipClangJobAndReboot(setup_args:setup_args, config_targets: "ckProfiler", no_reboot:true, build_type: 'Release')
+                    }
+                }
+                stage('Build Profiler: Debug, gfx908')
+                {
+                    agent { label rocmnode("nogpu")}
+                    environment{
+                        setup_args = """ -D CMAKE_CXX_FLAGS="-DCK_AMD_GPU_GFX908 --amdgpu-target=gfx908 -O3 " -DBUILD_DEV=On """
+                    }
+                    steps{
+                        // until we stabilize debug build due to compiler crashes
+                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                            buildHipClangJobAndReboot(setup_args:setup_args, config_targets: "ckProfiler", no_reboot:true, build_type: 'Debug')
+                        }
                     }
                 }
                 stage('Clang Format') {
@@ -207,6 +219,24 @@ pipeline {
                 }
             }
         }
+        stage("Tests")
+        {
+            parallel
+            {
+                stage("Run Tests: gfx908")
+                {
+                    agent{ label rocmnode("gfx908")}
+                    environment{
+                        setup_args = """ -D CMAKE_CXX_FLAGS="-DCK_AMD_GPU_GFX908 --amdgpu-target=gfx908 -O3 " -DBUILD_DEV=On """
+                    }
+                    steps{
+                        buildHipClangJobAndReboot(setup_args:setup_args, config_targets: "check", no_reboot:true, build_type: 'Release')
+                    }
+
+                }
+
+            }
+        }
         // enable after the cmake file supports packaging
         // stage("Packages") {
         //     when {
@@ -222,4 +252,4 @@ pipeline {
         //     }
         // }
     }
-}
+}
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(host_tensor)
+add_subdirectory(host_tensor)
diff --git a/rbuild.ini b/rbuild.ini
@@ -5,4 +5,4 @@ ignore = pcre
 deps =
     -f dev-requirements.txt
 define =
-    BUILD_DEV=On
+    BUILD_DEV=On
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
-half,https://github.com/pfultz2/half/archive/1.12.0.tar.gz -X header -H sha256:0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969 --build
 danmar/cppcheck@dd05839a7e63ef04afd34711cb3e1e0ef742882f
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,40 +13,24 @@ include_directories(BEFORE
     ${PROJECT_SOURCE_DIR}/test/include
 )
 
-# test_magic_number_division
-set(MAGIC_NUMBER_DIVISISON_SOURCE magic_number_division/main.cpp)
-add_executable(test_magic_number_division ${MAGIC_NUMBER_DIVISISON_SOURCE})
-target_link_libraries(test_magic_number_division PRIVATE host_tensor)
-
-
-set(CONV2D_FWD_SOURCE conv2d_fwd/main.cpp)
-
-add_executable(test_conv2d_fwd ${CONV2D_FWD_SOURCE})
-target_link_libraries(test_conv2d_fwd PRIVATE host_tensor)
-target_link_libraries(test_conv2d_fwd PRIVATE device_conv2d_fwd_instance)
-
-# test_split_k
-set(SPLIT_K_SOURCE split_k/main.cpp)
-add_executable(test_split_k ${SPLIT_K_SOURCE})
-target_link_libraries(test_split_k PRIVATE host_tensor)
-target_link_libraries(test_split_k PRIVATE device_gemm_instance)
-
-# test_conv_util
-set(CONV_UTIL_SOURCE conv_util/main.cpp)
-add_executable(test_conv_util ${CONV_UTIL_SOURCE})
-target_link_libraries(test_conv_util PRIVATE host_tensor)
-
-# test_reference_conv_fwd
-set(REFERENCE_CONV_FWD_SOURCE reference_conv_fwd/main.cpp)
-add_executable(test_reference_conv_fwd ${REFERENCE_CONV_FWD_SOURCE})
-target_link_libraries(test_reference_conv_fwd PRIVATE host_tensor)
-
-# test_convnd_fwd_xdl
-set(CONVND_FWD_XDL_SOURCE convnd_fwd_xdl/main.cpp)
-add_executable(test_convnd_fwd_xdl ${CONVND_FWD_XDL_SOURCE})
-target_link_libraries(test_convnd_fwd_xdl PRIVATE host_tensor)
-
-# test space_filling_curve_
-set(SPACE_FILLING_CURVE_SOURCE space_filling_curve/space_filling_curve.cpp)
-add_executable(space_filling_curve ${SPACE_FILLING_CURVE_SOURCE})
-target_link_libraries(space_filling_curve PRIVATE host_tensor)
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR})
+add_custom_target(tests)
+
+function(add_test_executeable TEST_NAME)
+    add_executable(${TEST_NAME} ${ARGN})
+    target_link_libraries(${TEST_NAME} PRIVATE host_tensor)
+    target_link_libraries(${TEST_NAME} PRIVATE device_gemm_instance)
+    target_link_libraries(${TEST_NAME} PRIVATE device_conv2d_fwd_instance)
+    add_test(NAME ${TEST_NAME} COMMAND $<TARGET_FILE:${TEST_NAME}> )
+    add_dependencies(tests ${TEST_NAME})
+    add_dependencies(check ${TEST_NAME})
+endfunction(add_test_executeable TEST_NAME)
+
+
+file(GLOB TESTS *.cpp)
+
+foreach(TEST ${TESTS})
+    get_filename_component(BASE_NAME ${TEST} NAME_WE)
+    message("adding test ${BASE_NAME}")
+    add_test_executeable(test_${BASE_NAME} ${TEST})
+endforeach(TEST ${TESTS})
diff --git a/test/conv2d_fwd/main.cpp → test/conv2d_fwd.cpp b/test/conv2d_fwd/main.cpp → test/conv2d_fwd.cpp
@@ -75,8 +75,12 @@ int main(int argc, char* argv[])
     ck::index_t in_left_pad_w   = 1;
     ck::index_t in_right_pad_h  = 1;
     ck::index_t in_right_pad_w  = 1;
-
-    if(argc == 3)
+    if(argc == 1)
+    {
+        init_method = 1;
+        data_type = 0;
+    }
+    else if(argc == 3)
     {
         data_type   = std::stoi(argv[1]);
         init_method = std::stoi(argv[2]);
@@ -275,33 +279,31 @@ int main(int argc, char* argv[])
         if(success)
         {
             std::cout << "test conv2d fwd : Pass" << std::endl;
+            return 0;
         }
         else
         {
             std::cout << "test conv2d fwd: Fail " << std::endl;
+            return -1;
         }
     };
-
+    int res = -1;
     if(data_type == 0)
     {
-        Run(float(), float(), float());
+        res = Run(float(), float(), float());
     }
     else if(data_type == 1)
     {
-        Run(ck::half_t(), ck::half_t(), ck::half_t());
+        res = Run(ck::half_t(), ck::half_t(), ck::half_t());
     }
     else if(data_type == 2)
     {
-        Run(ushort(), ushort(), ushort());
+        res = Run(ushort(), ushort(), ushort());
     }
     else if(data_type == 3)
     {
-        Run(int8_t(), int8_t(), int8_t());
-    }
-    else
-    {
-        return 1;
+        res = Run(int8_t(), int8_t(), int8_t());
     }
 
-    return 0;
+    return res;
 }
diff --git a/test/magic_number_division/main.cpp → test/magic_number_division.cpp b/test/magic_number_division/main.cpp → test/magic_number_division.cpp
@@ -161,11 +161,12 @@ int main(int, char*[])
     if(pass)
     {
         std::cout << "test magic number division: Pass" << std::endl;
+       return 0;
     }
     else
     {
         std::cout << "test magic number division: Fail" << std::endl;
+       return -1;
     }
 
-    return 1;
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		add_subdirectory(host_tensor)
		add_subdirectory(host_tensor)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		half,https://github.com/pfultz2/half/archive/1.12.0.tar.gz -X header -H sha256:0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969 --build
		danmar/cppcheck@dd05839a7e63ef04afd34711cb3e1e0ef742882f