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

Change-Id: Ifed915d87173b783770a2180320ccb746845dafe


[ROCm/hip commit: 2690a65d45]

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 make test
+                        LLVM_PATH=/opt/rocm/llvm ctest -E 'saxpy.tst|hiprtcGetLoweredName.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 make test
+                        LLVM_PATH=/opt/rocm/llvm ctest -E 'Unit_hiprtc_saxpy'
                     else
                         make test
                     fi

projects/hip/bin/hipvars.pm

@@ -25,8 +25,8 @@ use Getopt::Long;
 use Cwd;
 use File::Basename;
 
-$HIP_BASE_VERSION_MAJOR = "4";
-$HIP_BASE_VERSION_MINOR = "4";
+$HIP_BASE_VERSION_MAJOR = "5";
+$HIP_BASE_VERSION_MINOR = "0";
 $HIP_BASE_VERSION_PATCH = "0";
 
 #---