diff --git a/include/hip/hcc_detail/macro_based_grid_launch.hpp b/include/hip/hcc_detail/macro_based_grid_launch.hpp index ca52e5b614..96d449b213 100644 --- a/include/hip/hcc_detail/macro_based_grid_launch.hpp +++ b/include/hip/hcc_detail/macro_based_grid_launch.hpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "helpers.hpp" #include "hc.hpp" -#include "hip/hip_hcc.h" +#include "hip/hip_ext.h" #include "hip_runtime.h" #include @@ -795,4 +795,4 @@ requires(Domain == {Ts...}) inline std::enable_if_t< hipLaunchKernelGGL(kernel_name, num_blocks, dim_blocks, group_mem_bytes, stream, \ hipLaunchParm{}, ##__VA_ARGS__); \ } while (0) -} // namespace hip_impl \ No newline at end of file +} // namespace hip_impl diff --git a/include/hip/hip_ext.h b/include/hip/hip_ext.h new file mode 100644 index 0000000000..3df911ee7a --- /dev/null +++ b/include/hip/hip_ext.h @@ -0,0 +1,118 @@ +/* +Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +#ifndef HIP_INCLUDE_HIP_HIP_EXT_H +#define HIP_INCLUDE_HIP_HIP_EXT_H +#include "hip/hip_runtime_api.h" +#ifdef __HCC__ + +// Forward declarations: +namespace hc { +class accelerator; +class accelerator_view; +}; // namespace hc + + +/** + *------------------------------------------------------------------------------------------------- + *------------------------------------------------------------------------------------------------- + * @defgroup HCC-specific features + * @warning These APIs provide access to special features of HCC compiler and are not available + *through the CUDA path. + * @{ + */ + + +/** + * @brief Return hc::accelerator associated with the specified deviceId + * @return #hipSuccess, #hipErrorInvalidDevice + */ +HIP_PUBLIC_API +hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator* acc); + +/** + * @brief Return hc::accelerator_view associated with the specified stream + * + * If stream is 0, the accelerator_view for the default stream is returned. + * @return #hipSuccess + */ +HIP_PUBLIC_API +hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view** av); + +#endif // #ifdef __HCC__ + + +/** + * @brief launches kernel f with launch parameters and shared memory on stream with arguments passed + to kernelparams or extra + * + * @param [in[ f Kernel to launch. + * @param [in] gridDimX X grid dimension specified in work-items + * @param [in] gridDimY Y grid dimension specified in work-items + * @param [in] gridDimZ Z grid dimension specified in work-items + * @param [in] blockDimX X block dimensions specified in work-items + * @param [in] blockDimY Y grid dimension specified in work-items + * @param [in] blockDimZ Z grid dimension specified in work-items + * @param [in] sharedMemBytes Amount of dynamic shared memory to allocate for this kernel. The + kernel can access this with HIP_DYNAMIC_SHARED. + * @param [in] stream Stream where the kernel should be dispatched. May be 0, in which case th + default stream is used with associated synchronization rules. + * @param [in] kernelParams + * @param [in] extra Pointer to kernel arguments. These are passed directly to the kernel and + must be in the memory layout and alignment expected by the kernel. + * @param [in] startEvent If non-null, specified event will be updated to track the start time of + the kernel launch. The event must be created before calling this API. + * @param [in] stopEvent If non-null, specified event will be updated to track the stop time of + the kernel launch. The event must be created before calling this API. + * + * @returns hipSuccess, hipInvalidDevice, hipErrorNotInitialized, hipErrorInvalidValue + * + * @warning kernellParams argument is not yet implemented in HIP. Please use extra instead. Please + refer to hip_porting_driver_api.md for sample usage. + + * HIP/ROCm actually updates the start event when the associated kernel completes. + */ +HIP_PUBLIC_API +hipError_t hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, + uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, + uint32_t localWorkSizeX, uint32_t localWorkSizeY, + uint32_t localWorkSizeZ, size_t sharedMemBytes, + hipStream_t hStream, void** kernelParams, void** extra, + hipEvent_t startEvent = nullptr, + hipEvent_t stopEvent = nullptr, + uint32_t flags = 0); + +HIP_PUBLIC_API +hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, + uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, + uint32_t localWorkSizeX, uint32_t localWorkSizeY, + uint32_t localWorkSizeZ, size_t sharedMemBytes, + hipStream_t hStream, void** kernelParams, void** extra, + hipEvent_t startEvent = nullptr, + hipEvent_t stopEvent = nullptr) + __attribute__((deprecated("use hipExtModuleLaunchKernel instead"))); + +// doxygen end AMD-specific features +/** + * @} + */ +#endif // #ifdef HIP_INCLUDE_HIP_HIP_EXT_H diff --git a/include/hip/hip_hcc.h b/include/hip/hip_hcc.h index a82a8c622b..e7e27fc721 100644 --- a/include/hip/hip_hcc.h +++ b/include/hip/hip_hcc.h @@ -1,16 +1,13 @@ /* Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved. - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,98 +19,6 @@ THE SOFTWARE. #ifndef HIP_INCLUDE_HIP_HIP_HCC_H #define HIP_INCLUDE_HIP_HIP_HCC_H - -#ifdef __HCC__ - -#include "hip/hip_runtime_api.h" - -// Forward declarations: -namespace hc { -class accelerator; -class accelerator_view; -}; // namespace hc - - -/** - *------------------------------------------------------------------------------------------------- - *------------------------------------------------------------------------------------------------- - * @defgroup HCC-specific features - * @warning These APIs provide access to special features of HCC compiler and are not available - *through the CUDA path. - * @{ - */ - - -/** - * @brief Return hc::accelerator associated with the specified deviceId - * @return #hipSuccess, #hipErrorInvalidDevice - */ -HIP_PUBLIC_API -hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator* acc); - -/** - * @brief Return hc::accelerator_view associated with the specified stream - * - * If stream is 0, the accelerator_view for the default stream is returned. - * @return #hipSuccess - */ -HIP_PUBLIC_API -hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view** av); - - -/** - * @brief launches kernel f with launch parameters and shared memory on stream with arguments passed - to kernelparams or extra - * - * @param [in[ f Kernel to launch. - * @param [in] gridDimX X grid dimension specified in work-items - * @param [in] gridDimY Y grid dimension specified in work-items - * @param [in] gridDimZ Z grid dimension specified in work-items - * @param [in] blockDimX X block dimensions specified in work-items - * @param [in] blockDimY Y grid dimension specified in work-items - * @param [in] blockDimZ Z grid dimension specified in work-items - * @param [in] sharedMemBytes Amount of dynamic shared memory to allocate for this kernel. The - kernel can access this with HIP_DYNAMIC_SHARED. - * @param [in] stream Stream where the kernel should be dispatched. May be 0, in which case th - default stream is used with associated synchronization rules. - * @param [in] kernelParams - * @param [in] extra Pointer to kernel arguments. These are passed directly to the kernel and - must be in the memory layout and alignment expected by the kernel. - * @param [in] startEvent If non-null, specified event will be updated to track the start time of - the kernel launch. The event must be created before calling this API. - * @param [in] stopEvent If non-null, specified event will be updated to track the stop time of - the kernel launch. The event must be created before calling this API. - * - * @returns hipSuccess, hipInvalidDevice, hipErrorNotInitialized, hipErrorInvalidValue - * - * @warning kernellParams argument is not yet implemented in HIP. Please use extra instead. Please - refer to hip_porting_driver_api.md for sample usage. - - * HIP/ROCm actually updates the start event when the associated kernel completes. - */ -HIP_PUBLIC_API -hipError_t hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, - uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, - uint32_t localWorkSizeX, uint32_t localWorkSizeY, - uint32_t localWorkSizeZ, size_t sharedMemBytes, - hipStream_t hStream, void** kernelParams, void** extra, - hipEvent_t startEvent = nullptr, - hipEvent_t stopEvent = nullptr, - uint32_t flags = 0); - -HIP_PUBLIC_API -hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, - uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, - uint32_t localWorkSizeX, uint32_t localWorkSizeY, - uint32_t localWorkSizeZ, size_t sharedMemBytes, - hipStream_t hStream, void** kernelParams, void** extra, - hipEvent_t startEvent = nullptr, - hipEvent_t stopEvent = nullptr) - __attribute__((deprecated("use hipExtModuleLaunchKernel instead"))); - -// doxygen end HCC-specific features -/** - * @} - */ -#endif // #ifdef __HCC__ +#warning "hip/hip_hcc.h is deprecated, please use hip/hip_ext.h" +#include "hip/hip_ext.h" #endif // #ifdef HIP_INCLUDE_HIP_HIP_HCC_H diff --git a/samples/0_Intro/module_api/launchKernelHcc.cpp b/samples/0_Intro/module_api/launchKernelHcc.cpp index 4ff000d1af..38cf0d414c 100644 --- a/samples/0_Intro/module_api/launchKernelHcc.cpp +++ b/samples/0_Intro/module_api/launchKernelHcc.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include #ifdef __HIP_PLATFORM_HCC__ -#include +#include #endif #define LEN 64 diff --git a/samples/0_Intro/module_api_global/runKernel.cpp b/samples/0_Intro/module_api_global/runKernel.cpp index 7aa7f7ba2d..3a2804b7a2 100644 --- a/samples/0_Intro/module_api_global/runKernel.cpp +++ b/samples/0_Intro/module_api_global/runKernel.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include #include #include -#include +#include #define LEN 64 #define SIZE LEN * sizeof(float) diff --git a/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp b/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp index 7c22e19d5d..b42ac86ad1 100755 --- a/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp +++ b/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp @@ -21,11 +21,9 @@ THE SOFTWARE. */ #include "hip/hip_runtime.h" -//#include "hip/hip_runtime_api.h" #include #include #include -//#include #define fileName "tex2dKernel.code" diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp index 5c64eee317..afc57e4b64 100644 --- a/src/hip_hcc.cpp +++ b/src/hip_hcc.cpp @@ -46,7 +46,7 @@ THE SOFTWARE. #include "hsa/hsa_ext_image.h" #include "hip/hip_runtime.h" #include "hip_hcc_internal.h" -#include "hip/hip_hcc.h" +#include "hip/hip_ext.h" #include "trace_helper.h" #include "env.h" diff --git a/src/hip_module.cpp b/src/hip_module.cpp index 2afbabf0a8..498ee5bb03 100644 --- a/src/hip_module.cpp +++ b/src/hip_module.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "hip/hcc_detail/hsa_helpers.hpp" #include "hip/hcc_detail/program_state.hpp" #include "hip_hcc_internal.h" -#include "hip/hip_hcc.h" +#include "hip/hip_ext.h" #include "program_state.inl" #include "trace_helper.h" diff --git a/tests/src/hipHcc.cpp b/tests/src/hipHcc.cpp index e0a843d4f5..2d4523ecd6 100644 --- a/tests/src/hipHcc.cpp +++ b/tests/src/hipHcc.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include #include #include "hip/hip_runtime.h" -#include "hip/hip_hcc.h" +#include "hip/hip_ext.h" #include "test_common.h" #define CHECK(error) \ diff --git a/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp b/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp index 956ba4e50a..f98d5e4ec4 100644 --- a/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp +++ b/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp @@ -32,7 +32,7 @@ THE SOFTWARE. #include #include #include -#include +#include #define LEN 64 #define SIZE LEN * sizeof(float) diff --git a/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp b/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp index e678c35d6e..9ae5883608 100644 --- a/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp +++ b/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp @@ -27,11 +27,9 @@ THE SOFTWARE. */ #include "hip/hip_runtime.h" -//#include "hip/hip_runtime_api.h" #include #include #include -//#include #define fileName "tex2d_kernel.code"