AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-317016 - Fixes bad parameters such as uninitialized graph object, pass parent instead of child graph and changed topology

Browse Source 
Change-Id: I2e7a7fa30be57d420a3228b495222f4cf579cb05
This commit is contained in:
Sourabh Betigeri
2022-03-07 13:01:08 -08:00
committed by Sourabh Betigeri
parent 1524c9515e
commit 104992ffda
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/src/hip_graph.cpp
+16 -2
View File
@@ -1102,7 +1102,7 @@ hipError_t hipGraphExecMemcpyNodeSetParams(hipGraphExec_t hGraphExec, hipGraphNo
// Check if pNodeParams passed is a empty struct // Check if pNodeParams passed is a empty struct
if (((pNodeParams->srcArray == 0) && (pNodeParams->srcPtr.ptr == nullptr)) || if (((pNodeParams->srcArray == 0) && (pNodeParams->srcPtr.ptr == nullptr)) ||
((pNodeParams->dstArray == 0) && (pNodeParams->dstPtr.ptr == nullptr))) { ((pNodeParams->dstArray == 0) && (pNodeParams->dstPtr.ptr == nullptr))) {
return hipErrorInvalidValue; HIP_RETURN(hipErrorInvalidValue);
} }
hipGraphNode_t clonedNode = hGraphExec->GetClonedNode(node); hipGraphNode_t clonedNode = hGraphExec->GetClonedNode(node);
if (clonedNode == nullptr) { if (clonedNode == nullptr) {
@@ -1202,9 +1202,23 @@ hipError_t hipGraphChildGraphNodeGetGraph(hipGraphNode_t node, hipGraph_t* pGrap
hipError_t hipGraphExecChildGraphNodeSetParams(hipGraphExec_t hGraphExec, hipGraphNode_t node, hipError_t hipGraphExecChildGraphNodeSetParams(hipGraphExec_t hGraphExec, hipGraphNode_t node,
hipGraph_t childGraph) { hipGraph_t childGraph) {
HIP_INIT_API(hipGraphExecChildGraphNodeSetParams, hGraphExec, node, childGraph); HIP_INIT_API(hipGraphExecChildGraphNodeSetParams, hGraphExec, node, childGraph);
if (hGraphExec == nullptr || node == nullptr || childGraph == nullptr) { if (hGraphExec == nullptr || node == nullptr || childGraph == nullptr ||
!ihipGraph::isGraphValid(childGraph)) {
HIP_RETURN(hipErrorInvalidValue); HIP_RETURN(hipErrorInvalidValue);
} }
if (childGraph == node->GetParentGraph()) {
HIP_RETURN(hipErrorUnknown);
}
hipGraphNode_t hipErrorNode_out;
hipGraphExecUpdateResult updateResult_out;
// Check if this instantiated graph is updatable. All restrictions in hipGraphExecUpdate() apply.
if (hipGraphExecUpdate(hGraphExec, childGraph, &hipErrorNode_out, &updateResult_out) ==
hipErrorGraphExecUpdateFailure) {
HIP_RETURN(hipErrorUnknown);
}
hipGraphNode_t clonedNode = hGraphExec->GetClonedNode(node); hipGraphNode_t clonedNode = hGraphExec->GetClonedNode(node);
if (clonedNode == nullptr) { if (clonedNode == nullptr) {
HIP_RETURN(hipErrorInvalidValue); HIP_RETURN(hipErrorInvalidValue);