SWDEV-489617 - Enable Unit_hipMemcpyAsync_Positive_Synchronization_Behavior

- Since any-host-to-any-host as always synchronous, there's no need for
separate functions
 - Removed 'return' statement as it skips the rest of the test.

Change-Id: If70e0b21ad8151311d5ac7c5de789f6265cf44b6


[ROCm/hip-tests commit: 3809d1bb75]
Этот коммит содержится в:
Marko Arandjelovic
2024-10-30 15:43:46 +01:00
коммит произвёл Rakesh Roy
родитель 32b07e3262
Коммит 719600ccc4
3 изменённых файлов: 4 добавлений и 23 удалений
+2 -12
Просмотреть файл
@@ -298,9 +298,8 @@ template <typename F>
void MemcpyHtoHSyncBehavior(F memcpy_func, const bool should_sync,
const hipStream_t kernel_stream = nullptr) {
using LA = LinearAllocs;
const auto [src_alloc_type, dst_alloc_type] = GENERATE(
std::make_tuple(LA::malloc, LA::hipHostMalloc),
std::make_tuple(LA::hipHostMalloc, LA::malloc), std::make_tuple(LA::malloc, LA::malloc));
auto src_alloc_type = GENERATE(LA::malloc, LA::hipHostMalloc);
auto dst_alloc_type = GENERATE(LA::malloc, LA::hipHostMalloc);
LinearAllocGuard<int> src_alloc(src_alloc_type, kPageSize);
LinearAllocGuard<int> dst_alloc(dst_alloc_type, kPageSize);
@@ -308,15 +307,6 @@ void MemcpyHtoHSyncBehavior(F memcpy_func, const bool should_sync,
should_sync, kernel_stream);
}
template <typename F>
void MemcpyHPinnedtoHPinnedSyncBehavior(F memcpy_func, const bool should_sync,
const hipStream_t kernel_stream = nullptr) {
LinearAllocGuard<int> src_alloc(LinearAllocs::hipHostMalloc, kPageSize);
LinearAllocGuard<int> dst_alloc(LinearAllocs::hipHostMalloc, kPageSize);
MemcpySyncBehaviorCheck(std::bind(memcpy_func, dst_alloc.ptr(), src_alloc.ptr(), kPageSize),
should_sync, kernel_stream);
}
// Common negative tests
template <typename F> void MemcpyCommonNegativeTests(F f, void* dst, void* src, size_t count) {
SECTION("dst == nullptr") { HIP_CHECK_ERROR(f(nullptr, src, count), hipErrorInvalidValue); }
+2 -9
Просмотреть файл
@@ -41,14 +41,10 @@ TEST_CASE("Unit_hipMemcpyAsync_Positive_Synchronization_Behavior") {
// This behavior differs on NVIDIA and AMD, on AMD the hipMemcpy calls is synchronous with
// respect to the host
SECTION("Host pageable memory to device memory") {
#if HT_AMD
HipTest::HIP_SKIP_TEST(
"EXSWCPHIPT-127 - MemcpyAsync from host to device memory behavior differs on AMD and "
"Nvidia");
return;
#endif
#if HT_NVIDIA
MemcpyHPageabletoDSyncBehavior(
std::bind(hipMemcpyAsync, _1, _2, _3, hipMemcpyHostToDevice, nullptr), false);
#endif
}
SECTION("Host pinned memory to device memory") {
@@ -79,9 +75,6 @@ TEST_CASE("Unit_hipMemcpyAsync_Positive_Synchronization_Behavior") {
SECTION("Host memory to host memory") {
MemcpyHtoHSyncBehavior(std::bind(hipMemcpyAsync, _1, _2, _3, hipMemcpyHostToHost, nullptr),
true);
MemcpyHPinnedtoHPinnedSyncBehavior(
std::bind(hipMemcpyAsync, _1, _2, _3, hipMemcpyHostToHost, nullptr), true);
}
}
-2
Просмотреть файл
@@ -65,8 +65,6 @@ TEST_CASE("Unit_hipMemcpy_Positive_Synchronization_Behavior") {
// respect to the host
SECTION("Host memory to host memory") {
MemcpyHtoHSyncBehavior(std::bind(hipMemcpy, _1, _2, _3, hipMemcpyHostToHost), true);
MemcpyHPinnedtoHPinnedSyncBehavior(
std::bind(hipMemcpyAsync, _1, _2, _3, hipMemcpyHostToHost, nullptr), true);
}
}