Skip to content

[CINN] [New Hardware Update]Fix hip optimize bugs #71985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlrain merged 2 commits into from
Apr 9, 2025
Merged

[CINN] [New Hardware Update]Fix hip optimize bugs #71985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
698add4
fix hip bugs
feixi21 Mar 27, 2025
8fdfc09
fix codegen style
feixi21 Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions paddle/cinn/optim/optimize.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,15 @@ ir::LoweredFunc Optimize(ir::LoweredFunc fn,
blk_pass_manager.AddPass(CreateCudaSyncThreadsDropIfThenElsePass());
blk_pass_manager.Run(copied->body_block);
VLOG(10) << "After Optimize CudaSyncThreadsDropIfThenElse:" << copied;
FuncPassManager func_pass_manager;
VLOG(10) << "Before Optimize TransBufferWithDynamicShape:" << copied;
func_pass_manager.AddPass(CreateTransBufferWithDynamicShapePass());
func_pass_manager.Run(copied);
VLOG(10) << "After Optimize TransBufferWithDynamicShape:" << copied;
#endif
},
[](auto) {});
[&](std::variant<common::UnknownArch, common::X86Arch, common::ARMArch>) {
Copy link
Contributor

@ZhangX-21 ZhangX-21 Mar 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个保持

[](auto) {}

是不是也可以？

Copy link
Contributor Author

@feixi21 feixi21 Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

若使用 {} 作为第三个 lambda ，会判定 HygonDCUArchHIP != std::variant<common::HygonDCUArchHIP, common::HygonDCUArchSYCL>，从而匹配到 auto

});

SimplifyUnitBlock(&copied->body);
VLOG(4) << "After SimplifyUnitBlock:" << copied;
Expand Down Expand Up @@ -157,7 +163,14 @@ ir::LoweredFunc Optimize(ir::LoweredFunc fn,
func_pass_manager.Run(copied);
VLOG(4) << "After Optimize RearrangeLoadInstruction:" << copied;
},
[](auto) {});
[&](std::variant<common::HygonDCUArchHIP, common::HygonDCUArchSYCL>) {
FuncPassManager func_pass_manager;
func_pass_manager.AddPass(CreateRearrangeLoadInstructionPass());
func_pass_manager.Run(copied);
VLOG(4) << "After Optimize RearrangeLoadInstruction:" << copied;
},
[&](std::variant<common::UnknownArch, common::X86Arch, common::ARMArch>) {
});

VectorizeForTrans(&copied->body);
VLOG(10) << "After Optimize vectorize" << copied;
Expand Down