[Phi] Support kps backend and kernel registry #39941
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xingfeng01
reviewed
Feb 28, 2022
| // on GPU and XPU at the same time, so we need KPSContext when registering | ||
| // KPS Kernel. Note: XPU and GPU cannot be compiled at the same time! | ||
| #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) | ||
| using KPSContext = GPUContext; |
There was a problem hiding this comment.
这里没有可以elif的对象？我的想法是同质化的context放在同一个文件中，便于include，这里是在gpu_context.h中的
cmake/phi.cmake
Outdated
| @@ -137,6 +140,11 @@ function(kernel_library TARGET) | |||
| list(APPEND xpu_srcs ${CMAKE_CURRENT_SOURCE_DIR}/xpu/${TARGET}.cc) | |||
| endif() | |||
| endif() | |||
| if (WITH_GPU OR WITH_ROCM OR WITH_XPU_KP) | |||
There was a problem hiding this comment.
是的，按那天晚上讨论的结论是这样；而且，使用cu的话，其实不需要再额外支持kps拷贝成cu了
cmake/xpu_kp.cmake
Outdated
| cp ${kernel_path}/${kernel_name}.kps kernel_build/${kernel_name}.xpu | ||
| [[ -e ${kernel_path}/${kernel_name}.kps ]] && cp ${kernel_path}/${kernel_name}.kps kernel_build/${kernel_name}.xpu | ||
| COMMAND | ||
| [[ -e ${kernel_path}/${kernel_name}.cu ]] && cp ${kernel_path}/${kernel_name}.cu kernel_build/${kernel_name}.xpu |
There was a problem hiding this comment.
只是暂时没删掉原来的，这个需要你们确认一下，如果可以的话，我也可以将kps删除
There was a problem hiding this comment.
只是暂时没删掉原来的，这个需要你们确认一下，如果可以的话，我也可以将kps删除
这个还是先别删。
cmake/phi.cmake
Outdated
| @@ -137,6 +140,11 @@ function(kernel_library TARGET) | |||
| list(APPEND xpu_srcs ${CMAKE_CURRENT_SOURCE_DIR}/xpu/${TARGET}.cc) | |||
| endif() | |||
| endif() | |||
| if (WITH_GPU OR WITH_ROCM OR WITH_XPU_KP) | |||
There was a problem hiding this comment.
.cu->.xpu文件这种重命名规则，这个目前只会影响phi/kernel/里面的.cu文件吗？
There was a problem hiding this comment.
xpu_library才会改，但是xpu_library只会处理kps目录下的cu文件
|
|
||
| } // namespace phi | ||
|
|
||
| PD_REGISTER_KERNEL( |
There was a problem hiding this comment.
目前XPU2 KP的CI还没有建起来，这个注册逻辑是否在XPU2硬件上开with_xpu_kp进行验证了呢
cmake/xpu_kp.cmake
Outdated
| cp ${kernel_path}/${kernel_name}.kps kernel_build/${kernel_name}.xpu | ||
| [[ -e ${kernel_path}/${kernel_name}.kps ]] && cp ${kernel_path}/${kernel_name}.kps kernel_build/${kernel_name}.xpu | ||
| COMMAND | ||
| [[ -e ${kernel_path}/${kernel_name}.cu ]] && cp ${kernel_path}/${kernel_name}.cu kernel_build/${kernel_name}.xpu |
There was a problem hiding this comment.
只是暂时没删掉原来的，这个需要你们确认一下，如果可以的话，我也可以将kps删除
这个还是先别删。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
New features
PR changes
Others
Describe
[Phi] Support kps backend and kernel registry
本PR支持基于kernel primitives api实现的kernel能够在phi中实现并被正确调度：
kernels/kps子目录：phi中基础kernel的管理根据backend不同，通过不同子目录管理，因此基于kps实现的kernel均放置于kps中，整体kernel实现方式规范与cpu、gpu、gpudnn等其他backend一致，同时增加了相应的自动化编译支持。kps注册kernel写法为：
注意，第二个参数为
KPS