Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 28b17d3dbd.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9


[ROCm/hip commit: ad2d55c144]

projects/hip/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp

@@ -77,6 +77,9 @@ int main() {
         HIPCHECK(hipFree(Z_d));
       } else {
         std::cout<<"Machine does not seem to have P2P Capabilities, Empty Pass"<<std::endl;
+        if (hip_skip_tests_enabled()) {
+          return hip_skip_retcode();
+        }
       }
     }
     passed();