From 802fee3078deba56d06b28dca61cd4e81d9a8538 Mon Sep 17 00:00:00 2001
From: Satyanvesh Dittakavi <Satyanvesh.Dittakavi@amd.com>
Date: Thu, 20 May 2021 06:29:36 -0700
Subject: [PATCH] SWDEV-285521 - SWDEV-284626 - Fix P2P and Caffe2 test
 failures

- waitList was released before the awaitcompletion
causing stream sync after the async copies fail

- Enable the hipPeerToPeer_simple test

Change-Id: I1eeaa7e6320ab38c106902078f034dfec4c3f3ea


[ROCm/hip commit: acafb344c0ea78f53d91e19f1beea1da14453587]
---
 projects/hip/rocclr/hip_memory.cpp                  | 3 ---
 projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/projects/hip/rocclr/hip_memory.cpp b/projects/hip/rocclr/hip_memory.cpp
index b84f54d61b..0d49cb942c 100755
--- a/projects/hip/rocclr/hip_memory.cpp
+++ b/projects/hip/rocclr/hip_memory.cpp
@@ -444,9 +444,6 @@ hipError_t ihipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKin
           depdentMarker->release();
         }
         cmd->release();
-        if (waitList.size() > 0) {
-          waitList[0]->release();
-        }
       }
     }
   }
diff --git a/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp b/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
index 7ba4b4ab62..91bcfaee4b 100755
--- a/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
+++ b/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -24,9 +24,9 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * TEST: %t EXCLUDE_HIP_PLATFORM amd
- * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM amd
- * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM amd
+ * TEST: %t
+ * TEST: %t --memcpyWithPeer
+ * TEST: %t --mirrorPeers
  * HIT_END
  */