merge master into release/rocm-rel-5.1

Change-Id: If09c0afed3a3c7395c86b6d443e8c3a3d8f7acdb
ROCm · Mar 16, 2022 · 04be858 · 04be858
2 parents 548d7de + ddab6a8
commit 04be858
Show file tree

Hide file tree

Showing 12 changed files with 420 additions and 467 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
diff --git a/doc/markdown/CUDA_Driver_API_functions_supported_by_HIP.md b/doc/markdown/CUDA_Driver_API_functions_supported_by_HIP.md
diff --git a/doc/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md b/doc/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md
@@ -72,10 +72,10 @@
 |`cudaStreamDestroy`| | | |`hipStreamDestroy`|1.6.0| | | |
 |`cudaStreamEndCapture`|10.0| | |`hipStreamEndCapture`|4.3.0| | | |
 |`cudaStreamGetAttribute`|11.0| | | | | | | |
-|`cudaStreamGetCaptureInfo`|10.1| | |`hipStreamGetCaptureInfo`|5.0.0| | |5.0.0|
+|`cudaStreamGetCaptureInfo`|10.1| | |`hipStreamGetCaptureInfo`|5.0.0| | | |
 |`cudaStreamGetFlags`| | | |`hipStreamGetFlags`|1.6.0| | | |
 |`cudaStreamGetPriority`| | | |`hipStreamGetPriority`|2.0.0| | | |
-|`cudaStreamIsCapturing`|10.0| | |`hipStreamIsCapturing`|5.0.0| | |5.0.0|
+|`cudaStreamIsCapturing`|10.0| | |`hipStreamIsCapturing`|5.0.0| | | |
 |`cudaStreamQuery`| | | |`hipStreamQuery`|1.6.0| | | |
 |`cudaStreamSetAttribute`|11.0| | | | | | | |
 |`cudaStreamSynchronize`| | | |`hipStreamSynchronize`|1.6.0| | | |
@@ -248,7 +248,7 @@
 |:--|:-:|:-:|:-:|:--|:-:|:-:|:-:|:-:|
 |`cudaGLGetDevices`| | | |`hipGLGetDevices`|4.5.0| | | |
 |`cudaGraphicsGLRegisterBuffer`| | | |`hipGraphicsGLRegisterBuffer`|4.5.0| | | |
-|`cudaGraphicsGLRegisterImage`| | | | | | | | |
+|`cudaGraphicsGLRegisterImage`| | | |`hipGraphicsGLRegisterImage`|5.1.0| | |5.1.0|
 |`cudaWGLGetDevice`| | | | | | | | |
 
 ## **15. OpenGL Interoperability [DEPRECATED]**
@@ -363,7 +363,7 @@
 |`cudaGraphicsResourceGetMappedMipmappedArray`| | | | | | | | |
 |`cudaGraphicsResourceGetMappedPointer`| | | |`hipGraphicsResourceGetMappedPointer`|4.5.0| | | |
 |`cudaGraphicsResourceSetMapFlags`| | | | | | | | |
-|`cudaGraphicsSubResourceGetMappedArray`| | | | | | | | |
+|`cudaGraphicsSubResourceGetMappedArray`| | | |`hipGraphicsSubResourceGetMappedArray`|5.1.0| | |5.1.0|
 |`cudaGraphicsUnmapResources`| | | |`hipGraphicsUnmapResources`|4.5.0| | | |
 |`cudaGraphicsUnregisterResource`| | | |`hipGraphicsUnregisterResource`|4.5.0| | | |
 
@@ -420,57 +420,57 @@
 |`cudaDeviceGetGraphMemAttribute`|11.4| | | | | | | |
 |`cudaDeviceGraphMemTrim`|11.4| | | | | | | |
 |`cudaDeviceSetGraphMemAttribute`|11.4| | | | | | | |
-|`cudaGraphAddChildGraphNode`|10.0| | |`hipGraphAddChildGraphNode`|5.0.0| | |5.0.0|
+|`cudaGraphAddChildGraphNode`|10.0| | |`hipGraphAddChildGraphNode`|5.0.0| | | |
 |`cudaGraphAddDependencies`|10.0| | |`hipGraphAddDependencies`|4.5.0| | | |
 |`cudaGraphAddEmptyNode`|10.0| | |`hipGraphAddEmptyNode`|4.5.0| | | |
-|`cudaGraphAddEventRecordNode`|11.1| | |`hipGraphAddEventRecordNode`|5.0.0| | |5.0.0|
-|`cudaGraphAddEventWaitNode`|11.1| | |`hipGraphAddEventWaitNode`|5.0.0| | |5.0.0|
+|`cudaGraphAddEventRecordNode`|11.1| | |`hipGraphAddEventRecordNode`|5.0.0| | | |
+|`cudaGraphAddEventWaitNode`|11.1| | |`hipGraphAddEventWaitNode`|5.0.0| | | |
 |`cudaGraphAddExternalSemaphoresSignalNode`|11.2| | | | | | | |
 |`cudaGraphAddExternalSemaphoresWaitNode`|11.2| | | | | | | |
-|`cudaGraphAddHostNode`|10.0| | |`hipGraphAddHostNode`|5.0.0| | |5.0.0|
+|`cudaGraphAddHostNode`|10.0| | |`hipGraphAddHostNode`|5.0.0| | | |
 |`cudaGraphAddKernelNode`|10.0| | |`hipGraphAddKernelNode`|4.3.0| | | |
 |`cudaGraphAddMemAllocNode`|11.4| | | | | | | |
 |`cudaGraphAddMemFreeNode`|11.4| | | | | | | |
 |`cudaGraphAddMemcpyNode`|10.0| | |`hipGraphAddMemcpyNode`|4.3.0| | | |
 |`cudaGraphAddMemcpyNode1D`|11.1| | |`hipGraphAddMemcpyNode1D`|4.5.0| | | |
-|`cudaGraphAddMemcpyNodeFromSymbol`|11.1| | |`hipGraphAddMemcpyNodeFromSymbol`|5.0.0| | |5.0.0|
-|`cudaGraphAddMemcpyNodeToSymbol`|11.1| | |`hipGraphAddMemcpyNodeToSymbol`|5.0.0| | |5.0.0|
+|`cudaGraphAddMemcpyNodeFromSymbol`|11.1| | |`hipGraphAddMemcpyNodeFromSymbol`|5.0.0| | | |
+|`cudaGraphAddMemcpyNodeToSymbol`|11.1| | |`hipGraphAddMemcpyNodeToSymbol`|5.0.0| | | |
 |`cudaGraphAddMemsetNode`|10.0| | |`hipGraphAddMemsetNode`|4.3.0| | | |
-|`cudaGraphChildGraphNodeGetGraph`|10.0| | |`hipGraphChildGraphNodeGetGraph`|5.0.0| | |5.0.0|
+|`cudaGraphChildGraphNodeGetGraph`|10.0| | |`hipGraphChildGraphNodeGetGraph`|5.0.0| | | |
 |`cudaGraphClone`|10.0| | | | | | | |
 |`cudaGraphCreate`|10.0| | |`hipGraphCreate`|4.3.0| | | |
 |`cudaGraphDebugDotPrint`|11.3| | | | | | | |
 |`cudaGraphDestroy`|10.0| | |`hipGraphDestroy`|4.3.0| | | |
-|`cudaGraphDestroyNode`|10.0| | |`hipGraphDestroyNode`|5.0.0| | |5.0.0|
-|`cudaGraphEventRecordNodeGetEvent`|11.1| | |`hipGraphEventRecordNodeGetEvent`|5.0.0| | |5.0.0|
-|`cudaGraphEventRecordNodeSetEvent`|11.1| | |`hipGraphEventRecordNodeSetEvent`|5.0.0| | |5.0.0|
-|`cudaGraphEventWaitNodeGetEvent`|11.1| | |`hipGraphEventWaitNodeGetEvent`|5.0.0| | |5.0.0|
-|`cudaGraphEventWaitNodeSetEvent`|11.1| | |`hipGraphEventWaitNodeSetEvent`|5.0.0| | |5.0.0|
-|`cudaGraphExecChildGraphNodeSetParams`|11.1| | |`hipGraphExecChildGraphNodeSetParams`|5.0.0| | |5.0.0|
+|`cudaGraphDestroyNode`|10.0| | |`hipGraphDestroyNode`|5.0.0| | | |
+|`cudaGraphEventRecordNodeGetEvent`|11.1| | |`hipGraphEventRecordNodeGetEvent`|5.0.0| | | |
+|`cudaGraphEventRecordNodeSetEvent`|11.1| | |`hipGraphEventRecordNodeSetEvent`|5.0.0| | | |
+|`cudaGraphEventWaitNodeGetEvent`|11.1| | |`hipGraphEventWaitNodeGetEvent`|5.0.0| | | |
+|`cudaGraphEventWaitNodeSetEvent`|11.1| | |`hipGraphEventWaitNodeSetEvent`|5.0.0| | | |
+|`cudaGraphExecChildGraphNodeSetParams`|11.1| | |`hipGraphExecChildGraphNodeSetParams`|5.0.0| | | |
 |`cudaGraphExecDestroy`|10.0| | |`hipGraphExecDestroy`|4.3.0| | | |
-|`cudaGraphExecEventRecordNodeSetEvent`|11.1| | |`hipGraphExecEventRecordNodeSetEvent`|5.0.0| | |5.0.0|
-|`cudaGraphExecEventWaitNodeSetEvent`|11.1| | |`hipGraphExecEventWaitNodeSetEvent`|5.0.0| | |5.0.0|
+|`cudaGraphExecEventRecordNodeSetEvent`|11.1| | |`hipGraphExecEventRecordNodeSetEvent`|5.0.0| | | |
+|`cudaGraphExecEventWaitNodeSetEvent`|11.1| | |`hipGraphExecEventWaitNodeSetEvent`|5.0.0| | | |
 |`cudaGraphExecExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
 |`cudaGraphExecExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
-|`cudaGraphExecHostNodeSetParams`|11.0| | |`hipGraphExecHostNodeSetParams`|5.0.0| | |5.0.0|
+|`cudaGraphExecHostNodeSetParams`|11.0| | |`hipGraphExecHostNodeSetParams`|5.0.0| | | |
 |`cudaGraphExecKernelNodeSetParams`|11.0| | |`hipGraphExecKernelNodeSetParams`|4.5.0| | | |
-|`cudaGraphExecMemcpyNodeSetParams`|11.0| | |`hipGraphExecMemcpyNodeSetParams`|5.0.0| | |5.0.0|
-|`cudaGraphExecMemcpyNodeSetParams1D`|11.1| | |`hipGraphExecMemcpyNodeSetParams1D`|5.0.0| | |5.0.0|
-|`cudaGraphExecMemcpyNodeSetParamsFromSymbol`|11.1| | |`hipGraphExecMemcpyNodeSetParamsFromSymbol`|5.0.0| | |5.0.0|
-|`cudaGraphExecMemcpyNodeSetParamsToSymbol`|11.1| | |`hipGraphExecMemcpyNodeSetParamsToSymbol`|5.0.0| | |5.0.0|
-|`cudaGraphExecMemsetNodeSetParams`|11.0| | |`hipGraphExecMemsetNodeSetParams`|5.0.0| | |5.0.0|
-|`cudaGraphExecUpdate`|11.0| | |`hipGraphExecUpdate`|5.0.0| | |5.0.0|
+|`cudaGraphExecMemcpyNodeSetParams`|11.0| | |`hipGraphExecMemcpyNodeSetParams`|5.0.0| | | |
+|`cudaGraphExecMemcpyNodeSetParams1D`|11.1| | |`hipGraphExecMemcpyNodeSetParams1D`|5.0.0| | | |
+|`cudaGraphExecMemcpyNodeSetParamsFromSymbol`|11.1| | |`hipGraphExecMemcpyNodeSetParamsFromSymbol`|5.0.0| | | |
+|`cudaGraphExecMemcpyNodeSetParamsToSymbol`|11.1| | |`hipGraphExecMemcpyNodeSetParamsToSymbol`|5.0.0| | | |
+|`cudaGraphExecMemsetNodeSetParams`|11.0| | |`hipGraphExecMemsetNodeSetParams`|5.0.0| | | |
+|`cudaGraphExecUpdate`|11.0| | |`hipGraphExecUpdate`|5.0.0| | | |
 |`cudaGraphExternalSemaphoresSignalNodeGetParams`|11.2| | | | | | | |
 |`cudaGraphExternalSemaphoresSignalNodeSetParams`|11.2| | | | | | | |
 |`cudaGraphExternalSemaphoresWaitNodeGetParams`|11.2| | | | | | | |
 |`cudaGraphExternalSemaphoresWaitNodeSetParams`|11.2| | | | | | | |
-|`cudaGraphGetEdges`|10.0| | |`hipGraphGetEdges`|5.0.0| | |5.0.0|
+|`cudaGraphGetEdges`|10.0| | |`hipGraphGetEdges`|5.0.0| | | |
 |`cudaGraphGetNodes`|10.0| | |`hipGraphGetNodes`|4.5.0| | | |
 |`cudaGraphGetRootNodes`|10.0| | |`hipGraphGetRootNodes`|4.5.0| | | |
-|`cudaGraphHostNodeGetParams`|10.0| | |`hipGraphHostNodeGetParams`|5.0.0| | |5.0.0|
-|`cudaGraphHostNodeSetParams`|10.0| | |`hipGraphHostNodeSetParams`|5.0.0| | |5.0.0|
+|`cudaGraphHostNodeGetParams`|10.0| | |`hipGraphHostNodeGetParams`|5.0.0| | | |
+|`cudaGraphHostNodeSetParams`|10.0| | |`hipGraphHostNodeSetParams`|5.0.0| | | |
 |`cudaGraphInstantiate`|10.0| | |`hipGraphInstantiate`|4.3.0| | | |
-|`cudaGraphInstantiateWithFlags`|11.4| | |`hipGraphInstantiateWithFlags`|5.0.0| | |5.0.0|
+|`cudaGraphInstantiateWithFlags`|11.4| | |`hipGraphInstantiateWithFlags`|5.0.0| | | |
 |`cudaGraphKernelNodeCopyAttributes`|11.0| | | | | | | |
 |`cudaGraphKernelNodeGetAttribute`|11.0| | | | | | | |
 |`cudaGraphKernelNodeGetParams`|11.0| | |`hipGraphKernelNodeGetParams`|4.5.0| | | |
@@ -481,18 +481,18 @@
 |`cudaGraphMemFreeNodeGetParams`|11.4| | | | | | | |
 |`cudaGraphMemcpyNodeGetParams`|11.0| | |`hipGraphMemcpyNodeGetParams`|4.5.0| | | |
 |`cudaGraphMemcpyNodeSetParams`|11.0| | |`hipGraphMemcpyNodeSetParams`|4.5.0| | | |
-|`cudaGraphMemcpyNodeSetParams1D`|11.1| | |`hipGraphMemcpyNodeSetParams1D`|5.0.0| | |5.0.0|
-|`cudaGraphMemcpyNodeSetParamsFromSymbol`|11.1| | |`hipGraphMemcpyNodeSetParamsFromSymbol`|5.0.0| | |5.0.0|
-|`cudaGraphMemcpyNodeSetParamsToSymbol`|11.1| | |`hipGraphMemcpyNodeSetParamsToSymbol`|5.0.0| | |5.0.0|
+|`cudaGraphMemcpyNodeSetParams1D`|11.1| | |`hipGraphMemcpyNodeSetParams1D`|5.0.0| | | |
+|`cudaGraphMemcpyNodeSetParamsFromSymbol`|11.1| | |`hipGraphMemcpyNodeSetParamsFromSymbol`|5.0.0| | | |
+|`cudaGraphMemcpyNodeSetParamsToSymbol`|11.1| | |`hipGraphMemcpyNodeSetParamsToSymbol`|5.0.0| | | |
 |`cudaGraphMemsetNodeGetParams`|11.0| | |`hipGraphMemsetNodeGetParams`|4.5.0| | | |
 |`cudaGraphMemsetNodeSetParams`|11.0| | |`hipGraphMemsetNodeSetParams`|4.5.0| | | |
-|`cudaGraphNodeFindInClone`|11.0| | |`hipGraphNodeFindInClone`|5.0.0| | |5.0.0|
-|`cudaGraphNodeGetDependencies`|11.0| | |`hipGraphNodeGetDependencies`|5.0.0| | |5.0.0|
-|`cudaGraphNodeGetDependentNodes`|11.0| | |`hipGraphNodeGetDependentNodes`|5.0.0| | |5.0.0|
-|`cudaGraphNodeGetType`|11.0| | |`hipGraphNodeGetType`|5.0.0| | |5.0.0|
+|`cudaGraphNodeFindInClone`|11.0| | |`hipGraphNodeFindInClone`|5.0.0| | | |
+|`cudaGraphNodeGetDependencies`|11.0| | |`hipGraphNodeGetDependencies`|5.0.0| | | |
+|`cudaGraphNodeGetDependentNodes`|11.0| | |`hipGraphNodeGetDependentNodes`|5.0.0| | | |
+|`cudaGraphNodeGetType`|11.0| | |`hipGraphNodeGetType`|5.0.0| | | |
 |`cudaGraphNodeSetEnabled`|11.6| | | | | | | |
 |`cudaGraphReleaseUserObject`|11.3| | | | | | | |
-|`cudaGraphRemoveDependencies`|11.0| | |`hipGraphRemoveDependencies`|5.0.0| | |5.0.0|
+|`cudaGraphRemoveDependencies`|11.0| | |`hipGraphRemoveDependencies`|5.0.0| | | |
 |`cudaGraphRetainUserObject`|11.3| | | | | | | |
 |`cudaGraphUpload`|11.1| | | | | | | |
 |`cudaUserObjectCreate`|11.3| | | | | | | |
@@ -886,13 +886,13 @@ Unsupported
 |`cudaErrorECCUncorrectable`| | | |`hipErrorECCNotCorrectable`|1.6.0| | | |
 |`cudaErrorExternalDevice`| | | | | | | | |
 |`cudaErrorFileNotFound`|10.1| | |`hipErrorFileNotFound`|1.6.0| | | |
-|`cudaErrorGraphExecUpdateFailure`|10.2| | |`hipErrorGraphExecUpdateFailure`|5.0.0| | |5.0.0|
+|`cudaErrorGraphExecUpdateFailure`|10.2| | |`hipErrorGraphExecUpdateFailure`|5.0.0| | | |
 |`cudaErrorHardwareStackError`| | | | | | | | |
 |`cudaErrorHostMemoryAlreadyRegistered`| | | |`hipErrorHostMemoryAlreadyRegistered`|1.6.0| | | |
 |`cudaErrorHostMemoryNotRegistered`| | | |`hipErrorHostMemoryNotRegistered`|1.6.0| | | |
 |`cudaErrorIllegalAddress`| | | |`hipErrorIllegalAddress`|1.6.0| | | |
 |`cudaErrorIllegalInstruction`| | | | | | | | |
-|`cudaErrorIllegalState`|10.0| | |`hipErrorIllegalState`|5.0.0| | |5.0.0|
+|`cudaErrorIllegalState`|10.0| | |`hipErrorIllegalState`|5.0.0| | | |
 |`cudaErrorIncompatibleDriverContext`| | | | | | | | |
 |`cudaErrorInitializationError`| | | |`hipErrorNotInitialized`|1.6.0| | | |
 |`cudaErrorInsufficientDriver`| | | |`hipErrorInsufficientDriver`|1.7.0| | | |
@@ -1289,7 +1289,7 @@ Unsupported
 |`cudaSharedmemCarveoutDefault`|9.0| | | | | | | |
 |`cudaSharedmemCarveoutMaxL1`|9.0| | | | | | | |
 |`cudaSharedmemCarveoutMaxShared`|9.0| | | | | | | |
-|`cudaStreamAddCaptureDependencies`|11.3| | |`hipStreamAddCaptureDependencies`|5.0.0| | |5.0.0|
+|`cudaStreamAddCaptureDependencies`|11.3| | |`hipStreamAddCaptureDependencies`|5.0.0| | | |
 |`cudaStreamAttrID`|11.0| | | | | | | |
 |`cudaStreamAttrValue`|11.0| | | | | | | |
 |`cudaStreamAttributeAccessPolicyWindow`|11.0| | | | | | | |
@@ -1307,8 +1307,8 @@ Unsupported
 |`cudaStreamLegacy`| | | | | | | | |
 |`cudaStreamNonBlocking`| | | |`hipStreamNonBlocking`|1.6.0| | | |
 |`cudaStreamPerThread`| | | |`hipStreamPerThread`|4.5.0| | | |
-|`cudaStreamSetCaptureDependencies`|11.3| | |`hipStreamSetCaptureDependencies`|5.0.0| | |5.0.0|
-|`cudaStreamUpdateCaptureDependenciesFlags`|11.3| | |`hipStreamUpdateCaptureDependenciesFlags`|5.0.0| | |5.0.0|
+|`cudaStreamSetCaptureDependencies`|11.3| | |`hipStreamSetCaptureDependencies`|5.0.0| | | |
+|`cudaStreamUpdateCaptureDependenciesFlags`|11.3| | |`hipStreamUpdateCaptureDependenciesFlags`|5.0.0| | | |
 |`cudaStream_t`| | | |`hipStream_t`|1.5.0| | | |
 |`cudaSuccess`| | | |`hipSuccess`|1.5.0| | | |
 |`cudaSurfaceBoundaryMode`| | | |`hipSurfaceBoundaryMode`|1.9.0| | | |

diff --git a/packaging/hipify-clang.rpm_postun b/packaging/hipify-clang.rpm_postun
@@ -1,6 +1,3 @@
-HIPBINDIR=@CPACK_PACKAGING_INSTALL_PREFIX@/bin
-ROCMBINDIR=@CPACK_PACKAGING_INSTALL_PREFIX@/../bin
-
 if [ $1 -eq 0 ]; then
   rm -f @ROCMBINDIR@/hipify-perl
   rm -f @ROCMBINDIR@/hipify-clang
@@ -11,4 +8,6 @@ if [ $1 -eq 0 ]; then
   rm -f @ROCMBINDIR@/findcode.sh
   rm -f @ROCMBINDIR@/finduncodep.sh
   rmdir --ignore-fail-on-non-empty @ROCMBINDIR@
+  rmdir --ignore-fail-on-non-empty @HIPBINDIR@
+  rmdir --ignore-fail-on-non-empty @CPACK_PACKAGING_INSTALL_PREFIX@
 fi