AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-299127 - Merge 'develop' into 'amd-staging'

Browse Source 
Change-Id: I54aa4822132349d32cf912601adead0812c23230
This commit is contained in:
Jenkins
2022-04-26 19:11:28 -04:00
parent c2d7a805f1 427ba9156a
commit f9764efdfd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.jenkins/Jenkinsfile
Vendored
+2 -2
View File
@@ -57,7 +57,7 @@ def hipBuildTest(String backendLabel) {
set -x set -x
# Check if backend label contains string "amd" or backend host is a server with amd gpu # Check if backend label contains string "amd" or backend host is a server with amd gpu
if [[ $backendLabel =~ amd ]]; then 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 else
make test make test
fi fi
@@ -97,7 +97,7 @@ def hipBuildTest(String backendLabel) {
set -x set -x
# Check if backend label contains string "amd" or backend host is a server with amd gpu # Check if backend label contains string "amd" or backend host is a server with amd gpu
if [[ $backendLabel =~ amd ]]; then 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 else
make test make test
fi fi
tests/src/runtimeApi/cooperativeGrps/cooperative_streams.cpp
+2
View File
@@ -86,6 +86,7 @@ static inline void hipCheckAndFail(hipError_t errval,
do { hipCheckAndFail((errval), __FILE__, __LINE__); } while (0) do { hipCheckAndFail((errval), __FILE__, __LINE__); } while (0)
__global__ void test_kernel(uint32_t loops, unsigned long long *array, long long totalTicks) { __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; unsigned int rank = blockIdx.x * blockDim.x + threadIdx.x;
for (int i = 0; i < loops; i++) { 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. // So just ignore those slipped cycles.
last_clock = cur_clock; last_clock = cur_clock;
} while(time_diff < totalTicks); } while(time_diff < totalTicks);
tb.sync();
array[rank] += clock64(); array[rank] += clock64();
} }
} }