From 81c12ab01d1e92ec6165360f1888164de94e2583 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 23 Nov 2022 12:34:02 +0530 Subject: [PATCH 1/3] Better handle failures in CI infra (#3098) * Update Jenkinsfile * Update tests/catch/unit/CMakeLists.txt --- .jenkins/Jenkinsfile | 10 +++++----- tests/catch/unit/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index cfa988f0f3..3bd57c6d23 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -59,9 +59,9 @@ def hipBuildTest(String backendLabel) { # Check if backend label contains string "amd" or backend host is a server with amd gpu if [[ $backendLabel =~ amd ]]; then sleep 120 - LLVM_PATH=/opt/rocm/llvm ctest --overwrite BuildDirectory=. --output-junit hiptest_output.xml -E 'cooperative_streams_least_capacity.tst|cooperative_streams_half_capacity.tst|cooperative_streams_full_capacity.tst|grid_group_data_sharing.tst|hipIpcMemAccessTest.tst|p2p_copy_coherency.tst' + LLVM_PATH=/opt/rocm/llvm ctest --overwrite BuildDirectory=. --output-junit hiptest_output_hit_amd.xml -E 'cooperative_streams_least_capacity.tst|cooperative_streams_half_capacity.tst|cooperative_streams_full_capacity.tst|grid_group_data_sharing.tst|hipIpcMemAccessTest.tst|p2p_copy_coherency.tst' else - ctest --overwrite BuildDirectory=. --output-junit hiptest_output.xml + ctest --overwrite BuildDirectory=. --output-junit hiptest_output_hit_nvidia.xml fi """ } @@ -77,7 +77,7 @@ def hipBuildTest(String backendLabel) { # Check if backend label contains string "amd" or backend host is a server with amd gpu if [[ $backendLabel =~ amd ]]; then export HT_CONFIG_FILE="$HIP_DIR/tests/catch/hipTestMain/config/config_amd_linux.json" - cmake -DHIP_CATCH_TEST=1 -DHIP_PATH=\$PWD/install -DHIP_COMMON_DIR=$HIP_DIR -DAMD_OPENCL_PATH=\$OPENCL_DIR -DROCCLR_PATH=\$ROCclr_DIR -DCMAKE_PREFIX_PATH="/opt/rocm/" -DCMAKE_INSTALL_PREFIX=\$PWD/install .. + cmake -DHIP_CATCH_TEST=1 -DCI_DISABLE_TESTBUILD=1 -DHIP_PATH=\$PWD/install -DHIP_COMMON_DIR=$HIP_DIR -DAMD_OPENCL_PATH=\$OPENCL_DIR -DROCCLR_PATH=\$ROCclr_DIR -DCMAKE_PREFIX_PATH="/opt/rocm/" -DCMAKE_INSTALL_PREFIX=\$PWD/install .. else export HIP_PLATFORM=nvidia export HIP_COMPILER=nvcc @@ -102,9 +102,9 @@ def hipBuildTest(String backendLabel) { if [[ $backendLabel =~ amd ]]; then sleep 120 export HT_CONFIG_FILE="$HIP_DIR/tests/catch/hipTestMain/config/config_amd_linux.json" - LLVM_PATH=/opt/rocm/llvm ctest --overwrite BuildDirectory=. --output-junit hiptest_output.xml -E 'Unit_hipGraphChildGraphNodeGetGraph_Functional|Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative|Unit_hipPtrGetAttribute_Simple|Unit_hipStreamPerThread_DeviceReset_2' + LLVM_PATH=/opt/rocm/llvm ctest --overwrite BuildDirectory=. --output-junit hiptest_output_catch_amd.xml -E 'Unit_hipGraphChildGraphNodeGetGraph_Functional|Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative|Unit_hipPtrGetAttribute_Simple|Unit_hipStreamPerThread_DeviceReset_2' else - ctest --overwrite BuildDirectory=. --output-junit hiptest_output.xml + ctest --overwrite BuildDirectory=. --output-junit hiptest_output_catch_nvidia.xml fi """ } diff --git a/tests/catch/unit/CMakeLists.txt b/tests/catch/unit/CMakeLists.txt index d856006312..c57ba1c25a 100644 --- a/tests/catch/unit/CMakeLists.txt +++ b/tests/catch/unit/CMakeLists.txt @@ -34,6 +34,6 @@ add_subdirectory(multiThread) add_subdirectory(compiler) add_subdirectory(errorHandling) add_subdirectory(cooperativeGrps) -if(HIP_PLATFORM STREQUAL "amd") +if(HIP_PLATFORM STREQUAL "amd" AND NOT DEFINED CI_DISABLE_TESTBUILD) add_subdirectory(clock) endif() From 385a1140253786331b0b43a88e8f92f0db65de68 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 23 Nov 2022 14:13:59 +0530 Subject: [PATCH 2/3] Disable wall clock test temporarily --- tests/catch/unit/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/catch/unit/CMakeLists.txt b/tests/catch/unit/CMakeLists.txt index c57ba1c25a..d37cea450b 100644 --- a/tests/catch/unit/CMakeLists.txt +++ b/tests/catch/unit/CMakeLists.txt @@ -34,6 +34,6 @@ add_subdirectory(multiThread) add_subdirectory(compiler) add_subdirectory(errorHandling) add_subdirectory(cooperativeGrps) -if(HIP_PLATFORM STREQUAL "amd" AND NOT DEFINED CI_DISABLE_TESTBUILD) -add_subdirectory(clock) -endif() +#if(HIP_PLATFORM STREQUAL "amd") +#add_subdirectory(clock) +#endif() From d3e7e5a23b8a820be71dad8ffefb807d2208b81b Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 23 Nov 2022 15:06:16 +0530 Subject: [PATCH 3/3] Disable Unit_hipMemset_Negative_OutOfBoundsPtr --- tests/catch/hipTestMain/config/config_amd_linux_common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/catch/hipTestMain/config/config_amd_linux_common.json b/tests/catch/hipTestMain/config/config_amd_linux_common.json index e0fd000420..ccb77bc2a4 100644 --- a/tests/catch/hipTestMain/config/config_amd_linux_common.json +++ b/tests/catch/hipTestMain/config/config_amd_linux_common.json @@ -11,6 +11,7 @@ "Unit_hipIpcCloseMemHandle_Negative_Close_In_Originating_Process", "Unit_hipIpcOpenMemHandle_Negative_Open_In_Creating_Process", "Unit_hipDeviceGetPCIBusId_Negative_PartialFill", - "Unit_hipInit_Negative" + "Unit_hipInit_Negative", + "Unit_hipMemset_Negative_OutOfBoundsPtr" ] }