From b744ec45485f2bdc407b58c0ebcdbfcf383a8ae0 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Mon, 7 Oct 2019 14:33:04 +0300 Subject: [PATCH] [HIPIFY] Remove duplicates + C++ maps and docs affected, hipify-perl left unchanged --- .../CUDA_Runtime_API_functions_supported_by_HIP.md | 4 ---- docs/markdown/CURAND_API_supported_by_HIP.md | 14 -------------- hipify-clang/src/CUDA2HIP_BLAS_API_functions.cpp | 6 ------ hipify-clang/src/CUDA2HIP_Device_functions.cpp | 5 ----- hipify-clang/src/CUDA2HIP_SPARSE_API_functions.cpp | 2 +- 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md b/docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md index b4a399e191..2df5829853 100644 --- a/docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md +++ b/docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md @@ -440,8 +440,6 @@ | `cudaMemcpyFromSymbolAsync` | | | `cudaMemcpyToSymbol` | | | `cudaMemcpyToSymbolAsync` | | -| `cudaOccupancyMaxActiveBlocksPerMultiprocessor` |`hipOccupancyMaxActiveBlocksPerMultiprocessor` | -| `cudaOccupancyMaxActiveBlocksPerMultiprocessorWithFlags` |`hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags`| | `cudaOccupancyMaxPotentialBlockSize` |`hipOccupancyMaxPotentialBlockSize` | | `cudaOccupancyMaxPotentialBlockSizeWithFlags` | | | `cudaOccupancyMaxPotentialBlockSizeVariableSMem` | | @@ -484,7 +482,6 @@ | struct |`cudaTextureDesc` | |`hipTextureDesc` | | struct |`textureReference` | |`textureReference` | | struct |`surfaceReference` | | | -| struct |`CUuuid_st` | | | | enum |***`cudaCGScope`*** | 9.0 | | | 0 |*`cudaCGScopeInvalid`* | 9.0 | | | 1 |*`cudaCGScopeGrid`* | 9.0 | | @@ -974,7 +971,6 @@ | typedef |`cudaArray_const_t` | |`hipArray_const_t` | | typedef |`cudaEvent_t` | |`hipEvent_t` | | struct |`CUevent_st` | |`ihipEvent_t` | -| typedef |`cudaGraphicsResource_t` | | | | struct |`cudaMipmappedArray` | |`hipMipmappedArray` | | typedef |`cudaMipmappedArray_t` | |`hipMipmappedArray_t` | | typedef |`cudaMipmappedArray_const_t` | |`hipMipmappedArray_const_t` | diff --git a/docs/markdown/CURAND_API_supported_by_HIP.md b/docs/markdown/CURAND_API_supported_by_HIP.md index a46a2c1afd..d4a3111c9c 100644 --- a/docs/markdown/CURAND_API_supported_by_HIP.md +++ b/docs/markdown/CURAND_API_supported_by_HIP.md @@ -54,20 +54,6 @@ | uint | `curandDirectionVectors64_t` | | | | struct | `curandGenerator_st` | | `hiprandGenerator_st` | | struct* | `curandGenerator_t` | | `hiprandGenerator_t` | -| enum |***`curandOrdering`*** | | | -| enum |***`curandOrdering_t`*** | | | -| 100 |*`CURAND_ORDERING_PSEUDO_BEST`* | | | -| 101 |*`CURAND_ORDERING_PSEUDO_DEFAULT`* | | | -| 102 |*`CURAND_ORDERING_PSEUDO_SEEDED`* | | | -| 201 |*`CURAND_ORDERING_QUASI_DEFAULT`* | | | -| enum |***`curandDirectionVectorSet`*** | | | -| enum |***`curandDirectionVectorSet_t`*** | | | -| 101 |*`CURAND_DIRECTION_VECTORS_32_JOEKUO6`* | | | -| 102 |*`CURAND_SCRAMBLED_DIRECTION_VECTORS_32_JOEKUO6`* | | | -| 103 |*`CURAND_DIRECTION_VECTORS_64_JOEKUO6`* | | | -| 104 |*`CURAND_SCRAMBLED_DIRECTION_VECTORS_64_JOEKUO6`* | | | -| uint | `curandDirectionVectors32_t` | | `hiprandDirectionVectors32_t` | -| uint | `curandDirectionVectors64_t` | | | | double | `curandDistribution_st` | | | | double | `curandHistogramM2V_st` | | | | double* | `curandDistribution_t` | | | diff --git a/hipify-clang/src/CUDA2HIP_BLAS_API_functions.cpp b/hipify-clang/src/CUDA2HIP_BLAS_API_functions.cpp index 9d7f559e1a..4efb0bcdbb 100644 --- a/hipify-clang/src/CUDA2HIP_BLAS_API_functions.cpp +++ b/hipify-clang/src/CUDA2HIP_BLAS_API_functions.cpp @@ -333,12 +333,6 @@ const std::map CUDA_BLAS_FUNCTION_MAP{ {"cublasCtrsm", {"hipblasCtrsm", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, {"cublasZtrsm", {"hipblasZtrsm", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, - // TRSM - Batched Triangular Solver - {"cublasStrsmBatched", {"hipblasStrsmBatched", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, - {"cublasDtrsmBatched", {"hipblasDtrsmBatched", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, - {"cublasCtrsmBatched", {"hipblasCtrsmBatched", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, - {"cublasZtrsmBatched", {"hipblasZtrsmBatched", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, - // TRMM {"cublasStrmm", {"hipblasStrmm", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, {"cublasDtrmm", {"hipblasDtrmm", "", CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}}, diff --git a/hipify-clang/src/CUDA2HIP_Device_functions.cpp b/hipify-clang/src/CUDA2HIP_Device_functions.cpp index bd555156c3..5b4f560e15 100644 --- a/hipify-clang/src/CUDA2HIP_Device_functions.cpp +++ b/hipify-clang/src/CUDA2HIP_Device_functions.cpp @@ -354,7 +354,6 @@ const std::map CUDA_DEVICE_FUNC_MAP{ {"__vabsss2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, {"__vadd2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, {"__vaddss2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, - {"__vaddss2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, {"__vaddus2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, {"__vavgs2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, {"__vavgu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME, UNSUPPORTED}}, @@ -514,7 +513,6 @@ const std::map CUDA_DEVICE_FUNC_MAP{ {"__short_as_half", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__ushort_as_half", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__ldg", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, - {"__ldg", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__ldcg", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__ldca", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__ldcs", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, @@ -522,13 +520,11 @@ const std::map CUDA_DEVICE_FUNC_MAP{ {"__hne2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hle2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hge2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, - {"__hge2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hlt2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hgt2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hequ2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hneu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hleu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, - {"__hleu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hgeu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hltu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"__hgtu2", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, @@ -611,7 +607,6 @@ const std::map CUDA_DEVICE_FUNC_MAP{ {"atomicMax", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"atomicInc", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"atomicDec", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, - {"atomicDec", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"atomicAnd", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"atomicOr", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, {"atomicXor", {"", "", CONV_DEVICE_FUNC, API_RUNTIME}}, diff --git a/hipify-clang/src/CUDA2HIP_SPARSE_API_functions.cpp b/hipify-clang/src/CUDA2HIP_SPARSE_API_functions.cpp index 0a3e8fbd02..bc8cfe46a5 100644 --- a/hipify-clang/src/CUDA2HIP_SPARSE_API_functions.cpp +++ b/hipify-clang/src/CUDA2HIP_SPARSE_API_functions.cpp @@ -581,7 +581,7 @@ const std::map CUDA_SPARSE_FUNCTION_MAP{ {"cusparseScsr2csr_compress", {"hipsparseScsr2csr_compress", "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}}, {"cusparseDcsr2csr_compress", {"hipsparseDcsr2csr_compress", "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}}, - {"cusparseDcsr2csr_compress", {"hipsparseDcsr2csr_compress", "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}}, + {"cusparseCcsr2csr_compress", {"hipsparseCcsr2csr_compress", "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}}, {"cusparseZcsr2csr_compress", {"hipsparseZcsr2csr_compress", "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}}, {"cusparseScsr2hyb", {"hipsparseScsr2hyb", "", CONV_LIB_FUNC, API_SPARSE}},