From 41b05207e7f67f02e50340c15a870453655124ee Mon Sep 17 00:00:00 2001 From: joselope Date: Tue, 21 Apr 2026 17:48:06 +0100 Subject: [PATCH 1/3] Fix invalid alignment value for Windows _aligned_malloc --- test_conformance/SVM/test_unified_svm_mem_cpy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_conformance/SVM/test_unified_svm_mem_cpy.cpp b/test_conformance/SVM/test_unified_svm_mem_cpy.cpp index 6883d745ef..d858e7e004 100644 --- a/test_conformance/SVM/test_unified_svm_mem_cpy.cpp +++ b/test_conformance/SVM/test_unified_svm_mem_cpy.cpp @@ -211,7 +211,7 @@ struct UnifiedSVMOPs : UnifiedSVMBase PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR | CL_SVM_CAPABILITY_HOST_READ_KHR | CL_SVM_CAPABILITY_HOST_WRITE_KHR, - 0, nullptr, nullptr, nullptr, nullptr)); + 1, nullptr, nullptr, nullptr, nullptr)); } bool caps_compatibility_check(cl_uint srcTypeIndex, cl_uint dstTypeIndex) From 1564c6bca82840d21c38d79407a033764ae5631b Mon Sep 17 00:00:00 2001 From: joselope Date: Fri, 1 May 2026 14:52:26 +0100 Subject: [PATCH 2/3] Move alignment check to USVMWrapper --- test_conformance/SVM/test_unified_svm_mem_cpy.cpp | 2 +- test_conformance/SVM/unified_svm_fixture.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test_conformance/SVM/test_unified_svm_mem_cpy.cpp b/test_conformance/SVM/test_unified_svm_mem_cpy.cpp index d858e7e004..6883d745ef 100644 --- a/test_conformance/SVM/test_unified_svm_mem_cpy.cpp +++ b/test_conformance/SVM/test_unified_svm_mem_cpy.cpp @@ -211,7 +211,7 @@ struct UnifiedSVMOPs : UnifiedSVMBase PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR | CL_SVM_CAPABILITY_HOST_READ_KHR | CL_SVM_CAPABILITY_HOST_WRITE_KHR, - 1, nullptr, nullptr, nullptr, nullptr)); + 0, nullptr, nullptr, nullptr, nullptr)); } bool caps_compatibility_check(cl_uint srcTypeIndex, cl_uint dstTypeIndex) diff --git a/test_conformance/SVM/unified_svm_fixture.h b/test_conformance/SVM/unified_svm_fixture.h index 5a62ecf1ff..6f0082f64e 100644 --- a/test_conformance/SVM/unified_svm_fixture.h +++ b/test_conformance/SVM/unified_svm_fixture.h @@ -94,8 +94,9 @@ template class USVMWrapper { else { // For now, just unconditionally align to the device maximum + const auto alignment = deviceMaxAlignment ? deviceMaxAlignment : 1; data = static_cast( - align_malloc(count * sizeof(T), deviceMaxAlignment)); + align_malloc(count * sizeof(T), alignment)); test_assert_error_ret(data != nullptr, "Failed to allocate memory", CL_OUT_OF_RESOURCES); From 1ff0bf71bc0c33a8b52f38d3bc84c017c46eddfc Mon Sep 17 00:00:00 2001 From: joselope Date: Fri, 1 May 2026 14:56:13 +0100 Subject: [PATCH 3/3] Apply clang-format --- test_conformance/SVM/unified_svm_fixture.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test_conformance/SVM/unified_svm_fixture.h b/test_conformance/SVM/unified_svm_fixture.h index 6f0082f64e..fa96fbf05c 100644 --- a/test_conformance/SVM/unified_svm_fixture.h +++ b/test_conformance/SVM/unified_svm_fixture.h @@ -94,9 +94,10 @@ template class USVMWrapper { else { // For now, just unconditionally align to the device maximum - const auto alignment = deviceMaxAlignment ? deviceMaxAlignment : 1; - data = static_cast( - align_malloc(count * sizeof(T), alignment)); + const auto alignment = + deviceMaxAlignment ? deviceMaxAlignment : 1; + data = + static_cast(align_malloc(count * sizeof(T), alignment)); test_assert_error_ret(data != nullptr, "Failed to allocate memory", CL_OUT_OF_RESOURCES);