Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions third_party/ascend/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ascendnpu_ir/
AscendNPU-IR
34 changes: 33 additions & 1 deletion third_party/ascend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,41 @@ set(TRITON_DISTRIBUTED_ASCEND_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/Triton-dis
include_directories(${ASCENDNPU_IR_SRC_DIR}/bishengir/include)
include_directories(${ASCENDNPU_IR_BINARY_DIR}/bishengir/include) # Tablegen'd files

# Ascend's TritonToLinalg lowering lives in FLIR. Create the target before the
# Ascend libraries so DiscreteMaskAccessConversion can link it; its Phase-A
# Ascend dependencies are attached after add_subdirectory(lib) below.
if(FLAGTREE_BACKEND STREQUAL "ascend")
add_subdirectory(
${PROJECT_SOURCE_DIR}/third_party/flir/lib/TritonMemoryAccess
${PROJECT_BINARY_DIR}/third_party/flir/lib/TritonMemoryAccess)
add_subdirectory(
${PROJECT_SOURCE_DIR}/third_party/flir/include/incubated/Conversion/TritonToLinalgIncubated
${PROJECT_BINARY_DIR}/third_party/flir/include/incubated/Conversion/TritonToLinalgIncubated)
add_subdirectory(
${PROJECT_SOURCE_DIR}/third_party/flir/lib/Conversion/TritonToLinalgIncubated
${PROJECT_BINARY_DIR}/third_party/flir/lib/Conversion/TritonToLinalgIncubated)
endif()

add_subdirectory(include)
add_subdirectory(lib)
add_subdirectory(bin)

if(FLAGTREE_BACKEND STREQUAL "ascend")
target_link_libraries(TritonToLinalgIncubated PUBLIC
BiShengIRHIVMDialect
BiShengIRHFusionDialect
BiShengIRAnnotationDialect
BiShengIRScopeDialect
TritonAscendIR
TritonStructuredIR
TritonToStructured
TritonToUnstructure
FlirTritonToGraphLegacy
TritonControlFlowOpt
MLIRTritonNPUUtils
)
endif()

if(TRITON_BUILD_TD)
if(NOT EXISTS "${TRITON_DISTRIBUTED_ASCEND_SRC_DIR}/CMakeLists.txt")
message(FATAL_ERROR "Triton-Distributed submodule is not initialized: ${TRITON_DISTRIBUTED_ASCEND_SRC_DIR}")
Expand Down Expand Up @@ -123,7 +154,7 @@ add_triton_plugin(TritonAscend
LINK_LIBS
CommonIRIR
TritonToGraph
TritonToLinalg
TritonToLinalgIncubated
BiShengIRScopeDialect
BiShengIRHIVMDialect
MLIRMemRefDialect
Expand All @@ -134,6 +165,7 @@ add_triton_plugin(TritonAscend

target_compile_definitions(TritonAscend PRIVATE __TLE_DSA__)
target_link_libraries(TritonAscend PRIVATE CommonIRToHIVM CommonIRTransforms)
add_dependencies(TritonAscend TritonToLinalgIncubatedConversionPassIncGen)
if(TARGET CommonIRIR)
add_dependencies(TritonAscend CommonIRIR)
endif()
Expand Down
10 changes: 6 additions & 4 deletions third_party/ascend/bin/triton-opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "mlir/Tools/mlir-opt/MlirOptMain.h"

#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/Triton/Transforms/Passes.h"

#include "ascend/include/Dialect/TritonAscend/IR/TritonAscendDialect.h"
#include "ascend/include/Dialect/TritonStructured/IR/TritonStructuredDialect.h"
Expand All @@ -54,7 +55,7 @@
#include "ascend/include/TritonToHFusion/Passes.h"
#include "ascend/include/TritonToHIVM/Passes.h"
#include "ascend/include/TritonToLLVM/Passes.h"
#include "ascend/include/TritonToLinalg/Passes.h"
#include "incubated/Conversion/TritonToLinalgIncubated/Passes.h"
#include "ascend/include/TritonToStructured/Passes.h"
#include "ascend/include/TritonToUnstructure/Passes.h"

Expand All @@ -74,8 +75,9 @@ static void registerAscendPasses() {
// triton-to-structured, discrete-mask-access-conversion,
// triton-to-annotation, triton-to-unstructure (+ bubble-up-operation),
// triton-to-hivm, triton-to-hfusion, triton-to-llvm, commonir-to-hivm
// (+ reduce-sum-strength), triton-to-linalg, merge-concat-load-buffer
// (via TritonToGraph) and add_dynamic_cv_pipeline.
// (+ reduce-sum-strength), triton-to-linalg-incubated,
// merge-concat-load-buffer (via TritonToGraph) and add_dynamic_cv_pipeline.
mlir::triton::registerTritonPasses();
mlir::triton::registerTritonControlFlowOptPasses();
mlir::triton::registerTritonToStructuredPasses();
mlir::triton::registerDiscreteMaskAccessConversionPasses();
Expand All @@ -85,7 +87,7 @@ static void registerAscendPasses() {
mlir::triton::registerTritonToHFusionPasses();
mlir::triton::registerTritonToLLVMPasses();
mlir::triton::registerCommonIRToHIVMPasses();
mlir::triton::registerTritonToLinalgPasses();
mlir::triton::Incubated::registerTritonToLinalgIncubatedPasses();
mlir::triton::registerAutoBlockifyPasses();
mlir::triton::cfg::registerTritonToGraphPasses();
mlir::triton::registerAddDynamicCVPipelinePasses();
Expand Down
2 changes: 0 additions & 2 deletions third_party/ascend/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ add_subdirectory(TritonToAnnotation)
add_subdirectory(TritonToHFusion)
add_subdirectory(TritonToHIVM)
add_subdirectory(TritonToGraph)
add_subdirectory(TritonToLinalg)
add_subdirectory(TritonControlFlowOpt)
add_subdirectory(Utils)
add_subdirectory(DiscreteMaskAccessConversion)
add_subdirectory(TritonToUnstructure)
add_subdirectory(TritonToLLVM)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "mlir/Pass/Pass.h"
#include "triton/Dialect/Triton/IR/Dialect.h"

#include "ascend/include/Utils/Utils.h"
#include "incubated/Utils/Utils.h"
#include "mlir/IR/PatternMatch.h"

#define GEN_PASS_DECL_DISCRETEMASKACCESSCONVERSION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#define TRITON_ASCEND_TRITON_CONTROL_FLOW_OPT_CONTROL_FLOW_REWRITE_H

#include "TritonControlFlowOpt/ControlFlowAnalysis.h"
#include "incubated/TritonControlFlowOpt/ControlFlowAttrs.h"

#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
Expand All @@ -36,33 +37,6 @@

namespace mlir::triton::controlflow {

/// Handoff marker for SCF loops whose pointer slots have already been expanded
/// into policy-owned descriptor components. TritonToLinalg consumes and
/// removes it instead of applying its legacy pointer-loop decomposition a
/// second time.
inline constexpr llvm::StringLiteral kPointerDescriptorBoundaryAttr =
"PointerDescriptorBoundary";

/// Handoff marker for a pointer rebuilt at a CFO control-flow boundary. The
/// defining operation's operands are the complete descriptor roots, including
/// invariant components omitted from the replacement SCF signature.
inline constexpr llvm::StringLiteral kPointerDescriptorRebuildAttr =
"PointerDescriptorRebuild";

/// Optional companion on a PointerDescriptorRebuild root. The `strided_1d`
/// form means the tensor-pointer offset operand is a proven rank-1 affine
/// expression rather than an opaque complete-offset carrier.
inline constexpr llvm::StringLiteral kPointerDescriptorOffsetFormAttr =
"PointerDescriptorOffsetForm";
inline constexpr llvm::StringLiteral kStrided1DOffsetForm = "strided_1d";

/// Dense per-axis classification attached to a descriptor rebuild. A value
/// of one means the complete contribution of that logical axis is represented
/// by its scalar stride; zero means the axis is carried by the opaque complete
/// contribution tensor.
inline constexpr llvm::StringLiteral kPointerDescriptorStructuredAxesAttr =
"PointerDescriptorStructuredAxes";

/// Policy-owned description of one value crossing a control-flow boundary.
///
/// `components` contain every runtime value needed to rebuild the original
Expand Down
219 changes: 0 additions & 219 deletions third_party/ascend/include/TritonMemoryAccess/LoadStoreMaskAnalysis.h

This file was deleted.

Loading