Skip to content

Commit

Permalink
SWDEV-500605 - Update for document for 6.3.1
Browse files Browse the repository at this point in the history
Change-Id: I5cbb8ca5745c77ae877101ac76921e59dd221dee
  • Loading branch information
jujiang-del committed Jan 7, 2025
1 parent 92e5b0c commit 4f263b6
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ HIP C++ code can be compiled with either,
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
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
profiler and debugger.
* 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,
* 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,
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.
HIP developers on ROCm can use AMD's [ROCgdb](https://github.com/ROCm/ROCgdb) for debugging and profiling.

Expand Down
2 changes: 1 addition & 1 deletion docs/how-to/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ NOTE: If HIP_ROCCLR_HOME is set, there is no need to set HIP_CLANG_PATH since hi

## What is AMD clr?

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,
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,

* hipamd - contains implementation of HIP language for AMD GPU.
* rocclr - contains virtual device interfaces that compute runtimes interact with backends, such as ROCr on Linux and PAL on Windows.
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to/hip_porting_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ HIP_PATH ?= $(shell hipconfig --path)
HIP can depend on rocclr, or CUDA as runtime
* AMD platform
On AMD platform, HIP uses Radeon Open Compute Common Language Runtime, called ROCclr.
On AMD platform, HIP uses ROCm Compute Language Runtime, called ROCclr.
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.
* NVIDIA platform
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ For HIP supported AMD GPUs on multiple operating systems, see:

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

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,
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.

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.

Expand Down
4 changes: 2 additions & 2 deletions docs/install/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ Set the repository branch using the variable: ``ROCM_BRANCH``. For example, for
git clone -b "$ROCM_BRANCH" https://github.com/ROCm/clr.git
git clone -b "$ROCM_BRANCH" https://github.com/ROCm/hip.git
CLR (Common Language Runtime) repository includes ROCclr, HIPAMD and OpenCL.
CLR (Compute Language Runtime) repository includes ROCclr, HIPAMD and OpenCL.

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

HIPAMD provides implementation specifically for HIP on the AMD platform.
Expand Down
4 changes: 2 additions & 2 deletions docs/understand/amd_clr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.. _AMD_Compute_Language_Runtimes:

*******************************************************************************
AMD Common Language Runtimes (CLR)
AMD compute language runtime (CLR)
*******************************************************************************

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

* ``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>`_.

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


How to build/install
Expand Down
2 changes: 1 addition & 1 deletion docs/understand/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The default device can be set with `hipSetDevice`.

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

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

* `hipamd`: contains implementation of HIP language on AMD platform.
Expand Down
56 changes: 27 additions & 29 deletions include/hip/hip_runtime_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@ hipError_t hipExternalMemoryGetMappedMipmappedArray(hipMipmappedArray_t* mipmap,
*
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
*
* @return #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
* @returns #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
*
* @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray,
* hipHostFree, hipHostMalloc
Expand All @@ -3150,7 +3150,7 @@ hipError_t hipMalloc(void** ptr, size_t size);
* #hipDeviceMallocFinegrained, #hipDeviceMallocUncached, or #hipMallocSignalMemory.
* If the flag is any other value, the API returns #hipErrorInvalidValue.
*
* @return #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
* @returns #hipSuccess, #hipErrorOutOfMemory, #hipErrorInvalidValue (bad context, null *ptr)
*
* @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray,
* hipHostFree, hipHostMalloc
Expand All @@ -3176,7 +3176,7 @@ hipError_t hipExtMallocWithFlags(void** ptr, size_t sizeBytes, unsigned int flag
*
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
*
* @return #hipSuccess, #hipErrorOutOfMemory
* @returns #hipSuccess, #hipErrorOutOfMemory
*
* @warning This API is deprecated, use hipHostMalloc() instead
*/
Expand All @@ -3190,7 +3190,7 @@ hipError_t hipMallocHost(void** ptr, size_t size);
*
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
*
* @return #hipSuccess, #hipErrorOutOfMemory
* @returns #hipSuccess, #hipErrorOutOfMemory
*
* @warning This API is deprecated, use hipHostMalloc() instead
*/
Expand Down Expand Up @@ -3832,7 +3832,7 @@ hipError_t hipHostGetDevicePointer(void** devPtr, void* hstPtr, unsigned int fla
*
* @param[out] flagsPtr Memory location to store flags
* @param[in] hostPtr Host Pointer allocated through hipHostMalloc
* @return #hipSuccess, #hipErrorInvalidValue
* @returns #hipSuccess, #hipErrorInvalidValue
*
* @see hipHostMalloc
*/
Expand All @@ -3854,7 +3854,7 @@ hipError_t hipHostGetFlags(unsigned int* flagsPtr, void* hostPtr);
*
* After registering the memory, use #hipHostGetDevicePointer to obtain the mapped device pointer.
* On many systems, the mapped device pointer will have a different value than the mapped host
* pointer. Applications must use the device pointer in device code, and the host pointer in device
* pointer. Applications must use the device pointer in device code, and the host pointer in host
* code.
*
* On some systems, registered memory is pinned. On some systems, registered memory may not be
Expand All @@ -3869,7 +3869,7 @@ hipError_t hipHostGetFlags(unsigned int* flagsPtr, void* hostPtr);
* typically one of the writes will "win" and overwrite data from the other registered memory
* region.
*
* @return #hipSuccess, #hipErrorOutOfMemory
* @returns #hipSuccess, #hipErrorOutOfMemory
*
* @see hipHostUnregister, hipHostGetFlags, hipHostGetDevicePointer
*/
Expand All @@ -3878,7 +3878,7 @@ hipError_t hipHostRegister(void* hostPtr, size_t sizeBytes, unsigned int flags);
* @brief Un-register host pointer
*
* @param[in] hostPtr Host pointer previously registered with #hipHostRegister
* @return Error code
* @returns Error code
*
* @see hipHostRegister
*/
Expand All @@ -3896,7 +3896,7 @@ hipError_t hipHostUnregister(void* hostPtr);
*
* If size is 0, no memory is allocated, *ptr returns nullptr, and hipSuccess is returned.
*
* @return Error code
* @returns Error code
*
* @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
* hipMalloc3DArray, hipHostMalloc
Expand All @@ -3919,7 +3919,7 @@ hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height
* Given the row and column of an array element of type T, the address is computed as:
* T* pElement = (T*)((char*)BaseAddress + Row * Pitch) + Column;
*
* @return Error code
* @returns Error code
*
* @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
* hipMalloc3DArray, hipHostMalloc
Expand All @@ -3932,8 +3932,8 @@ hipError_t hipMemAllocPitch(hipDeviceptr_t* dptr, size_t* pitch, size_t widthInB
* If pointer is NULL, the hip runtime is initialized and hipSuccess is returned.
*
* @param[in] ptr Pointer to memory to be freed
* @return #hipSuccess
* @return #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated
* @returns #hipSuccess
* @returns #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated
* with hipHostMalloc)
*
* @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D,
Expand All @@ -3945,10 +3945,8 @@ hipError_t hipFree(void* ptr);
* This API performs an implicit hipDeviceSynchronize() call.
* If pointer is NULL, the hip runtime is initialized and hipSuccess is returned.
*
* @ingroup MemoryD
*
* @param[in] ptr Pointer to memory to be freed
* @return #hipSuccess,
* @returns #hipSuccess,
* #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated
* with hipMalloc)
*
Expand All @@ -3962,7 +3960,7 @@ hipError_t hipFreeHost(void* ptr);
* @ingroup MemoryD
*
* @param[in] ptr Pointer to memory to be freed
* @return #hipSuccess,
* @returns #hipSuccess,
* #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated with
* hipMalloc)
*
Expand Down Expand Up @@ -3990,7 +3988,7 @@ hipError_t hipHostFree(void* ptr);
* @param[in] src Data being copy from
* @param[in] sizeBytes Data size in bytes
* @param[in] kind Kind of transfer
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown
* @returns #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
* hipMemAllocPitch, hipMemcpy2D, hipMemcpy2DAsync, hipMemcpy2DUnaligned, hipMemcpyAtoA,
Expand All @@ -4009,7 +4007,7 @@ hipError_t hipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind
* @param[in] sizeBytes Data size in bytes
* @param[in] kind Kind of transfer
* @param[in] stream Valid stream
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown, #hipErrorContextIsDestroyed
* @returns #hipSuccess, #hipErrorInvalidValue, #hipErrorUnknown, #hipErrorContextIsDestroyed
*
* @see hipMemcpy, hipStreamCreate, hipStreamSynchronize, hipStreamDestroy, hipSetDevice, hipLaunchKernelGGL
*
Expand All @@ -4023,7 +4021,7 @@ hipError_t hipMemcpyWithStream(void* dst, const void* src, size_t sizeBytes,
* @param[in] src Data being copy from
* @param[in] sizeBytes Data size in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4041,7 +4039,7 @@ hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, void* src, size_t sizeBytes);
* @param[in] src Data being copy from
* @param[in] sizeBytes Data size in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4059,7 +4057,7 @@ hipError_t hipMemcpyDtoH(void* dst, hipDeviceptr_t src, size_t sizeBytes);
* @param[in] src Data being copy from
* @param[in] sizeBytes Data size in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4078,7 +4076,7 @@ hipError_t hipMemcpyDtoD(hipDeviceptr_t dst, hipDeviceptr_t src, size_t sizeByte
* @param[in] srcOffset Offset in bytes of source array
* @param[in] ByteCount Size of memory copy in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4098,7 +4096,7 @@ hipError_t hipMemcpyAtoD(hipDeviceptr_t dstDevice, hipArray_t srcArray, size_t s
* @param[in] srcDevice Source device pointer
* @param[in] ByteCount Size of memory copy in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4120,7 +4118,7 @@ hipError_t hipMemcpyDtoA(hipArray_t dstArray, size_t dstOffset, hipDeviceptr_t s
* @param[in] srcOffset Offset in bytes of source array
* @param[in] ByteCount Size of memory copy in bytes
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4140,7 +4138,7 @@ hipError_t hipMemcpyAtoA(hipArray_t dstArray, size_t dstOffset, hipArray_t srcAr
* @param[in] sizeBytes Data size in bytes
* @param[in] stream Stream identifier
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4159,7 +4157,7 @@ hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, void* src, size_t sizeBytes, h
* @param[in] sizeBytes Data size in bytes
* @param[in] stream Stream identifier
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4178,7 +4176,7 @@ hipError_t hipMemcpyDtoHAsync(void* dst, hipDeviceptr_t src, size_t sizeBytes, h
* @param[in] sizeBytes Data size in bytes
* @param[in] stream Stream identifier
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4199,7 +4197,7 @@ hipError_t hipMemcpyDtoDAsync(hipDeviceptr_t dst, hipDeviceptr_t src, size_t siz
* @param[in] ByteCount Size of memory copy in bytes
* @param[in] stream Stream identifier
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand All @@ -4220,7 +4218,7 @@ hipError_t hipMemcpyAtoHAsync(void* dstHost, hipArray_t srcArray, size_t srcOffs
* @param[in] ByteCount Size of memory copy in bytes
* @param[in] stream Stream identifier
*
* @return #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* @returns #hipSuccess, #hipErrorDeinitialized, #hipErrorNotInitialized, #hipErrorInvalidContext,
* #hipErrorInvalidValue
*
* @see hipArrayCreate, hipArrayDestroy, hipArrayGetDescriptor, hipMemAlloc, hipMemAllocHost,
Expand Down

0 comments on commit 4f263b6

Please sign in to comment.