wip

oneapi-src · Mar 29, 2024 · 7c094a1 · 7c094a1
1 parent 567927d
commit 7c094a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/test/conformance/enqueue/helpers.h b/test/conformance/enqueue/helpers.h
@@ -73,8 +73,8 @@ print2DTestString(const testing::TestParamInfo<typename T::ParamType> &info) {
     const auto platform_device_name =
         uur::GetPlatformAndDeviceName(device_handle);
     std::stringstream test_name;
-    auto src_kind = std::get<1>(std::get<1>(info.param));
-    auto dst_kind = std::get<2>(std::get<1>(info.param));
+    const auto src_kind = std::get<1>(std::get<1>(info.param));
+    const auto dst_kind = std::get<2>(std::get<1>(info.param));
     test_name << platform_device_name << "__pitch__"
               << std::get<0>(std::get<1>(info.param)).pitch << "__width__"
               << std::get<0>(std::get<1>(info.param)).width << "__height__"

diff --git a/test/conformance/usm/urUSMDeviceAlloc.cpp b/test/conformance/usm/urUSMDeviceAlloc.cpp
@@ -18,10 +18,15 @@ inline std::string printUSMDeviceAllocTestString(
 
     std::stringstream ss;
     ss << BoolParam.name << (BoolParam.value ? "Enabled" : "Disabled");
-    ss << "_";
-    ss << std::get<1>(usmDeviceAllocParams);
-    ss << "_";
-    ss << std::get<2>(usmDeviceAllocParams);
+
+    const auto alignment = std::get<1>(usmDeviceAllocParams);
+    const auto size = std::get<2>(usmDeviceAllocParams);
+    if (alignment && size > 0) {
+        ss << "_";
+        ss << std::get<1>(usmDeviceAllocParams);
+        ss << "_";
+        ss << std::get<2>(usmDeviceAllocParams);
+    }
 
     return platform_device_name + "__" + ss.str();
 }