From f6ea7f732b4cbb37d75b6cc0302dc197ba0ba652 Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Mon, 22 Jan 2024 07:27:58 +0000 Subject: [PATCH] SWDEV-440029 - Fix hipMemcpyFrom/ToSymbol directions allowed Change-Id: Ib0b3d737cd5d297ac2d3c1ba549902b96e29c18c [ROCm/clr commit: 9fd8b4d3f1393ecae73462152801930dc49d5f13] --- projects/clr/hipamd/src/hip_memory.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp index 418ee08848..8dc0e176bd 100644 --- a/projects/clr/hipamd/src/hip_memory.cpp +++ b/projects/clr/hipamd/src/hip_memory.cpp @@ -1311,8 +1311,8 @@ hipError_t hipMemcpyToSymbol_common(const void* symbol, const void* src, size_t size_t offset, hipMemcpyKind kind, hipStream_t stream=nullptr) { CHECK_STREAM_CAPTURING(); - if (kind != hipMemcpyHostToDevice && (kind != hipMemcpyDeviceToDevice || - kind != hipMemcpyDeviceToDeviceNoCU)) { + if (kind != hipMemcpyHostToDevice && kind != hipMemcpyDeviceToDevice && + kind != hipMemcpyDeviceToDeviceNoCU) { HIP_RETURN(hipErrorInvalidMemcpyDirection); } @@ -1345,8 +1345,8 @@ hipError_t hipMemcpyFromSymbol_common(void* dst, const void* symbol, size_t size size_t offset, hipMemcpyKind kind, hipStream_t stream=nullptr) { CHECK_STREAM_CAPTURING(); - if (kind != hipMemcpyDeviceToHost && (kind != hipMemcpyDeviceToDevice || - kind != hipMemcpyDeviceToDeviceNoCU)) { + if (kind != hipMemcpyDeviceToHost && kind != hipMemcpyDeviceToDevice && + kind != hipMemcpyDeviceToDeviceNoCU) { HIP_RETURN(hipErrorInvalidMemcpyDirection); } @@ -1379,8 +1379,8 @@ hipError_t hipMemcpyToSymbolAsync_common(const void* symbol, const void* src, si size_t offset, hipMemcpyKind kind, hipStream_t stream) { STREAM_CAPTURE(hipMemcpyToSymbolAsync, stream, symbol, src, sizeBytes, offset, kind); - if (kind != hipMemcpyHostToDevice && (kind != hipMemcpyDeviceToDevice || - kind != hipMemcpyDeviceToDeviceNoCU)) { + if (kind != hipMemcpyHostToDevice && kind != hipMemcpyDeviceToDevice && + kind != hipMemcpyDeviceToDeviceNoCU) { return hipErrorInvalidMemcpyDirection; } @@ -1412,8 +1412,8 @@ hipError_t hipMemcpyFromSymbolAsync_common(void* dst, const void* symbol, size_t size_t offset, hipMemcpyKind kind, hipStream_t stream) { STREAM_CAPTURE(hipMemcpyFromSymbolAsync, stream, dst, symbol, sizeBytes, offset, kind); - if (kind != hipMemcpyDeviceToHost && (kind != hipMemcpyDeviceToDevice || - kind != hipMemcpyDeviceToDeviceNoCU)) { + if (kind != hipMemcpyDeviceToHost && kind != hipMemcpyDeviceToDevice && + kind != hipMemcpyDeviceToDeviceNoCU) { return hipErrorInvalidMemcpyDirection; }