From 91ff5f7aac075b7e2a902567e9d8dee3a1c02df9 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Tue, 26 Apr 2022 01:01:47 +0530 Subject: [PATCH 1/2] Update list of disabled tests in CI (#2624) * Update list of disabled tests in CI * Update Jenkinsfile Skip Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative for now. [ROCm/hip commit: 2ad9b91175e5dd55c05dca46def6348a148efa13] --- projects/hip/.jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/hip/.jenkins/Jenkinsfile b/projects/hip/.jenkins/Jenkinsfile index 44b40c4442..36a6c3945b 100644 --- a/projects/hip/.jenkins/Jenkinsfile +++ b/projects/hip/.jenkins/Jenkinsfile @@ -57,7 +57,7 @@ def hipBuildTest(String backendLabel) { set -x # Check if backend label contains string "amd" or backend host is a server with amd gpu if [[ $backendLabel =~ amd ]]; then - LLVM_PATH=/opt/rocm/llvm ctest + LLVM_PATH=/opt/rocm/llvm ctest -E 'cooperative_streams_least_capacity.tst|cooperative_streams_half_capacity.tst|cooperative_streams_full_capacity.tst|grid_group_data_sharing.tst' else make test fi @@ -97,7 +97,7 @@ def hipBuildTest(String backendLabel) { set -x # Check if backend label contains string "amd" or backend host is a server with amd gpu if [[ $backendLabel =~ amd ]]; then - LLVM_PATH=/opt/rocm/llvm ctest -E 'Unit_hipGraphChildGraphNodeGetGraph_Functional' + LLVM_PATH=/opt/rocm/llvm ctest -E 'Unit_hipGraphChildGraphNodeGetGraph_Functional|Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative' else make test fi From d4921ba9c026c587725cc8a4adb4cebfc9357db6 Mon Sep 17 00:00:00 2001 From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> Date: Tue, 26 Apr 2022 01:45:17 +0530 Subject: [PATCH 2/2] SWDEV-329567 - Fixes timing issu seen on Jenkins rns (#2628) Change-Id: I7b4858033c58cba0c42a8ba8024f9b356e397658 [ROCm/hip commit: 427ba9156a72fe4e27ae2c78cbaa2e8e0b7145b8] --- .../src/runtimeApi/cooperativeGrps/cooperative_streams.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/hip/tests/src/runtimeApi/cooperativeGrps/cooperative_streams.cpp b/projects/hip/tests/src/runtimeApi/cooperativeGrps/cooperative_streams.cpp index cc93e825ba..07a4f7711c 100644 --- a/projects/hip/tests/src/runtimeApi/cooperativeGrps/cooperative_streams.cpp +++ b/projects/hip/tests/src/runtimeApi/cooperativeGrps/cooperative_streams.cpp @@ -86,6 +86,7 @@ static inline void hipCheckAndFail(hipError_t errval, do { hipCheckAndFail((errval), __FILE__, __LINE__); } while (0) __global__ void test_kernel(uint32_t loops, unsigned long long *array, long long totalTicks) { + cooperative_groups::thread_block tb = cooperative_groups::this_thread_block(); unsigned int rank = blockIdx.x * blockDim.x + threadIdx.x; for (int i = 0; i < loops; i++) { @@ -100,6 +101,7 @@ __global__ void test_kernel(uint32_t loops, unsigned long long *array, long long // So just ignore those slipped cycles. last_clock = cur_clock; } while(time_diff < totalTicks); + tb.sync(); array[rank] += clock64(); } }