From 59c5220c2feb05608e3e61373e3b31ed16289207 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Mon, 7 Oct 2019 14:44:05 +0300 Subject: [PATCH] [HIPIFY] Sync with HIP + Update hipify-perl accordingly --- hipamd/bin/hipify-perl | 5 +++++ .../CUDA_Driver_API_functions_supported_by_HIP.md | 6 +++--- hipamd/hipify-clang/src/CUDA2HIP_Driver_API_functions.cpp | 8 ++++---- .../hipify-clang/src/CUDA2HIP_Runtime_API_functions.cpp | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hipamd/bin/hipify-perl b/hipamd/bin/hipify-perl index f13b865be4..1cfc82eae4 100755 --- a/hipamd/bin/hipify-perl +++ b/hipamd/bin/hipify-perl @@ -269,6 +269,7 @@ sub simpleSubstitutions { $ft{'memory'} += s/\bcudaMemcpy2DAsync\b/hipMemcpy2DAsync/g; $ft{'memory'} += s/\bcudaMemcpy2DToArray\b/hipMemcpy2DToArray/g; $ft{'memory'} += s/\bcudaMemcpy3D\b/hipMemcpy3D/g; + $ft{'memory'} += s/\bcudaMemcpy3DAsync\b/hipMemcpy3DAsync/g; $ft{'memory'} += s/\bcudaMemcpyAsync\b/hipMemcpyAsync/g; $ft{'memory'} += s/\bcudaMemcpyFromArray\b/hipMemcpyFromArray/g; $ft{'memory'} += s/\bcudaMemcpyFromSymbol\b/hipMemcpyFromSymbol/g; @@ -336,6 +337,10 @@ sub simpleSubstitutions { $ft{'occupancy'} += s/\bcudaOccupancyMaxActiveBlocksPerMultiprocessor\b/hipOccupancyMaxActiveBlocksPerMultiprocessor/g; $ft{'occupancy'} += s/\bcudaOccupancyMaxActiveBlocksPerMultiprocessorWithFlags\b/hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags/g; $ft{'occupancy'} += s/\bcudaOccupancyMaxPotentialBlockSize\b/hipOccupancyMaxPotentialBlockSize/g; + $ft{'texture'} += s/\bcuTexRefGetAddress\b/hipTexRefGetAddress/g; + $ft{'texture'} += s/\bcuTexRefGetAddressMode\b/hipTexRefGetAddressMode/g; + $ft{'texture'} += s/\bcuTexRefGetAddress_v2\b/hipTexRefGetAddress/g; + $ft{'texture'} += s/\bcuTexRefGetArray\b/hipTexRefGetArray/g; $ft{'texture'} += s/\bcuTexRefSetAddress\b/hipTexRefSetAddress/g; $ft{'texture'} += s/\bcuTexRefSetAddress2D\b/hipTexRefSetAddress2D/g; $ft{'texture'} += s/\bcuTexRefSetAddress2D_v2\b/hipTexRefSetAddress2D/g; diff --git a/hipamd/docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md b/hipamd/docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md index 5a6ca9fc1e..21401b0626 100644 --- a/hipamd/docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md +++ b/hipamd/docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md @@ -1053,9 +1053,9 @@ | **CUDA** | **HIP** |**CUDA version\***| |-----------------------------------------------------------|-------------------------------|:----------------:| -| `cuTexRefGetAddress` | | -| `cuTexRefGetAddressMode` | | -| `cuTexRefGetArray` | | +| `cuTexRefGetAddress` |`hipTexRefGetAddress` | +| `cuTexRefGetAddressMode` |`hipTexRefGetAddressMode` | +| `cuTexRefGetArray` |`hipTexRefGetArray` | | `cuTexRefGetBorderColor` | | 8.0 | | `cuTexRefGetFilterMode` | | | `cuTexRefGetFlags` | | diff --git a/hipamd/hipify-clang/src/CUDA2HIP_Driver_API_functions.cpp b/hipamd/hipify-clang/src/CUDA2HIP_Driver_API_functions.cpp index 792d34b3ce..3c00660cae 100644 --- a/hipamd/hipify-clang/src/CUDA2HIP_Driver_API_functions.cpp +++ b/hipamd/hipify-clang/src/CUDA2HIP_Driver_API_functions.cpp @@ -530,10 +530,10 @@ const std::map CUDA_DRIVER_FUNCTION_MAP{ // 5.21. Texture Reference Management // no analogues - {"cuTexRefGetAddress", {"hipTexRefGetAddress", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, - {"cuTexRefGetAddress_v2", {"hipTexRefGetAddress", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, - {"cuTexRefGetAddressMode", {"hipTexRefGetAddressMode", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, - {"cuTexRefGetArray", {"hipTexRefGetArray", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, + {"cuTexRefGetAddress", {"hipTexRefGetAddress", "", CONV_TEXTURE, API_DRIVER}}, + {"cuTexRefGetAddress_v2", {"hipTexRefGetAddress", "", CONV_TEXTURE, API_DRIVER}}, + {"cuTexRefGetAddressMode", {"hipTexRefGetAddressMode", "", CONV_TEXTURE, API_DRIVER}}, + {"cuTexRefGetArray", {"hipTexRefGetArray", "", CONV_TEXTURE, API_DRIVER}}, {"cuTexRefGetBorderColor", {"hipTexRefGetBorderColor", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, {"cuTexRefGetFilterMode", {"hipTexRefGetFilterMode", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, {"cuTexRefGetFlags", {"hipTexRefGetFlags", "", CONV_TEXTURE, API_DRIVER, HIP_UNSUPPORTED}}, diff --git a/hipamd/hipify-clang/src/CUDA2HIP_Runtime_API_functions.cpp b/hipamd/hipify-clang/src/CUDA2HIP_Runtime_API_functions.cpp index e3c8212aab..56f2c5a806 100644 --- a/hipamd/hipify-clang/src/CUDA2HIP_Runtime_API_functions.cpp +++ b/hipamd/hipify-clang/src/CUDA2HIP_Runtime_API_functions.cpp @@ -305,7 +305,7 @@ const std::map CUDA_RUNTIME_FUNCTION_MAP{ {"cudaMemcpy3D", {"hipMemcpy3D", "", CONV_MEMORY, API_RUNTIME}}, // no analogue // NOTE: Not equal to cuMemcpy3DAsync due to different signatures - {"cudaMemcpy3DAsync", {"hipMemcpy3DAsync", "", CONV_MEMORY, API_RUNTIME, HIP_UNSUPPORTED}}, + {"cudaMemcpy3DAsync", {"hipMemcpy3DAsync", "", CONV_MEMORY, API_RUNTIME}}, // no analogue // NOTE: Not equal to cuMemcpy3DPeer due to different signatures {"cudaMemcpy3DPeer", {"hipMemcpy3DPeer", "", CONV_MEMORY, API_RUNTIME, HIP_UNSUPPORTED}},