[Sync](chore) sync triton-ascend main into 36f3bae - #50
Merged
hongziqi merged 10 commits intoAug 29, 2026
Conversation
…ang#1828) * [Docs](feat) add 'tracking' issue label for long-lived work * update stale close time to 7
…g#1636) * sync_block_lock_unordered is able to run on A5 * [syncblock](fix) resolve code pre-commit issue --------- Co-authored-by: yangkaixin <yangkaixin1@huawei.com> Co-authored-by: liufengsheng-beep <liufengsheng2@h-partners.com>
* [ssbuffer](feat) Add SplitIfByBlockIdPass to pipeline Signed-off-by: chenwuyang <chenwuyang1@huawei.com> * [ssbuffer](fix) allow matmul placeholder for split if --------- Signed-off-by: chenwuyang <chenwuyang1@huawei.com> Co-authored-by: chenwuyang <chenwuyang1@huawei.com>
…n-lang#1771) Reintroduce BlockPtr, TensorPtr, scalar-pointer, and scope control-flow decoupling with the corresponding T2L and T2U handoff updates. Preserve conversion failure atomicity, scalar carrier materialization, marked range carriers, and descriptor boundary metadata across SCF regions. Add the reviewed MLIR and end-to-end pytest coverage for pointer control-flow boundaries.
Keep stable scalar pointer bases and select complete-address carriers for opaque scf.if loop backedges. Preserve rank-N sign-extended offset structure, constrain legacy BlockData address-use discovery, and fold supported scan pointer stores before use analysis. Keep discrete vector masks attached to extracted memory accesses and include the sparse decode model1 DynamicCV fallback from PR triton-lang#1791. Add focused MLIR and end-to-end regressions for the repaired paths.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
[Sync] 回合 triton-ascend/main (36f3bae) 至 3.7-master
概述
将
upstream/main最新代码（commit36f3baeaa1）回合至3.7-master-sync-main-0827-872fa1e，同步 main 自872fa1e以来 8 个上游提交，主要涉及 ControlFlowOpt 指针控制流解耦、SplitIfByBlockIdPass、SSBuffer 修复及 Msdebug 调试增强。上游合入提交（8 个）
120b97f6f6de756c69eb12827daf8714ba391adbdaa0844144a9238f59d32bafba14ac36f3baeaa1冲突文件及解决策略
merge 过程中产生 2 个冲突文件，均已手动解决：
third_party/ascend/lib/TritonToLinalg/BlockPtrAnalysis.cppBlockPtrAnalysis.h中新增接口（kScalarPointerCarrierAttr、needsLegacyBlockDataLoopRewrite、getMarkedMakeRangeCarrierSlots等）third_party/ascend/lib/TritonToLinalg/TritonToLinalgPass.cpp其余文件自动合并，包括
compiler.py、LoadStoreConverter.cpp、TritonOpConverter.cpp等。