From 52f55148371aaa00397cc00a4d94f06f4552f309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio?= <fabio.mestre@codeplay.com>
Date: Thu, 28 Jul 2022 23:23:45 +0100
Subject: [PATCH] Fix bug with hipMemsetFunctional tests (#2828)

---
 catch/unit/memory/hipMemsetFunctional.cc | 49 ++++++++++++------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/catch/unit/memory/hipMemsetFunctional.cc b/catch/unit/memory/hipMemsetFunctional.cc
index 274074266d..d6f152cec9 100644
--- a/catch/unit/memory/hipMemsetFunctional.cc
+++ b/catch/unit/memory/hipMemsetFunctional.cc
@@ -203,31 +203,30 @@ void partialMemsetTest(T valA, T valB, size_t count, size_t offset, MemsetType m
 }
 
 TEST_CASE("Unit_hipMemsetFunctional_PartialSet_1D") {
-  for (auto widthOffset = 8; widthOffset <= 8; widthOffset *= 2) {
-    SECTION("hipMemset - Partial Set") {
-      partialMemsetTest<char>(0x1, 0x42, 1024, widthOffset, hipMemsetTypeDefault, false);
-    }
-    SECTION("hipMemsetAsync - Partial Set") {
-      partialMemsetTest<char>(0x1, 0x42, 1024, widthOffset, hipMemsetTypeDefault, true);
-    }
-    SECTION("hipMemsetD8 - Partial Set") {
-      partialMemsetTest<int8_t>(0x1, 0xDE, 1024, widthOffset, hipMemsetTypeD8, false);
-    }
-    SECTION("hipMemsetD8Async - Partial Set") {
-      partialMemsetTest<int8_t>(0x1, 0xDE, 1024, widthOffset, hipMemsetTypeD8, true);
-    }
-    SECTION("hipMemsetD16 - Partial Set") {
-      partialMemsetTest<int16_t>(0x1, 0xDEAD, 1024, widthOffset, hipMemsetTypeD16, false);
-    }
-    SECTION("hipMemsetD16Async - Partial Set") {
-      partialMemsetTest<int16_t>(0x1, 0xDEAD, 1024, widthOffset, hipMemsetTypeD16, true);
-    }
-    SECTION("hipMemsetD32 - Partial Set") {
-      partialMemsetTest<uint32_t>(0x1, 0xDEADBEEF, 1024, widthOffset, hipMemsetTypeD32, false);
-    }
-    SECTION("hipMemsetD32Async - Partial Set") {
-      partialMemsetTest<uint32_t>(0x1, 0xDEADBEEF, 1024, widthOffset, hipMemsetTypeD32, true);
-    }
+  auto widthOffset = GENERATE(8, 16, 32, 64, 128, 256, 512, 1024);
+  SECTION("hipMemset - Partial Set") {
+    partialMemsetTest<char>(0x1, 0x42, 1024, widthOffset, hipMemsetTypeDefault, false);
+  }
+  SECTION("hipMemsetAsync - Partial Set") {
+    partialMemsetTest<char>(0x1, 0x42, 1024, widthOffset, hipMemsetTypeDefault, true);
+  }
+  SECTION("hipMemsetD8 - Partial Set") {
+    partialMemsetTest<int8_t>(0x1, 0xDE, 1024, widthOffset, hipMemsetTypeD8, false);
+  }
+  SECTION("hipMemsetD8Async - Partial Set") {
+    partialMemsetTest<int8_t>(0x1, 0xDE, 1024, widthOffset, hipMemsetTypeD8, true);
+  }
+  SECTION("hipMemsetD16 - Partial Set") {
+    partialMemsetTest<int16_t>(0x1, 0xDEAD, 1024, widthOffset, hipMemsetTypeD16, false);
+  }
+  SECTION("hipMemsetD16Async - Partial Set") {
+    partialMemsetTest<int16_t>(0x1, 0xDEAD, 1024, widthOffset, hipMemsetTypeD16, true);
+  }
+  SECTION("hipMemsetD32 - Partial Set") {
+    partialMemsetTest<uint32_t>(0x1, 0xDEADBEEF, 1024, widthOffset, hipMemsetTypeD32, false);
+  }
+  SECTION("hipMemsetD32Async - Partial Set") {
+    partialMemsetTest<uint32_t>(0x1, 0xDEADBEEF, 1024, widthOffset, hipMemsetTypeD32, true);
   }
 }