From 74beb4583ccd4e4915d12ccf96d225342c243509 Mon Sep 17 00:00:00 2001 From: sdashmiz Date: Mon, 14 Feb 2022 15:12:13 -0500 Subject: [PATCH] SWDEV-321698 - hipGraphNodeTypeMemcpy1D NVDIA build failure Signed-off-by: sdashmiz Change-Id: I7aea11bf14adbeb7fea68eb862df74fcf6f13d75 --- hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h | 3 ++- hipamd/src/hip_graph_internal.cpp | 5 +++-- hipamd/src/hip_graph_internal.hpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index e6e9bd7a9b..b3f24dc4b5 100644 --- a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -1048,7 +1048,8 @@ typedef enum cudaGraphNodeType hipGraphNodeType; #define hipGraphNodeTypeEmpty cudaGraphNodeTypeEmpty #define hipGraphNodeTypeWaitEvent cudaGraphNodeTypeWaitEvent #define hipGraphNodeTypeEventRecord cudaGraphNodeTypeEventRecord -#define hipGraphNodeTypeMemcpy1D cudaGraphNodeTypeMemcpy1D +#define hipGraphNodeTypeExtSemaphoreSignal cudaGraphNodeTypeExtSemaphoreSignal +#define hipGraphNodeTypeExtSemaphoreWait cudaGraphNodeTypeExtSemaphoreWait #define hipGraphNodeTypeMemcpyFromSymbol cudaGraphNodeTypeMemcpyFromSymbol #define hipGraphNodeTypeMemcpyToSymbol cudaGraphNodeTypeMemcpyToSymbol #define hipGraphNodeTypeCount cudaGraphNodeTypeCount diff --git a/hipamd/src/hip_graph_internal.cpp b/hipamd/src/hip_graph_internal.cpp index 1a897256a2..28a824b101 100644 --- a/hipamd/src/hip_graph_internal.cpp +++ b/hipamd/src/hip_graph_internal.cpp @@ -29,14 +29,15 @@ const char* GetGraphNodeTypeString(uint32_t op) { const char* case_string; switch (static_cast(op)) { CASE_STRING(hipGraphNodeTypeKernel, KernelNode) - CASE_STRING(hipGraphNodeTypeMemcpy, Memcpy3DNode) + CASE_STRING(hipGraphNodeTypeMemcpy, MemcpyNode) CASE_STRING(hipGraphNodeTypeMemset, MemsetNode) CASE_STRING(hipGraphNodeTypeHost, HostNode) CASE_STRING(hipGraphNodeTypeGraph, GraphNode) CASE_STRING(hipGraphNodeTypeEmpty, EmptyNode) CASE_STRING(hipGraphNodeTypeWaitEvent, WaitEventNode) CASE_STRING(hipGraphNodeTypeEventRecord, EventRecordNode) - CASE_STRING(hipGraphNodeTypeMemcpy1D, Memcpy1DNode) + CASE_STRING(hipGraphNodeTypeExtSemaphoreSignal, ExtSemaphoreSignalNode) + CASE_STRING(hipGraphNodeTypeExtSemaphoreWait, ExtSemaphoreWaitNode) CASE_STRING(hipGraphNodeTypeMemcpyFromSymbol, MemcpyFromSymbolNode) CASE_STRING(hipGraphNodeTypeMemcpyToSymbol, MemcpyToSymbolNode) default: diff --git a/hipamd/src/hip_graph_internal.hpp b/hipamd/src/hip_graph_internal.hpp index 2dd1cab8e7..cfb3594699 100644 --- a/hipamd/src/hip_graph_internal.hpp +++ b/hipamd/src/hip_graph_internal.hpp @@ -593,7 +593,7 @@ class hipGraphMemcpyNode1D : public hipGraphNode { public: hipGraphMemcpyNode1D(void* dst, const void* src, size_t count, hipMemcpyKind kind, - hipGraphNodeType type = hipGraphNodeTypeMemcpy1D) + hipGraphNodeType type = hipGraphNodeTypeMemcpy) : hipGraphNode(type), dst_(dst), src_(src), count_(count), kind_(kind) {} ~hipGraphMemcpyNode1D() {}