From 2536d245f625b7e3e008206fe3b8bba3e2c2d0c8 Mon Sep 17 00:00:00 2001 From: Jaydeep Patel Date: Mon, 10 Apr 2023 07:37:31 +0000 Subject: [PATCH] SWDEV-388943,SWDEV-388954 - Corrected validations for memcpy kind. Change-Id: I8338111ac46e4eba279d53969d12df3a23552049 [ROCm/clr commit: 2576153acdd0c7422807b466fd6583a382d02801] --- projects/clr/hipamd/src/hip_graph_internal.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/clr/hipamd/src/hip_graph_internal.hpp b/projects/clr/hipamd/src/hip_graph_internal.hpp index 479819620b..3fde7af59f 100644 --- a/projects/clr/hipamd/src/hip_graph_internal.hpp +++ b/projects/clr/hipamd/src/hip_graph_internal.hpp @@ -1456,11 +1456,12 @@ class hipGraphMemcpyNodeFromSymbol : public hipGraphMemcpyNode1D { size_t dOffset = 0; amd::Memory* dstMemory = getMemoryObject(dst, dOffset); - if (dstMemory == nullptr && kind != hipMemcpyHostToDevice) { + if (dstMemory == nullptr && kind != hipMemcpyDeviceToHost && kind != hipMemcpyDefault) { return hipErrorInvalidMemcpyDirection; - } else if (dstMemory != nullptr && kind != hipMemcpyDeviceToDevice) { + } else if (dstMemory != nullptr && dstMemory->getMemFlags() == 0 && + kind != hipMemcpyDeviceToDevice && kind != hipMemcpyDefault) { return hipErrorInvalidMemcpyDirection; - } else if (kind == hipMemcpyHostToHost || kind == hipMemcpyDeviceToHost) { + } else if (kind == hipMemcpyHostToHost || kind == hipMemcpyHostToDevice) { return hipErrorInvalidMemcpyDirection; }