diff --git a/bin/hipify-perl b/bin/hipify-perl
index 703d0e51..11c25a44 100755
--- a/bin/hipify-perl
+++ b/bin/hipify-perl
@@ -1076,11 +1076,28 @@ my %removed_funcs = (
 );
 
 my %experimental_funcs = (
+    "cudaGraphExternalSemaphoresWaitNodeSetParams" => "6.0.0",
+    "cudaGraphExternalSemaphoresWaitNodeGetParams" => "6.0.0",
+    "cudaGraphExternalSemaphoresSignalNodeSetParams" => "6.0.0",
+    "cudaGraphExternalSemaphoresSignalNodeGetParams" => "6.0.0",
+    "cudaGraphExecExternalSemaphoresWaitNodeSetParams" => "6.0.0",
+    "cudaGraphExecExternalSemaphoresSignalNodeSetParams" => "6.0.0",
+    "cudaGraphAddExternalSemaphoresWaitNode" => "6.0.0",
+    "cudaGraphAddExternalSemaphoresSignalNode" => "6.0.0",
     "cudaExternalSemaphoreWaitNodeParamsV2" => "6.0.0",
     "cudaExternalSemaphoreWaitNodeParams" => "6.0.0",
     "cudaExternalSemaphoreSignalNodeParamsV2" => "6.0.0",
     "cudaExternalSemaphoreSignalNodeParams" => "6.0.0",
     "cudaDevAttrHostRegisterSupported" => "6.0.0",
+    "cuGraphExternalSemaphoresWaitNodeSetParams" => "6.0.0",
+    "cuGraphExternalSemaphoresWaitNodeGetParams" => "6.0.0",
+    "cuGraphExternalSemaphoresSignalNodeSetParams" => "6.0.0",
+    "cuGraphExternalSemaphoresSignalNodeGetParams" => "6.0.0",
+    "cuGraphExecExternalSemaphoresWaitNodeSetParams" => "6.0.0",
+    "cuGraphExecExternalSemaphoresSignalNodeSetParams" => "6.0.0",
+    "cuGraphAddMemcpyNode" => "6.0.0",
+    "cuGraphAddExternalSemaphoresWaitNode" => "6.0.0",
+    "cuGraphAddExternalSemaphoresSignalNode" => "6.0.0",
     "CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED" => "6.0.0",
     "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st" => "6.0.0",
     "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2" => "6.0.0",
@@ -1229,6 +1246,23 @@ sub subst {
 }
 
 sub experimentalSubstitutions {
+    subst("cuGraphAddExternalSemaphoresSignalNode", "hipGraphAddExternalSemaphoresSignalNode", "graph");
+    subst("cuGraphAddExternalSemaphoresWaitNode", "hipGraphAddExternalSemaphoresWaitNode", "graph");
+    subst("cuGraphAddMemcpyNode", "hipDrvGraphAddMemcpyNode", "graph");
+    subst("cuGraphExecExternalSemaphoresSignalNodeSetParams", "hipGraphExecExternalSemaphoresSignalNodeSetParams", "graph");
+    subst("cuGraphExecExternalSemaphoresWaitNodeSetParams", "hipGraphExecExternalSemaphoresWaitNodeSetParams", "graph");
+    subst("cuGraphExternalSemaphoresSignalNodeGetParams", "hipGraphExternalSemaphoresSignalNodeGetParams", "graph");
+    subst("cuGraphExternalSemaphoresSignalNodeSetParams", "hipGraphExternalSemaphoresSignalNodeSetParams", "graph");
+    subst("cuGraphExternalSemaphoresWaitNodeGetParams", "hipGraphExternalSemaphoresWaitNodeGetParams", "graph");
+    subst("cuGraphExternalSemaphoresWaitNodeSetParams", "hipGraphExternalSemaphoresWaitNodeSetParams", "graph");
+    subst("cudaGraphAddExternalSemaphoresSignalNode", "hipGraphAddExternalSemaphoresSignalNode", "graph");
+    subst("cudaGraphAddExternalSemaphoresWaitNode", "hipGraphAddExternalSemaphoresWaitNode", "graph");
+    subst("cudaGraphExecExternalSemaphoresSignalNodeSetParams", "hipGraphExecExternalSemaphoresSignalNodeSetParams", "graph");
+    subst("cudaGraphExecExternalSemaphoresWaitNodeSetParams", "hipGraphExecExternalSemaphoresWaitNodeSetParams", "graph");
+    subst("cudaGraphExternalSemaphoresSignalNodeGetParams", "hipGraphExternalSemaphoresSignalNodeGetParams", "graph");
+    subst("cudaGraphExternalSemaphoresSignalNodeSetParams", "hipGraphExternalSemaphoresSignalNodeSetParams", "graph");
+    subst("cudaGraphExternalSemaphoresWaitNodeGetParams", "hipGraphExternalSemaphoresWaitNodeGetParams", "graph");
+    subst("cudaGraphExternalSemaphoresWaitNodeSetParams", "hipGraphExternalSemaphoresWaitNodeSetParams", "graph");
     subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS", "hipExternalSemaphoreSignalNodeParams", "type");
     subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st", "hipExternalSemaphoreSignalNodeParams", "type");
     subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1", "hipExternalSemaphoreSignalNodeParams", "type");
@@ -7330,20 +7364,12 @@ sub warnUnsupportedFunctions {
         "cudaGraphInstantiateMultipleDevicesNotSupported",
         "cudaGraphInstantiateInvalidStructure",
         "cudaGraphInstantiateError",
-        "cudaGraphExternalSemaphoresWaitNodeSetParams",
-        "cudaGraphExternalSemaphoresWaitNodeGetParams",
-        "cudaGraphExternalSemaphoresSignalNodeSetParams",
-        "cudaGraphExternalSemaphoresSignalNodeGetParams",
         "cudaGraphExecUpdateResultInfo_st",
         "cudaGraphExecUpdateResultInfo",
         "cudaGraphExecUpdateErrorAttributesChanged",
         "cudaGraphExecNodeSetParams",
         "cudaGraphExecGetFlags",
-        "cudaGraphExecExternalSemaphoresWaitNodeSetParams",
-        "cudaGraphExecExternalSemaphoresSignalNodeSetParams",
         "cudaGraphAddNode",
-        "cudaGraphAddExternalSemaphoresWaitNode",
-        "cudaGraphAddExternalSemaphoresSignalNode",
         "cudaGetTextureObjectTextureDesc_v2",
         "cudaGetSurfaceReference",
         "cudaGetSurfaceObjectResourceDesc",
@@ -7810,24 +7836,15 @@ sub warnUnsupportedFunctions {
         "cuGraphicsD3D10RegisterResource",
         "cuGraphNodeSetParams",
         "cuGraphInstantiateWithParams",
-        "cuGraphExternalSemaphoresWaitNodeSetParams",
-        "cuGraphExternalSemaphoresWaitNodeGetParams",
-        "cuGraphExternalSemaphoresSignalNodeSetParams",
-        "cuGraphExternalSemaphoresSignalNodeGetParams",
         "cuGraphExecNodeSetParams",
         "cuGraphExecMemsetNodeSetParams",
         "cuGraphExecMemcpyNodeSetParams",
         "cuGraphExecGetFlags",
-        "cuGraphExecExternalSemaphoresWaitNodeSetParams",
-        "cuGraphExecExternalSemaphoresSignalNodeSetParams",
         "cuGraphExecBatchMemOpNodeSetParams",
         "cuGraphBatchMemOpNodeSetParams",
         "cuGraphBatchMemOpNodeGetParams",
         "cuGraphAddNode",
         "cuGraphAddMemsetNode",
-        "cuGraphAddMemcpyNode",
-        "cuGraphAddExternalSemaphoresWaitNode",
-        "cuGraphAddExternalSemaphoresSignalNode",
         "cuGraphAddBatchMemOpNode",
         "cuGetProcAddress",
         "cuGLUnregisterBufferObject",
diff --git a/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md b/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md
index 98b87720..6417dfa9 100644
--- a/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md
+++ b/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md
@@ -1772,13 +1772,13 @@
 |`cuGraphAddEmptyNode`|10.0| | |`hipGraphAddEmptyNode`|4.5.0| | | |
 |`cuGraphAddEventRecordNode`|11.1| | |`hipGraphAddEventRecordNode`|5.0.0| | | |
 |`cuGraphAddEventWaitNode`|11.1| | |`hipGraphAddEventWaitNode`|5.0.0| | | |
-|`cuGraphAddExternalSemaphoresSignalNode`|11.2| | | | | | | |
-|`cuGraphAddExternalSemaphoresWaitNode`|11.2| | | | | | | |
+|`cuGraphAddExternalSemaphoresSignalNode`|11.2| | |`hipGraphAddExternalSemaphoresSignalNode`|6.0.0| | |6.0.0|
+|`cuGraphAddExternalSemaphoresWaitNode`|11.2| | |`hipGraphAddExternalSemaphoresWaitNode`|6.0.0| | |6.0.0|
 |`cuGraphAddHostNode`|10.0| | |`hipGraphAddHostNode`|5.0.0| | | |
 |`cuGraphAddKernelNode`|10.0| | |`hipGraphAddKernelNode`|4.3.0| | | |
 |`cuGraphAddMemAllocNode`|11.4| | |`hipGraphAddMemAllocNode`|5.5.0| | | |
 |`cuGraphAddMemFreeNode`|11.4| | |`hipGraphAddMemFreeNode`|5.5.0| | | |
-|`cuGraphAddMemcpyNode`|10.0| | | | | | | |
+|`cuGraphAddMemcpyNode`|10.0| | |`hipDrvGraphAddMemcpyNode`|6.0.0| | |6.0.0|
 |`cuGraphAddMemsetNode`|10.0| | | | | | | |
 |`cuGraphAddNode`|12.2| | | | | | | |
 |`cuGraphBatchMemOpNodeGetParams`|11.7| | | | | | | |
@@ -1798,8 +1798,8 @@
 |`cuGraphExecDestroy`|10.0| | |`hipGraphExecDestroy`|4.3.0| | | |
 |`cuGraphExecEventRecordNodeSetEvent`|11.1| | |`hipGraphExecEventRecordNodeSetEvent`|5.0.0| | | |
 |`cuGraphExecEventWaitNodeSetEvent`|11.1| | |`hipGraphExecEventWaitNodeSetEvent`|5.0.0| | | |
-|`cuGraphExecExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
-|`cuGraphExecExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
+|`cuGraphExecExternalSemaphoresSignalNodeSetParams`|11.2| | |`hipGraphExecExternalSemaphoresSignalNodeSetParams`|6.0.0| | |6.0.0|
+|`cuGraphExecExternalSemaphoresWaitNodeSetParams`|11.2| | |`hipGraphExecExternalSemaphoresWaitNodeSetParams`|6.0.0| | |6.0.0|
 |`cuGraphExecGetFlags`|12.0| | | | | | | |
 |`cuGraphExecHostNodeSetParams`|10.2| | |`hipGraphExecHostNodeSetParams`|5.0.0| | | |
 |`cuGraphExecKernelNodeSetParams`|10.1| | |`hipGraphExecKernelNodeSetParams`|4.5.0| | | |
@@ -1807,10 +1807,10 @@
 |`cuGraphExecMemsetNodeSetParams`|10.2| | | | | | | |
 |`cuGraphExecNodeSetParams`|12.2| | | | | | | |
 |`cuGraphExecUpdate`|10.2| | |`hipGraphExecUpdate`|5.0.0| | | |
-|`cuGraphExternalSemaphoresSignalNodeGetParams`|11.2| | | | | | | |
-|`cuGraphExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
-|`cuGraphExternalSemaphoresWaitNodeGetParams`|11.2| | | | | | | |
-|`cuGraphExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
+|`cuGraphExternalSemaphoresSignalNodeGetParams`|11.2| | |`hipGraphExternalSemaphoresSignalNodeGetParams`|6.0.0| | |6.0.0|
+|`cuGraphExternalSemaphoresSignalNodeSetParams`|11.2| | |`hipGraphExternalSemaphoresSignalNodeSetParams`|6.0.0| | |6.0.0|
+|`cuGraphExternalSemaphoresWaitNodeGetParams`|11.2| | |`hipGraphExternalSemaphoresWaitNodeGetParams`|6.0.0| | |6.0.0|
+|`cuGraphExternalSemaphoresWaitNodeSetParams`|11.2| | |`hipGraphExternalSemaphoresWaitNodeSetParams`|6.0.0| | |6.0.0|
 |`cuGraphGetEdges`|10.0| | |`hipGraphGetEdges`|5.0.0| | | |
 |`cuGraphGetNodes`|10.0| | |`hipGraphGetNodes`|4.5.0| | | |
 |`cuGraphGetRootNodes`|10.0| | |`hipGraphGetRootNodes`|4.5.0| | | |
diff --git a/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md b/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md
index 18ffa507..4fc4c9b9 100644
--- a/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md
+++ b/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md
@@ -415,8 +415,8 @@
 |`cudaGraphAddEmptyNode`|10.0| | |`hipGraphAddEmptyNode`|4.5.0| | | |
 |`cudaGraphAddEventRecordNode`|11.1| | |`hipGraphAddEventRecordNode`|5.0.0| | | |
 |`cudaGraphAddEventWaitNode`|11.1| | |`hipGraphAddEventWaitNode`|5.0.0| | | |
-|`cudaGraphAddExternalSemaphoresSignalNode`|11.2| | | | | | | |
-|`cudaGraphAddExternalSemaphoresWaitNode`|11.2| | | | | | | |
+|`cudaGraphAddExternalSemaphoresSignalNode`|11.2| | |`hipGraphAddExternalSemaphoresSignalNode`|6.0.0| | |6.0.0|
+|`cudaGraphAddExternalSemaphoresWaitNode`|11.2| | |`hipGraphAddExternalSemaphoresWaitNode`|6.0.0| | |6.0.0|
 |`cudaGraphAddHostNode`|10.0| | |`hipGraphAddHostNode`|5.0.0| | | |
 |`cudaGraphAddKernelNode`|10.0| | |`hipGraphAddKernelNode`|4.3.0| | | |
 |`cudaGraphAddMemAllocNode`|11.4| | |`hipGraphAddMemAllocNode`|5.5.0| | | |
@@ -441,8 +441,8 @@
 |`cudaGraphExecDestroy`|10.0| | |`hipGraphExecDestroy`|4.3.0| | | |
 |`cudaGraphExecEventRecordNodeSetEvent`|11.1| | |`hipGraphExecEventRecordNodeSetEvent`|5.0.0| | | |
 |`cudaGraphExecEventWaitNodeSetEvent`|11.1| | |`hipGraphExecEventWaitNodeSetEvent`|5.0.0| | | |
-|`cudaGraphExecExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
-|`cudaGraphExecExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
+|`cudaGraphExecExternalSemaphoresSignalNodeSetParams`|11.2| | |`hipGraphExecExternalSemaphoresSignalNodeSetParams`|6.0.0| | |6.0.0|
+|`cudaGraphExecExternalSemaphoresWaitNodeSetParams`|11.2| | |`hipGraphExecExternalSemaphoresWaitNodeSetParams`|6.0.0| | |6.0.0|
 |`cudaGraphExecGetFlags`|12.0| | | | | | | |
 |`cudaGraphExecHostNodeSetParams`|11.0| | |`hipGraphExecHostNodeSetParams`|5.0.0| | | |
 |`cudaGraphExecKernelNodeSetParams`|11.0| | |`hipGraphExecKernelNodeSetParams`|4.5.0| | | |
@@ -453,10 +453,10 @@
 |`cudaGraphExecMemsetNodeSetParams`|11.0| | |`hipGraphExecMemsetNodeSetParams`|5.0.0| | | |
 |`cudaGraphExecNodeSetParams`|12.2| | | | | | | |
 |`cudaGraphExecUpdate`|11.0| | |`hipGraphExecUpdate`|5.0.0| | | |
-|`cudaGraphExternalSemaphoresSignalNodeGetParams`|11.2| | | | | | | |
-|`cudaGraphExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
-|`cudaGraphExternalSemaphoresWaitNodeGetParams`|11.2| | | | | | | |
-|`cudaGraphExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
+|`cudaGraphExternalSemaphoresSignalNodeGetParams`|11.2| | |`hipGraphExternalSemaphoresSignalNodeGetParams`|6.0.0| | |6.0.0|
+|`cudaGraphExternalSemaphoresSignalNodeSetParams`|11.2| | |`hipGraphExternalSemaphoresSignalNodeSetParams`|6.0.0| | |6.0.0|
+|`cudaGraphExternalSemaphoresWaitNodeGetParams`|11.2| | |`hipGraphExternalSemaphoresWaitNodeGetParams`|6.0.0| | |6.0.0|
+|`cudaGraphExternalSemaphoresWaitNodeSetParams`|11.2| | |`hipGraphExternalSemaphoresWaitNodeSetParams`|6.0.0| | |6.0.0|
 |`cudaGraphGetEdges`|10.0| | |`hipGraphGetEdges`|5.0.0| | | |
 |`cudaGraphGetNodes`|10.0| | |`hipGraphGetNodes`|4.5.0| | | |
 |`cudaGraphGetRootNodes`|10.0| | |`hipGraphGetRootNodes`|4.5.0| | | |
diff --git a/src/CUDA2HIP_Driver_API_functions.cpp b/src/CUDA2HIP_Driver_API_functions.cpp
index 1711d102..c918cdf5 100644
--- a/src/CUDA2HIP_Driver_API_functions.cpp
+++ b/src/CUDA2HIP_Driver_API_functions.cpp
@@ -628,7 +628,7 @@ const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_FUNCTION_MAP {
   // NOTE: Not equal to cudaGraphAddMemcpyNode due to different signatures:
   // DRIVER: CUresult CUDAAPI cuGraphAddMemcpyNode(CUgraphNode *phGraphNode, CUgraph hGraph, const CUgraphNode *dependencies, size_t numDependencies, const CUDA_MEMCPY3D *copyParams, CUcontext ctx);
   // RUNTIME: cudaError_t CUDARTAPI cudaGraphAddMemcpyNode(cudaGraphNode_t *pGraphNode, cudaGraph_t graph, const cudaGraphNode_t *pDependencies, size_t numDependencies, const struct cudaMemcpy3DParms *pCopyParams);
-  {"cuGraphAddMemcpyNode",                                 {"hipGraphAddMemcpyNode",                                   "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphAddMemcpyNode",                                 {"hipDrvGraphAddMemcpyNode",                                "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // no analogue
   // NOTE: Not equal to cudaGraphAddMemsetNode due to different signatures:
   // DRIVER: CUresult CUDAAPI cuGraphAddMemsetNode(CUgraphNode *phGraphNode, CUgraph hGraph, const CUgraphNode *dependencies, size_t numDependencies, const CUDA_MEMSET_NODE_PARAMS *memsetParams, CUcontext ctx);
@@ -733,21 +733,21 @@ const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_FUNCTION_MAP {
   // cudaGraphUpload
   {"cuGraphUpload",                                        {"hipGraphUpload",                                          "", CONV_GRAPH, API_DRIVER, SEC::GRAPH}},
   // cudaGraphAddExternalSemaphoresSignalNode
-  {"cuGraphAddExternalSemaphoresSignalNode",               {"hipGraphAddExternalSemaphoresSignalNode",                 "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphAddExternalSemaphoresSignalNode",               {"hipGraphAddExternalSemaphoresSignalNode",                 "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExternalSemaphoresSignalNodeGetParams
-  {"cuGraphExternalSemaphoresSignalNodeGetParams",         {"hipGraphExternalSemaphoresSignalNodeGetParams",           "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExternalSemaphoresSignalNodeGetParams",         {"hipGraphExternalSemaphoresSignalNodeGetParams",           "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExternalSemaphoresSignalNodeSetParams
-  {"cuGraphExternalSemaphoresSignalNodeSetParams",         {"hipGraphExternalSemaphoresSignalNodeSetParams",           "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExternalSemaphoresSignalNodeSetParams",         {"hipGraphExternalSemaphoresSignalNodeSetParams",           "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphAddExternalSemaphoresWaitNode
-  {"cuGraphAddExternalSemaphoresWaitNode",                 {"hipGraphAddExternalSemaphoresWaitNode",                   "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphAddExternalSemaphoresWaitNode",                 {"hipGraphAddExternalSemaphoresWaitNode",                   "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExternalSemaphoresWaitNodeGetParams
-  {"cuGraphExternalSemaphoresWaitNodeGetParams",           {"hipGraphExternalSemaphoresWaitNodeGetParams",             "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExternalSemaphoresWaitNodeGetParams",           {"hipGraphExternalSemaphoresWaitNodeGetParams",             "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExternalSemaphoresWaitNodeSetParams
-  {"cuGraphExternalSemaphoresWaitNodeSetParams",           {"hipGraphExternalSemaphoresWaitNodeSetParams",             "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExternalSemaphoresWaitNodeSetParams",           {"hipGraphExternalSemaphoresWaitNodeSetParams",             "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExecExternalSemaphoresSignalNodeSetParams
-  {"cuGraphExecExternalSemaphoresSignalNodeSetParams",     {"hipGraphExecExternalSemaphoresSignalNodeSetParams",       "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExecExternalSemaphoresSignalNodeSetParams",     {"hipGraphExecExternalSemaphoresSignalNodeSetParams",       "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaGraphExecExternalSemaphoresWaitNodeSetParams
-  {"cuGraphExecExternalSemaphoresWaitNodeSetParams",       {"hipGraphExecExternalSemaphoresWaitNodeSetParams",         "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cuGraphExecExternalSemaphoresWaitNodeSetParams",       {"hipGraphExecExternalSemaphoresWaitNodeSetParams",         "", CONV_GRAPH, API_DRIVER, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cudaUserObjectCreate
   {"cuUserObjectCreate",                                   {"hipUserObjectCreate",                                     "", CONV_GRAPH, API_DRIVER, SEC::GRAPH}},
   // cudaUserObjectRetain
@@ -1547,6 +1547,7 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_DRIVER_FUNCTION_VER_MAP {
   {"hipGraphNodeGetEnabled",                               {HIP_5050, HIP_0,    HIP_0   }},
   {"hipArrayGetDescriptor",                                {HIP_5060, HIP_0,    HIP_0   }},
   {"hipArray3DGetDescriptor",                              {HIP_5060, HIP_0,    HIP_0   }},
+  {"hipDrvGraphAddMemcpyNode",                             {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
 };
 
 const std::map<unsigned int, llvm::StringRef> CUDA_DRIVER_API_SECTION_MAP {
diff --git a/src/CUDA2HIP_Runtime_API_functions.cpp b/src/CUDA2HIP_Runtime_API_functions.cpp
index 7ab124ac..da4b39e2 100644
--- a/src/CUDA2HIP_Runtime_API_functions.cpp
+++ b/src/CUDA2HIP_Runtime_API_functions.cpp
@@ -792,21 +792,21 @@ const std::map<llvm::StringRef, hipCounter> CUDA_RUNTIME_FUNCTION_MAP {
   // cuGraphUpload
   {"cudaGraphUpload",                                         {"hipGraphUpload",                                         "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH}},
   // cuGraphAddExternalSemaphoresSignalNode
-  {"cudaGraphAddExternalSemaphoresSignalNode",                {"hipGraphAddExternalSemaphoresSignalNode",                "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphAddExternalSemaphoresSignalNode",                {"hipGraphAddExternalSemaphoresSignalNode",                "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExternalSemaphoresSignalNodeGetParams
-  {"cudaGraphExternalSemaphoresSignalNodeGetParams",          {"hipGraphExternalSemaphoresSignalNodeGetParams",          "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExternalSemaphoresSignalNodeGetParams",          {"hipGraphExternalSemaphoresSignalNodeGetParams",          "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExternalSemaphoresSignalNodeSetParams
-  {"cudaGraphExternalSemaphoresSignalNodeSetParams",          {"hipGraphExternalSemaphoresSignalNodeSetParams",          "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExternalSemaphoresSignalNodeSetParams",          {"hipGraphExternalSemaphoresSignalNodeSetParams",          "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphAddExternalSemaphoresWaitNode
-  {"cudaGraphAddExternalSemaphoresWaitNode",                  {"hipGraphAddExternalSemaphoresWaitNode",                  "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphAddExternalSemaphoresWaitNode",                  {"hipGraphAddExternalSemaphoresWaitNode",                  "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExternalSemaphoresWaitNodeGetParams
-  {"cudaGraphExternalSemaphoresWaitNodeGetParams",            {"hipGraphExternalSemaphoresWaitNodeGetParams",            "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExternalSemaphoresWaitNodeGetParams",            {"hipGraphExternalSemaphoresWaitNodeGetParams",            "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExternalSemaphoresWaitNodeSetParams
-  {"cudaGraphExternalSemaphoresWaitNodeSetParams",            {"hipGraphExternalSemaphoresWaitNodeSetParams",            "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExternalSemaphoresWaitNodeSetParams",            {"hipGraphExternalSemaphoresWaitNodeSetParams",            "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExecExternalSemaphoresSignalNodeSetParams
-  {"cudaGraphExecExternalSemaphoresSignalNodeSetParams",      {"hipGraphExecExternalSemaphoresSignalNodeSetParams",      "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExecExternalSemaphoresSignalNodeSetParams",      {"hipGraphExecExternalSemaphoresSignalNodeSetParams",      "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuGraphExecExternalSemaphoresWaitNodeSetParams
-  {"cudaGraphExecExternalSemaphoresWaitNodeSetParams",        {"hipGraphExecExternalSemaphoresWaitNodeSetParams",        "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_UNSUPPORTED}},
+  {"cudaGraphExecExternalSemaphoresWaitNodeSetParams",        {"hipGraphExecExternalSemaphoresWaitNodeSetParams",        "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH, HIP_EXPERIMENTAL}},
   // cuUserObjectCreate
   {"cudaUserObjectCreate",                                    {"hipUserObjectCreate",                                    "", CONV_GRAPH, API_RUNTIME, SEC::GRAPH}},
   // cuUserObjectRetain
@@ -1370,6 +1370,14 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_RUNTIME_FUNCTION_VER_MAP {
   {"hipOccupancyMaxPotentialBlockSizeVariableSMem",           {HIP_5050, HIP_0,    HIP_0   }},
   {"hipOccupancyMaxPotentialBlockSizeVariableSMemWithFlags",  {HIP_5050, HIP_0,    HIP_0   }},
   {"hipArrayGetInfo",                                         {HIP_5060, HIP_0,    HIP_0   }},
+  {"hipGraphAddExternalSemaphoresWaitNode",                   {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphAddExternalSemaphoresSignalNode",                 {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExternalSemaphoresSignalNodeSetParams",           {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExternalSemaphoresSignalNodeGetParams",           {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExternalSemaphoresWaitNodeGetParams",             {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExternalSemaphoresWaitNodeSetParams",             {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExecExternalSemaphoresSignalNodeSetParams",       {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipGraphExecExternalSemaphoresWaitNodeSetParams",         {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
 };
 
 const std::map<unsigned int, llvm::StringRef> CUDA_RUNTIME_API_SECTION_MAP {