From 4942f3cae570ab9a4ff484735ca89b73303122c6 Mon Sep 17 00:00:00 2001
From: Julia Jiang <56359287+jujiang-del@users.noreply.github.com>
Date: Thu, 23 Oct 2025 17:09:46 -0400
Subject: [PATCH] SWDEV-555548 - Fix Unit_hipMemPoolMaxAlloc failure on Windows
 (#1486)

---
 .../catch/unit/memory/hipMemPoolMaxAlloc.cc   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/projects/hip-tests/catch/unit/memory/hipMemPoolMaxAlloc.cc b/projects/hip-tests/catch/unit/memory/hipMemPoolMaxAlloc.cc
index d374483ee9..680e057884 100644
--- a/projects/hip-tests/catch/unit/memory/hipMemPoolMaxAlloc.cc
+++ b/projects/hip-tests/catch/unit/memory/hipMemPoolMaxAlloc.cc
@@ -449,6 +449,8 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f07b8000000, 1369910892, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f07b8000000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f0714800000, 2739821784, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f0de7c00000, 68925576, stream));
@@ -949,6 +951,14 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f05bca00000, 137851152, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0630400000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0c38400000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0cdb600000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f05de600000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f05b8600000, 68925576, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f05b8600000, stream));
@@ -963,6 +973,10 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0581c00000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f05c5000000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
+   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0d9a000000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f054f600000, 913273928, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f05bca00000, stream));
@@ -1009,9 +1023,7 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0c38a00000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
-  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0c38400000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
-  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0682200000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f068e800000, 206776728, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
@@ -1037,8 +1049,12 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f0597200000, 206776728, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0c38a00000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f05a3a00000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0bc9400000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0597200000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f05a3a00000, 206776728, stream));
@@ -1065,6 +1081,8 @@ hipError_t Test() {
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0529e00000, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
+  HIP_CHECK_LT(hipFreeAsync(ptr_0x7f0c39400000, stream));
+  HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f0687e00000, 68925576, stream));
   HIP_CHECK_LT(hipStreamSynchronize(stream));
   HIP_CHECK_LT(hipMallocAsync(&ptr_0x7f0683a00000, 68925576, stream));