From 5495cd7892d1436c5a17680389c2f1dabaadf1c7 Mon Sep 17 00:00:00 2001 From: jujiang Date: Wed, 28 Feb 2024 14:38:33 -0500 Subject: [PATCH] SWDEV-444835 - Merge changes in hip made in 6.1- to staging Change-Id: I2ebebc7655f804a2192153ad1e07069ec2394c98 [ROCm/hip commit: 9eb37e9947ff630d623e0172dc4150a6d640280f] --- projects/hip/README.md | 2 +- projects/hip/docs/developer_guide/build.md | 2 +- projects/hip/docs/reference/deprecated_api_list.md | 12 ++++++------ projects/hip/docs/reference/kernel_language.md | 2 +- projects/hip/docs/user_guide/hip_rtc.md | 4 ++-- projects/hip/docs/user_guide/programming_manual.md | 4 ++-- projects/hip/include/hip/hip_runtime_api.h | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/hip/README.md b/projects/hip/README.md index 5f48696c42..fc93fe2c62 100644 --- a/projects/hip/README.md +++ b/projects/hip/README.md @@ -131,7 +131,7 @@ cd samples/01_Intro/square # follow README / blog steps to hipify the application. ``` -* Guide to [Porting a New Cuda Project](docs/user_guide/hip_porting_guide.md/"Porting a New CUDA Project") +* Guide to [Porting a New Cuda Project](https://rocm.docs.amd.com/projects/HIP/en/latest/user_guide/hip_porting_guide.html#porting-a-new-cuda-project) ## More Examples diff --git a/projects/hip/docs/developer_guide/build.md b/projects/hip/docs/developer_guide/build.md index 1ff7d4e2eb..bde86bb4e0 100755 --- a/projects/hip/docs/developer_guide/build.md +++ b/projects/hip/docs/developer_guide/build.md @@ -43,7 +43,7 @@ Similiar format for future branches. ### Get HIP source code A new repository 'hipother' is added in the ROCm 6.1 release, which is branched out from HIP. -The 'hipother'provides files required to support the HIP back-end implementation on some non-AMD platforms, like NVIDIA. +The 'hipother' provides files required to support the HIP back-end implementation on some non-AMD platforms, like NVIDIA. ```shell git clone -b "$ROCM_BRANCH" https://github.com/ROCm/clr.git diff --git a/projects/hip/docs/reference/deprecated_api_list.md b/projects/hip/docs/reference/deprecated_api_list.md index 82882297f7..5c91496094 100644 --- a/projects/hip/docs/reference/deprecated_api_list.md +++ b/projects/hip/docs/reference/deprecated_api_list.md @@ -57,16 +57,12 @@ Should use roctracer/rocTX instead ## HIP Texture Management APIs ### hipGetTextureReference +### hipGetTextureAlignmentOffset ### hipTexRefSetAddressMode ### hipTexRefSetArray ### hipTexRefSetFilterMode ### hipTexRefSetFlags ### hipTexRefSetFormat -### hipBindTexture -### hipBindTexture2D -### hipBindTextureToArray -### hipGetTextureAlignmentOffset -### hipUnbindTexture ### hipTexRefGetAddress ### hipTexRefGetAddressMode ### hipTexRefGetFilterMode @@ -85,6 +81,10 @@ Should use roctracer/rocTX instead ### hipTexRefSetMipmapLevelBias ### hipTexRefSetMipmapLevelClamp ### hipTexRefSetMipmappedArray -### hipBindTextureToMipmappedArray ### hipTexRefGetBorderColor ### hipTexRefGetArray +### hipBindTexture +### hipBindTexture2D +### hipBindTextureToArray +### hipUnbindTexture +### hipBindTextureToMipmappedArray diff --git a/projects/hip/docs/reference/kernel_language.md b/projects/hip/docs/reference/kernel_language.md index 9bcedbaf8d..3d66e63e69 100644 --- a/projects/hip/docs/reference/kernel_language.md +++ b/projects/hip/docs/reference/kernel_language.md @@ -681,7 +681,7 @@ Users need to include assert.h to use assert. For assert to work in both device HIP provides the function abort() which can be used to terminate the application when terminal failures are detected. It is implemented using the `__builtin_trap()` function. -This function produces the effects of using `asm("trap")` in the CUDA code. +This function produces a similar effect of using `asm("trap")` in the CUDA code. Note, in HIP, the function terminates the entire application, while in CUDA, `asm("trap")`only terminates the dispatch and the application continues to run. diff --git a/projects/hip/docs/user_guide/hip_rtc.md b/projects/hip/docs/user_guide/hip_rtc.md index 1749438e55..1a42ccc314 100644 --- a/projects/hip/docs/user_guide/hip_rtc.md +++ b/projects/hip/docs/user_guide/hip_rtc.md @@ -2,12 +2,12 @@ ## HIP RTC lib HIP allows you to compile kernels at runtime with its ```hiprtc*``` APIs. -Kernels can be store as a text string and can be passed on to HIPRTC APIs alongside options to guide the compilation. +Kernels can be stored as a text string and can be passed on to HIPRTC APIs alongside options to guide the compilation. NOTE: - This library can be used on systems without HIP install nor AMD GPU driver installed at all (offline compilation). Therefore it does not depend on any HIP runtime library. - - But it does depend on COMGr. We may try to statically link COMGr into HIPRTC to avoid any ambiguity. + - But it does depend on COMGr. You may try to statically link COMGr into HIPRTC to avoid any ambiguity. - Developers can decide to bundle this library with their application. ## Compile APIs diff --git a/projects/hip/docs/user_guide/programming_manual.md b/projects/hip/docs/user_guide/programming_manual.md index a6eacc778e..809d1ddc22 100644 --- a/projects/hip/docs/user_guide/programming_manual.md +++ b/projects/hip/docs/user_guide/programming_manual.md @@ -129,7 +129,7 @@ HIPRTC APIs accept HIP source files in character string format as input paramete For more details on HIPRTC APIs, refer to [HIP Runtime API Reference](https://rocm.docs.amd.com/projects/HIP/en/latest/doxygen/html/index.html). -For Linux developers, the link here (https://github.com/ROCm/hip-tests/blob/develop/samples/2_Cookbook/23_cmake_hiprtc/saxpy.cpp) shows an example how to program HIP application using runtime compilation mechanism, and detail HIPRTC programming guide is also available in Github (https://github.com/ROCm/HIP/blob/develop/docs/user_guide/hip_rtc.md). +For Linux developers, the link [here](https://github.com/ROCm/hip-tests/blob/develop/samples/2_Cookbook/23_cmake_hiprtc/saxpy.cpp) shows an example how to program HIP application using runtime compilation mechanism, and detail HIPRTC programming guide is also available in Github (https://github.com/ROCm/HIP/blob/develop/docs/user_guide/hip_rtc.md). ## HIP Graph HIP graph is supported. For more details, refer to the HIP API Guide. @@ -146,7 +146,7 @@ The per-thread default stream is a blocking stream and will synchronize with the The per-thread default stream can be enabled via adding a compilation option, "-fgpu-default-stream=per-thread". -And users can explicitly use "hipStreamPerThread" as per-thread default stream handle as input in API commands. There are test codes as examples in the link (https://github.com/ROCm/hip-tests/tree/develop/catch/unit/streamperthread). +And users can explicitly use "hipStreamPerThread" as per-thread default stream handle as input in API commands. There are test codes as examples in the [link](https://github.com/ROCm/hip-tests/tree/develop/catch/unit/streamperthread). ## Use of Long Double Type diff --git a/projects/hip/include/hip/hip_runtime_api.h b/projects/hip/include/hip/hip_runtime_api.h index 32ff70b84c..d6e794d6ae 100644 --- a/projects/hip/include/hip/hip_runtime_api.h +++ b/projects/hip/include/hip/hip_runtime_api.h @@ -578,7 +578,7 @@ enum hipGPUDirectRDMAWritesOrdering { #else // !defined(_MSC_VER) #define DEPRECATED(msg) __attribute__ ((deprecated(msg))) #endif // !defined(_MSC_VER) -#define DEPRECATED_MSG "This API is marked as deprecated and may not be supported in future releases. For more details please refer https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_deprecated_api_list.md" +#define DEPRECATED_MSG "This API is marked as deprecated and may not be supported in future releases. For more details please refer https://github.com/ROCm/HIP/blob/develop/docs/reference/deprecated_api_list.md" #define HIP_LAUNCH_PARAM_BUFFER_POINTER ((void*)0x01) #define HIP_LAUNCH_PARAM_BUFFER_SIZE ((void*)0x02) #define HIP_LAUNCH_PARAM_END ((void*)0x03) @@ -4093,7 +4093,7 @@ hipError_t hipGetProcAddress(const char* symbol, void** pfn, int hipVersion, ui * Note that the symbol name needs to be encased in the HIP_SYMBOL macro. * This also applies to hipMemcpyFromSymbol, hipGetSymbolAddress, and hipGetSymbolSize. * For detail usage, see the example at - * https://github.com/ROCm-Developer-Tools/HIP/blob/rocm-5.0.x/docs/markdown/hip_porting_guide.md + * https://github.com/ROCm/HIP/blob/develop/docs/user_guide/hip_porting_guide.md * * @param[out] symbol pointer to the device symbole * @param[in] src pointer to the source address