Skip to content

Commit 4f263b6

Browse files
committed
SWDEV-500605 - Update for document for 6.3.1
Change-Id: I5cbb8ca5745c77ae877101ac76921e59dd221dee
1 parent 92e5b0c commit 4f263b6

File tree

8 files changed

+36
-38
lines changed

8 files changed

+36
-38
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ HIP C++ code can be compiled with either,
115115
functions and thus has very low overhead - developers coding in HIP should expect the same performance as coding in native CUDA. The code is then
116116
compiled with nvcc, the standard C++ compiler provided with the CUDA SDK. Developers can use any tools supported by the CUDA SDK including the CUDA
117117
profiler and debugger.
118-
* On the AMD ROCm platform, HIP provides a header and runtime library built on top of HIP-Clang compiler in the repository [Common Language Runtime (CLR)](https://github.com/ROCm/clr). The HIP runtime implements HIP streams, events, and memory APIs,
118+
* On the AMD ROCm platform, HIP provides a header and runtime library built on top of HIP-Clang compiler in the repository [Compute Language Runtime (CLR)](https://github.com/ROCm/clr). The HIP runtime implements HIP streams, events, and memory APIs,
119119
and is a object library that is linked with the application. The source code for all headers and the library implementation is available on GitHub.
120120
HIP developers on ROCm can use AMD's [ROCgdb](https://github.com/ROCm/ROCgdb) for debugging and profiling.
121121

docs/how-to/faq.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ NOTE: If HIP_ROCCLR_HOME is set, there is no need to set HIP_CLANG_PATH since hi
162162

163163
## What is AMD clr?
164164

165-
AMD [Common Language Runtime (CLR)](https://github.com/ROCm/clr) is a repository for the AMD platform, which contains source codes for AMD's compute languages runtimes as follows,
165+
AMD [Compute Language Runtime (CLR)](https://github.com/ROCm/clr) is a repository for the AMD platform, which contains source codes for AMD's compute languages runtimes as follows,
166166

167167
* hipamd - contains implementation of HIP language for AMD GPU.
168168
* rocclr - contains virtual device interfaces that compute runtimes interact with backends, such as ROCr on Linux and PAL on Windows.

docs/how-to/hip_porting_guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ HIP_PATH ?= $(shell hipconfig --path)
252252
HIP can depend on rocclr, or CUDA as runtime
253253
254254
* AMD platform
255-
On AMD platform, HIP uses Radeon Open Compute Common Language Runtime, called ROCclr.
255+
On AMD platform, HIP uses ROCm Compute Language Runtime, called ROCclr.
256256
ROCclr is a virtual device interface that HIP runtimes interact with different backends which allows runtimes to work on Linux , as well as Windows without much efforts.
257257
258258
* NVIDIA platform

docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For HIP supported AMD GPUs on multiple operating systems, see:
1111

1212
The CUDA enabled NVIDIA GPUs are supported by HIP. For more information, see [GPU Compute Capability](https://developer.nvidia.com/cuda-gpus).
1313

14-
On the AMD ROCm platform, HIP provides header files and runtime library built on top of HIP-Clang compiler in the repository [Common Language Runtime (CLR)](./understand/amd_clr), which contains source codes for AMD's compute languages runtimes as follows,
14+
On the AMD ROCm platform, HIP provides header files and runtime library built on top of HIP-Clang compiler in the repository [Compute Language Runtime (CLR)](./understand/amd_clr), which contains source codes for AMD's compute languages runtimes.
1515

1616
On non-AMD platforms, like NVIDIA, HIP provides header files required to support non-AMD specific back-end implementation in the repository ['hipother'](https://github.com/ROCm/hipother), which translates from the HIP runtime APIs to CUDA runtime APIs.
1717

docs/install/build.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ Set the repository branch using the variable: ``ROCM_BRANCH``. For example, for
6060
git clone -b "$ROCM_BRANCH" https://github.com/ROCm/clr.git
6161
git clone -b "$ROCM_BRANCH" https://github.com/ROCm/hip.git
6262
63-
CLR (Common Language Runtime) repository includes ROCclr, HIPAMD and OpenCL.
63+
CLR (Compute Language Runtime) repository includes ROCclr, HIPAMD and OpenCL.
6464

65-
ROCclr (Radeon Open Compute Common Language Runtime) is a virtual device interface which
65+
ROCclr (ROCm Compute Language Runtime) is a virtual device interface which
6666
is defined on the AMD platform. HIP runtime uses ROCclr to interact with different backends.
6767

6868
HIPAMD provides implementation specifically for HIP on the AMD platform.

docs/understand/amd_clr.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.. _AMD_Compute_Language_Runtimes:
66

77
*******************************************************************************
8-
AMD Common Language Runtimes (CLR)
8+
AMD compute language runtime (CLR)
99
*******************************************************************************
1010

1111
CLR contains source codes for AMD's compute languages runtimes: ``HIP`` and ``OpenCL™``.
@@ -23,7 +23,7 @@ CLR includes the following source code,
2323

2424
* ``opencl`` - contains implementation of `OpenCL™ <https://www.khronos.org/opencl/>`_ on AMD platform. It is hosted at `clr/opencl <https://github.com/ROCm/clr/tree/develop/opencl>`_.
2525

26-
* ``rocclr`` - contains common runtime used in `HIP` and `OpenCL™`. This is hosted at `clr/rocclr <https://github.com/ROCm/clr/tree/develop/rocclr>`_.
26+
* ``rocclr`` - contains ROCm compute runtime used in `HIP` and `OpenCL™`. This is hosted at `clr/rocclr <https://github.com/ROCm/clr/tree/develop/rocclr>`_.
2727

2828

2929
How to build/install

docs/understand/glossary.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The default device can be set with `hipSetDevice`.
1010

1111
* **HIP-Clang** - Heterogeneous AMDGPU Compiler, with its capability to compile HIP programs on AMD platform (https://github.com/RadeonOpenCompute/llvm-project).
1212

13-
* **clr** - a repository for AMD Common Language Runtime, contains source codes for AMD's compute languages runtimes: HIP and OpenCL.
13+
* **clr** - a repository for AMD Compute Language Runtime, contains source codes for AMD's compute languages runtimes: HIP and OpenCL.
1414
clr (https://github.com/ROCm/clr) contains the following three parts,
1515

1616
* `hipamd`: contains implementation of HIP language on AMD platform.

include/hip/hip_runtime_api.h

+27-29
Original file line numberDiff line numberDiff line change
@@ -3130,7 +3130,7 @@ hipError_t hipExternalMemoryGetMappedMipmappedArray(hipMipmappedArray_t* mipmap,
31303130
*
31313131
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
31323132
*
3133-
* @return #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
3133+
* @returns #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
31343134
*
31353135
* @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray,
31363136
* hipHostFree, hipHostMalloc
@@ -3150,7 +3150,7 @@ hipError_t hipMalloc(void** ptr, size_t size);
31503150
* #hipDeviceMallocFinegrained, #hipDeviceMallocUncached, or #hipMallocSignalMemory.
31513151
* If the flag is any other value, the API returns #hipErrorInvalidValue.
31523152
*
3153-
* @return #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
3153+
* @returns #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
31543154
*
31553155
* @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray,
31563156
* hipHostFree, hipHostMalloc
@@ -3176,7 +3176,7 @@ hipError_t hipExtMallocWithFlags(void** ptr, size_t sizeBytes, unsigned int flag
31763176
*
31773177
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
31783178
*
3179-
* @return #hipSuccess, #hipErrorOutOfMemory
3179+
* @returns #hipSuccess, #hipErrorOutOfMemory
31803180
*
31813181
* @warning This API is deprecated, use hipHostMalloc() instead
31823182
*/
@@ -3190,7 +3190,7 @@ hipError_t hipMallocHost(void** ptr, size_t size);
31903190
*
31913191
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
31923192
*
3193-
* @return #hipSuccess, #hipErrorOutOfMemory
3193+
* @returns #hipSuccess, #hipErrorOutOfMemory
31943194
*
31953195
* @warning This API is deprecated, use hipHostMalloc() instead
31963196
*/
@@ -3832,7 +3832,7 @@ hipError_t hipHostGetDevicePointer(void** devPtr, void* hstPtr, unsigned int fla
38323832
*
38333833
* @param[out] flagsPtr Memory location to store flags
38343834
* @param[in] hostPtr Host Pointer allocated through hipHostMalloc
3835-
* @return #hipSuccess, #hipErrorInvalidValue
3835+
* @returns #hipSuccess, #hipErrorInvalidValue
38363836
*
38373837
* @see hipHostMalloc
38383838
*/
@@ -3854,7 +3854,7 @@ hipError_t hipHostGetFlags(unsigned int* flagsPtr, void* hostPtr);
38543854
*
38553855
* After registering the memory, use #hipHostGetDevicePointer to obtain the mapped device pointer.
38563856
* On many systems, the mapped device pointer will have a different value than the mapped host
3857-
* pointer. Applications must use the device pointer in device code, and the host pointer in device
3857+
* pointer. Applications must use the device pointer in device code, and the host pointer in host
38583858
* code.
38593859
*
38603860
* On some systems, registered memory is pinned. On some systems, registered memory may not be
@@ -3869,7 +3869,7 @@ hipError_t hipHostGetFlags(unsigned int* flagsPtr, void* hostPtr);
38693869
* typically one of the writes will "win" and overwrite data from the other registered memory
38703870
* region.
38713871
*
3872-
* @return #hipSuccess, #hipErrorOutOfMemory
3872+
* @returns #hipSuccess, #hipErrorOutOfMemory
38733873
*
38743874
* @see hipHostUnregister, hipHostGetFlags, hipHostGetDevicePointer
38753875
*/
@@ -3878,7 +3878,7 @@ hipError_t hipHostRegister(void* hostPtr, size_t sizeBytes, unsigned int flags);
38783878
* @brief Un-register host pointer
38793879
*
38803880
* @param[in] hostPtr Host pointer previously registered with #hipHostRegister
3881-
* @return Error code
3881+
* @returns Error code
38823882
*
38833883
* @see hipHostRegister
38843884
*/
@@ -3896,7 +3896,7 @@ hipError_t hipHostUnregister(void* hostPtr);
38963896
*
38973897
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
38983898
*
3899-
* @return Error code
3899+
* @returns Error code
39003900
*
39013901
* @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
39023902
* hipMalloc3DArray, hipHostMalloc
@@ -3919,7 +3919,7 @@ hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height
39193919
* Given the row and column of an array element of type T, the address is computed as:
39203920
* T* pElement = (T*)((char*)BaseAddress + Row * Pitch) + Column;
39213921
*
3922-
* @return Error code
3922+
* @returns Error code
39233923
*
39243924
* @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
39253925
* hipMalloc3DArray, hipHostMalloc
@@ -3932,8 +3932,8 @@ hipError_t hipMemAllocPitch(hipDeviceptr_t* dptr, size_t* pitch, size_t widthInB
39323932
* If pointer is NULL, the hip runtime is initialized and hipSuccess is returned.
39333933
*
39343934
* @param[in] ptr Pointer to memory to be freed
3935-
* @return #hipSuccess
3936-
* @return #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated
3935+
* @returns #hipSuccess
3936+
* @returns #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated
39373937
* with hipHostMalloc)
39383938
*
39393939
* @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
@@ -3945,10 +3945,8 @@ hipError_t hipFree(void* ptr);
39453945
* This API performs an implicit hipDeviceSynchronize() call.
39463946
* If pointer is NULL, the hip runtime is initialized and hipSuccess is returned.
39473947
*
3948-
* @ingroup MemoryD
3949-
*
39503948
* @param[in] ptr Pointer to memory to be freed
3951-
* @return #hipSuccess,
3949+
* @returns #hipSuccess,
39523950
* #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated
39533951
* with hipMalloc)
39543952
*
@@ -3962,7 +3960,7 @@ hipError_t hipFreeHost(void* ptr);
39623960
* @ingroup MemoryD
39633961
*
39643962
* @param[in] ptr Pointer to memory to be freed
3965-
* @return #hipSuccess,
3963+
* @returns #hipSuccess,
39663964
* #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated with
39673965
* hipMalloc)
39683966
*
@@ -3990,7 +3988,7 @@ hipError_t hipHostFree(void* ptr);
39903988
* @param[in] src Data being copy from
39913989
* @param[in] sizeBytes Data size in bytes
39923990
* @param[in] kind Kind of transfer
3993-
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown
3991+
* @returns #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown
39943992
*
39953993
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
39963994
* hipMemAllocPitch, hipMemcpy2D, hipMemcpy2DAsync, hipMemcpy2DUnaligned, hipMemcpyAtoA,
@@ -4009,7 +4007,7 @@ hipError_t hipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind
40094007
* @param[in] sizeBytes Data size in bytes
40104008
* @param[in] kind Kind of transfer
40114009
* @param[in] stream Valid stream
4012-
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown, #hipErrorContextIsDestroyed
4010+
* @returns #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown, #hipErrorContextIsDestroyed
40134011
*
40144012
* @see hipMemcpy, hipStreamCreate, hipStreamSynchronize, hipStreamDestroy, hipSetDevice, hipLaunchKernelGGL
40154013
*
@@ -4023,7 +4021,7 @@ hipError_t hipMemcpyWithStream(void* dst, const void* src, size_t sizeBytes,
40234021
* @param[in] src Data being copy from
40244022
* @param[in] sizeBytes Data size in bytes
40254023
*
4026-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4024+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
40274025
* #hipErrorInvalidValue
40284026
*
40294027
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4041,7 +4039,7 @@ hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, void* src, size_t sizeBytes);
40414039
* @param[in] src Data being copy from
40424040
* @param[in] sizeBytes Data size in bytes
40434041
*
4044-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4042+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
40454043
* #hipErrorInvalidValue
40464044
*
40474045
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4059,7 +4057,7 @@ hipError_t hipMemcpyDtoH(void* dst, hipDeviceptr_t src, size_t sizeBytes);
40594057
* @param[in] src Data being copy from
40604058
* @param[in] sizeBytes Data size in bytes
40614059
*
4062-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4060+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
40634061
* #hipErrorInvalidValue
40644062
*
40654063
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4078,7 +4076,7 @@ hipError_t hipMemcpyDtoD(hipDeviceptr_t dst, hipDeviceptr_t src, size_t sizeByte
40784076
* @param[in] srcOffset Offset in bytes of source array
40794077
* @param[in] ByteCount Size of memory copy in bytes
40804078
*
4081-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4079+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
40824080
* #hipErrorInvalidValue
40834081
*
40844082
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4098,7 +4096,7 @@ hipError_t hipMemcpyAtoD(hipDeviceptr_t dstDevice, hipArray_t srcArray, size_t s
40984096
* @param[in] srcDevice Source device pointer
40994097
* @param[in] ByteCount Size of memory copy in bytes
41004098
*
4101-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4099+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
41024100
* #hipErrorInvalidValue
41034101
*
41044102
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4120,7 +4118,7 @@ hipError_t hipMemcpyDtoA(hipArray_t dstArray, size_t dstOffset, hipDeviceptr_t s
41204118
* @param[in] srcOffset Offset in bytes of source array
41214119
* @param[in] ByteCount Size of memory copy in bytes
41224120
*
4123-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4121+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
41244122
* #hipErrorInvalidValue
41254123
*
41264124
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4140,7 +4138,7 @@ hipError_t hipMemcpyAtoA(hipArray_t dstArray, size_t dstOffset, hipArray_t srcAr
41404138
* @param[in] sizeBytes Data size in bytes
41414139
* @param[in] stream Stream identifier
41424140
*
4143-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4141+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
41444142
* #hipErrorInvalidValue
41454143
*
41464144
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4159,7 +4157,7 @@ hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, void* src, size_t sizeBytes, h
41594157
* @param[in] sizeBytes Data size in bytes
41604158
* @param[in] stream Stream identifier
41614159
*
4162-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4160+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
41634161
* #hipErrorInvalidValue
41644162
*
41654163
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4178,7 +4176,7 @@ hipError_t hipMemcpyDtoHAsync(void* dst, hipDeviceptr_t src, size_t sizeBytes, h
41784176
* @param[in] sizeBytes Data size in bytes
41794177
* @param[in] stream Stream identifier
41804178
*
4181-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4179+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
41824180
* #hipErrorInvalidValue
41834181
*
41844182
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4199,7 +4197,7 @@ hipError_t hipMemcpyDtoDAsync(hipDeviceptr_t dst, hipDeviceptr_t src, size_t siz
41994197
* @param[in] ByteCount Size of memory copy in bytes
42004198
* @param[in] stream Stream identifier
42014199
*
4202-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4200+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
42034201
* #hipErrorInvalidValue
42044202
*
42054203
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
@@ -4220,7 +4218,7 @@ hipError_t hipMemcpyAtoHAsync(void* dstHost, hipArray_t srcArray, size_t srcOffs
42204218
* @param[in] ByteCount Size of memory copy in bytes
42214219
* @param[in] stream Stream identifier
42224220
*
4223-
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
4221+
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
42244222
* #hipErrorInvalidValue
42254223
*
42264224
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,

0 commit comments

Comments
 (0)