diff --git a/catch/include/memcpy3d_tests_common.hh b/catch/include/memcpy3d_tests_common.hh index 845e43779c..70974c1397 100644 --- a/catch/include/memcpy3d_tests_common.hh +++ b/catch/include/memcpy3d_tests_common.hh @@ -426,10 +426,9 @@ template void Memcpy3DHtoDSyncBehavior(F memcpy_func, const bool should_sync, const hipStream_t kernel_stream = nullptr) { using LA = LinearAllocs; - const auto host_alloc_type = GENERATE(LA::malloc, LA::hipHostMalloc); LinearAllocGuard3D device_alloc(make_hipExtent(32 * sizeof(int), 32, 8)); LinearAllocGuard host_alloc( - host_alloc_type, device_alloc.width() * device_alloc.height() * device_alloc.depth()); + LA::hipHostMalloc, device_alloc.width() * device_alloc.height() * device_alloc.depth()); MemcpySyncBehaviorCheck( std::bind(memcpy_func, device_alloc.pitched_ptr(), make_hipPos(0, 0, 0), make_hipPitchedPtr(host_alloc.ptr(), device_alloc.width(), device_alloc.width(), @@ -450,7 +449,7 @@ void Memcpy3DDtoHPageableSyncBehavior(F memcpy_func, const bool should_sync, device_alloc.height()), make_hipPos(0, 0, 0), device_alloc.pitched_ptr(), make_hipPos(0, 0, 0), device_alloc.extent(), hipMemcpyDeviceToHost, kernel_stream), - should_sync, kernel_stream); + should_sync, kernel_stream); } template diff --git a/catch/unit/memory/memcpy2d_tests_common.hh b/catch/unit/memory/memcpy2d_tests_common.hh index 0687632cbb..9654a9ea3b 100644 --- a/catch/unit/memory/memcpy2d_tests_common.hh +++ b/catch/unit/memory/memcpy2d_tests_common.hh @@ -196,13 +196,12 @@ template void Memcpy2DHtoDSyncBehavior(F memcpy_func, const bool should_sync, const hipStream_t kernel_stream = nullptr) { using LA = LinearAllocs; - const auto host_alloc_type = GENERATE(LA::malloc, LA::hipHostMalloc); - LinearAllocGuard host_alloc(host_alloc_type, 32 * sizeof(int) * 32); + LinearAllocGuard host_alloc(LA::hipHostMalloc, 32 * sizeof(int) * 32); LinearAllocGuard2D device_alloc(32, 32); MemcpySyncBehaviorCheck(std::bind(memcpy_func, device_alloc.ptr(), device_alloc.pitch(), host_alloc.ptr(), device_alloc.width(), device_alloc.width(), device_alloc.height(), hipMemcpyHostToDevice), - should_sync, kernel_stream); + should_sync, kernel_stream); } template