diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index d391b8a524..8d9e88f2f3 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -23,8 +23,6 @@ "Unit_hipMemRangeGetAttribute_Positive_AccessedBy_Partial_Range", "Disabling test tracked SWDEV-395683", "Unit_hipStreamPerThread_MultiThread", - "Disabling tests tracked with SWDEV-389647..", - "Unit_hipMemcpy2DToArrayAsync_Positive_Synchronization_Behavior", "SWDEV-398981 fails in stress test", "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag", "Unit_hipEventIpc", @@ -104,9 +102,6 @@ "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDevice", "Unit_hipExtLaunchMultiKernelMultiDevice_Negative_MultiKernelSameDevice", "=== Below tests are failing PSDB ===", - "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", - "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", - "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipLaunchCooperativeKernel_Negative_Parameters", "Unit_hipLaunchKernel_Negative_Parameters", "Unit_hipModuleLaunchCooperativeKernel_Negative_Parameters", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows index 91a6107dcf..6f61bb0a9b 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -346,9 +346,6 @@ "Unit_hipGetMipmappedArrayLevel_Negative", "Unit_hipFreeMipmappedArray_Negative_DoubleFree", "Unit_hipFreeMipmappedArrayMultiTArray - int", - "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", - "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", - "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior", "Unit_Thread_Block_Tile_Dynamic_Getters_Positive_Basic", "Performance_hipMemcpy2D_HostToHost", "Performance_hipMemcpy2DAsync_HostToHost", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json index fc8a35dd1e..636f1d006a 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json @@ -66,9 +66,7 @@ "Unit_hipFreeMipmappedArray_Negative_Parameters", "Unit_hipCreateSurfaceObject_Negative_Parameters", "Unit_hipDestroySurfaceObject_Negative_Parameters", - "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipMemcpy2D_Positive_Synchronization_Behavior", - "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipFreeMipmappedArray_Negative_DoubleFree", "Unit_hipModuleLoad_Positive_Basic", "Unit_hipModuleLoad_Negative_Load_From_A_File_That_Is_Not_A_Module", @@ -80,8 +78,6 @@ "Performance_hipMemsetD16Async", "Performance_hipMemsetD32", "Performance_hipMemsetD32Async", - "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", - "Unit_hipMemcpy_Positive_Synchronization_Behavior", "Unit_tex1Dfetch_Positive_ReadModeElementType - char", "Unit_tex1Dfetch_Positive_ReadModeElementType - unsigned char", "Unit_tex1Dfetch_Positive_ReadModeElementType - short", diff --git a/projects/hip-tests/catch/unit/memory/hipDrvMemcpy3D.cc b/projects/hip-tests/catch/unit/memory/hipDrvMemcpy3D.cc index 6de7dae744..6fb49d664a 100644 --- a/projects/hip-tests/catch/unit/memory/hipDrvMemcpy3D.cc +++ b/projects/hip-tests/catch/unit/memory/hipDrvMemcpy3D.cc @@ -64,21 +64,11 @@ TEST_CASE("Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior") { Memcpy3DDtoHPageableSyncBehavior(DrvMemcpy3DWrapper<>, true); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-236 SECTION("Device to Pinned Host") { Memcpy3DDtoHPinnedSyncBehavior(DrvMemcpy3DWrapper<>, true); } -#endif - SECTION("Device to Device") { -#if HT_NVIDIA - Memcpy3DDtoDSyncBehavior(DrvMemcpy3DWrapper<>, false); -#else - Memcpy3DDtoDSyncBehavior(DrvMemcpy3DWrapper<>, true); -#endif - } + SECTION("Device to Device") { Memcpy3DDtoDSyncBehavior(DrvMemcpy3DWrapper<>, false); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-232 SECTION("Host to Host") { Memcpy3DHtoHSyncBehavior(DrvMemcpy3DWrapper<>, true); } -#endif } TEST_CASE("Unit_hipDrvMemcpy3D_Positive_Parameters") { @@ -254,4 +244,4 @@ TEST_CASE("Unit_hipDrvMemcpy3D_Capture") { BEGIN_CAPTURE_SYNC(memcpy_err, false); HIP_CHECK_ERROR(hipDrvMemcpy3D(¶ms), memcpy_err); END_CAPTURE_SYNC(memcpy_err); -} \ No newline at end of file +} diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpy3D.cc b/projects/hip-tests/catch/unit/memory/hipMemcpy3D.cc index f3863bfac0..6d78bdca77 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpy3D.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpy3D.cc @@ -60,9 +60,7 @@ TEST_CASE("Unit_hipMemcpy3D_Positive_Synchronization_Behavior") { SECTION("Device to Pinned Host") { Memcpy3DDtoHPinnedSyncBehavior(Memcpy3DWrapper<>, true); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-232 SECTION("Host to Host") { Memcpy3DHtoHSyncBehavior(Memcpy3DWrapper<>, true); } -#endif } TEST_CASE("Unit_hipMemcpy3D_Positive_DeviceToDevice_Synchronization_Behavior") { diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpy3DAsync.cc b/projects/hip-tests/catch/unit/memory/hipMemcpy3DAsync.cc index 47fb45f89a..d897b45702 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpy3DAsync.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpy3DAsync.cc @@ -64,11 +64,9 @@ TEST_CASE("Unit_hipMemcpy3DAsync_Positive_Synchronization_Behavior") { SECTION("Host to Device") { Memcpy3DHtoDSyncBehavior(Memcpy3DWrapper, false); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-233 SECTION("Device to Pageable Host") { Memcpy3DDtoHPageableSyncBehavior(Memcpy3DWrapper, true); } -#endif SECTION("Device to Pinned Host") { Memcpy3DDtoHPinnedSyncBehavior(Memcpy3DWrapper, false); @@ -76,9 +74,7 @@ TEST_CASE("Unit_hipMemcpy3DAsync_Positive_Synchronization_Behavior") { SECTION("Device to Device") { Memcpy3DDtoDSyncBehavior(Memcpy3DWrapper, false); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-233 SECTION("Host to Host") { Memcpy3DHtoHSyncBehavior(Memcpy3DWrapper, true); } -#endif } TEST_CASE("Unit_hipMemcpy3DAsync_Positive_Parameters") { diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc index a97370f73c..e3c14610fc 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc @@ -57,17 +57,13 @@ TEST_CASE("Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior") { Memcpy2DDtoHPageableSyncBehavior(MemcpyParam2DAdapter<>(), true); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-236 SECTION("Device to Pinned Host") { Memcpy2DDtoHPinnedSyncBehavior(MemcpyParam2DAdapter<>(), true); } -#endif SECTION("Device to Device") { Memcpy2DDtoDSyncBehavior(MemcpyParam2DAdapter<>(), false); } -#if HT_NVIDIA // Disabled on AMD due to defect - EXSWHTEC-232 SECTION("Host to Host") { Memcpy2DHtoHSyncBehavior(MemcpyParam2DAdapter<>(), true); } -#endif } TEST_CASE("Unit_hipMemcpyParam2D_Positive_Parameters") { diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpyWithStream.cc b/projects/hip-tests/catch/unit/memory/hipMemcpyWithStream.cc index 36f5c93168..8a8fd7eed2 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpyWithStream.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpyWithStream.cc @@ -31,16 +31,6 @@ TEST_CASE("Unit_hipMemcpy_Positive_Synchronization_Behavior") { using namespace std::placeholders; HIP_CHECK(hipDeviceSynchronize()); - // For transfers from pageable host memory to device memory, a stream sync is performed before - // the copy is initiated. The function will return once the pageable buffer has been copied to - // the staging memory for DMA transfer to device memory, but the DMA to final destination may - // not have completed. - // For transfers from pinned host memory to device memory, the function is synchronous with - // respect to the host - SECTION("Host memory to device memory") { - MemcpyHPageabletoDSyncBehavior(std::bind(hipMemcpy, _1, _2, _3, hipMemcpyHostToDevice), true); - } - // For transfers from device to either pageable or pinned host memory, the function returns only // once the copy has completed SECTION("Device memory to host memory") { @@ -51,13 +41,6 @@ TEST_CASE("Unit_hipMemcpy_Positive_Synchronization_Behavior") { // For transfers from device memory to device memory, no host-side synchronization is performed. SECTION("Device memory to device memory") { - // This behavior differs on NVIDIA and AMD, on AMD the hipMemcpy calls is synchronous with - // respect to the host -#if HT_AMD - HipTest::HIP_SKIP_TEST( - "EXSWCPHIPT-127 - Memcpy from device to device memory behavior differs on AMD and Nvidia"); - return; -#endif MemcpyDtoDSyncBehavior(std::bind(hipMemcpy, _1, _2, _3, hipMemcpyDeviceToDevice), false); }