Skip to content

Bump ktir-mlir-frontend past the ktdp.memory_space rename #108

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
fabianlim merged 4 commits into from
Aug 18, 2026
Merged

Bump ktir-mlir-frontend past the ktdp.memory_space rename #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b34872c
Bump ktir-mlir-frontend to latest main; adapt to source restructuring
fabianlim Aug 14, 2026
9660ad6
Fix remaining KTDP include in triton_spyre.cc after submodule restruc…
fabianlim Aug 14, 2026
4774084
Bump ktir-mlir-frontend to ed069fb6; migrate off ktdp.spyre_memory_space
fabianlim Aug 14, 2026
eb84e00
Bump ktir-mlir-frontend to the merged stubgen cmake>=4.0 fix
fabianlim Aug 14, 2026
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
2 changes: 1 addition & 1 deletion third_party/spyre/bin/spyre-triton-opt/spyre-triton-opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/Triton/Transforms/Passes.h"

#include "Ktdp/KtdpDialect.hpp"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "Dialect/KTDP/Transforms/Passes.h"

int main(int argc, char **argv) {
Expand Down
2 changes: 1 addition & 1 deletion third_party/spyre/ktir-mlir-frontend
Open in desktop
Submodule ktir-mlir-frontend updated 107 files
4 changes: 2 additions & 2 deletions third_party/spyre/lib/Dialect/KTDP/Transforms/DistributeWork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
//===----------------------------------------------------------------------===//

#include "Dialect/KTDP/Transforms/Passes.h"
#include "Ktdp/KtdpDialect.hpp"
#include "Ktdp/KtdpOps.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "triton/Dialect/Triton/IR/Dialect.h"

#include "mlir/Dialect/Arith/IR/Arith.h"
Expand Down
12 changes: 6 additions & 6 deletions third_party/spyre/lib/Dialect/KTDP/Transforms/LowerDescriptorMemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

#include "Dialect/KTDP/Transforms/Passes.h"
#include "Dialect/KTDP/Transforms/Utility.h"
#include "Ktdp/KtdpAttrs.hpp"
#include "Ktdp/KtdpDialect.hpp"
#include "Ktdp/KtdpOps.hpp"
#include "Ktdp/KtdpTypes.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPAttrs.h"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "ktir/Dialect/KTDP/KTDPTypes.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Types.h"

Expand Down Expand Up @@ -99,8 +99,8 @@ static Value buildBaseMemoryView(OpBuilder &builder, Location loc,
}

auto memrefType = MemRefType::get(shape, elemType);
auto memSpaceAttr = mlir::ktdp::SpyreMemorySpaceAttr::get(
ctx, mlir::ktdp::SpyreMemorySpaceKind::HBM, /*core=*/-1);
auto memSpaceAttr = mlir::ktdp::MemorySpaceAttr::get(
ctx, mlir::ktdp::MemorySpaceKind::global, /*ct_id=*/-1);

auto memView = mlir::ktdp::ConstructMemoryViewOp::create(
builder, loc, memrefType, baseIndex,
Expand Down
6 changes: 3 additions & 3 deletions third_party/spyre/lib/Dialect/KTDP/Transforms/LowerInterTile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
//===----------------------------------------------------------------------===//

#include "Dialect/KTDP/Transforms/Passes.h"
#include "Ktdp/KtdpDialect.hpp"
#include "Ktdp/KtdpOps.hpp"
#include "Ktdp/KtdpTypes.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "ktir/Dialect/KTDP/KTDPTypes.h"
#include "triton/Dialect/Triton/IR/Dialect.h"

#include "mlir/Dialect/Linalg/IR/Linalg.h"
Expand Down
12 changes: 6 additions & 6 deletions third_party/spyre/lib/Dialect/KTDP/Transforms/LowerScalarLoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@

#include "Dialect/KTDP/Transforms/Passes.h"
#include "Dialect/KTDP/Transforms/Utility.h"
#include "Ktdp/KtdpAttrs.hpp"
#include "Ktdp/KtdpDialect.hpp"
#include "Ktdp/KtdpOps.hpp"
#include "Ktdp/KtdpTypes.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPAttrs.h"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "ktir/Dialect/KTDP/KTDPTypes.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Types.h"

Expand Down Expand Up @@ -154,8 +154,8 @@ static Value buildScalarMemoryView(OpBuilder &builder, Location loc,
Value baseIndex, Type elemType) {
MLIRContext *ctx = builder.getContext();
auto memrefType = MemRefType::get({}, elemType);
auto memSpaceAttr = mlir::ktdp::SpyreMemorySpaceAttr::get(
ctx, mlir::ktdp::SpyreMemorySpaceKind::HBM, /*core=*/-1);
auto memSpaceAttr = mlir::ktdp::MemorySpaceAttr::get(
ctx, mlir::ktdp::MemorySpaceKind::global, /*ct_id=*/-1);
auto coordinateSet = trivialIntegerSet(ctx);
auto memView = mlir::ktdp::ConstructMemoryViewOp::create(
builder, loc, memrefType, baseIndex,
Expand Down
8 changes: 4 additions & 4 deletions third_party/spyre/lib/Dialect/KTDP/Transforms/RewriteDescriptorLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include "RewriteDescriptorLayout/PermutationUtils.h"
#include "RewriteDescriptorLayout/Types.h"
#include "RewriteDescriptorLayout/ContractionSynthesis.h"
#include "Ktdp/KtdpAttrs.hpp"
#include "Ktdp/KtdpDialect.hpp"
#include "Ktdp/KtdpOps.hpp"
#include "Ktdp/KtdpTypes.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPAttrs.h"
#include "ktir/Dialect/KTDP/KTDPDialect.h"
#include "ktir/Dialect/KTDP/KTDPTypes.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Types.h"

Expand Down
4 changes: 2 additions & 2 deletions ..._party/spyre/lib/Dialect/KTDP/Transforms/RewriteDescriptorLayout/ContractionSynthesis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include "RewriteDescriptorLayout/PermutationUtils.h"
#include "RewriteDescriptorLayout/Types.h"

#include "Ktdp/KtdpOps.hpp"
#include "Ktdp/KtdpTypes.hpp"
#include "ktir/Dialect/KTDP/KTDP.h"
#include "ktir/Dialect/KTDP/KTDPTypes.h"
#include "triton/Dialect/Triton/IR/Dialect.h"

#include "mlir/Dialect/Arith/IR/Arith.h"
Expand Down
10 changes: 5 additions & 5 deletions third_party/spyre/test/Conversion/rewrite-descriptor-layout-chained-transpose.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
// CHECK-SAME: %[[VAL_0:.*]]: !tt.ptr<f32>, %[[VAL_1:.*]]: !tt.ptr<f32>, %[[VAL_2:.*]]: !tt.ptr<f32>) {
// CHECK: %[[VAL_3:.*]] = arith.constant 0 : i32
// CHECK: %[[VAL_4:.*]] = builtin.unrealized_conversion_cast %[[VAL_0]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [1, 64, 64], strides: [4096, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<1x64x64xf32>
// CHECK: %[[VAL_6:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<64x64xf32>
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [1, 64, 64], strides: [4096, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.memory_space<global>} : memref<1x64x64xf32>
// CHECK: %[[VAL_6:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.memory_space<global>} : memref<64x64xf32>
// CHECK: %[[VAL_7:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_8:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_9:.*]] = arith.constant 64 : index
Expand All @@ -41,8 +41,8 @@
// CHECK: %[[A_NEG:.*]] = arith.negf %[[A_LOAD]] : tensor<1x64x64xf32>
// CHECK: %[[VAL_17:.*]] = tensor.empty() : tensor<64x64xf32>
// CHECK: %[[VAL_18:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_19:.*]] = ktdp.construct_memory_view %[[VAL_18]], sizes: [1, 64, 64], strides: [4096, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<1x64x64xf32>
// CHECK: %[[VAL_20:.*]] = ktdp.construct_memory_view %[[VAL_18]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<64x64xf32>
// CHECK: %[[VAL_19:.*]] = ktdp.construct_memory_view %[[VAL_18]], sizes: [1, 64, 64], strides: [4096, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.memory_space<global>} : memref<1x64x64xf32>
// CHECK: %[[VAL_20:.*]] = ktdp.construct_memory_view %[[VAL_18]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.memory_space<global>} : memref<64x64xf32>
// CHECK: %[[VAL_21:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_22:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_23:.*]] = arith.constant 64 : index
Expand All @@ -52,7 +52,7 @@
// CHECK: %[[VAL_27:.*]] = ktdp.construct_access_tile %[[VAL_19]]{{\[}}%[[VAL_24]], %[[VAL_21]], %[[VAL_26]]] {access_tile_order = #[[$ATTR_0]], access_tile_set = #[[$ATTR_2]]} : memref<1x64x64xf32> -> !ktdp.access_tile<1x64x64xindex>
// CHECK: %[[B_LOAD:.*]] = ktdp.load %[[VAL_27]] : <1x64x64xindex> -> tensor<1x64x64xf32>
// CHECK: %[[VAL_29:.*]] = builtin.unrealized_conversion_cast %[[VAL_2]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_30:.*]] = ktdp.construct_memory_view %[[VAL_29]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<64x64xf32>
// CHECK: %[[VAL_30:.*]] = ktdp.construct_memory_view %[[VAL_29]], sizes: [64, 64], strides: [64, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.memory_space<global>} : memref<64x64xf32>
// CHECK: %[[VAL_31:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_32:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_33:.*]] = ktdp.construct_access_tile %[[VAL_30]]{{\[}}%[[VAL_31]], %[[VAL_32]]] {access_tile_order = #[[$ATTR_1]], access_tile_set = #[[$ATTR_3]]} : memref<64x64xf32> -> !ktdp.access_tile<64x64xindex>
Expand Down
16 changes: 8 additions & 8 deletions third_party/spyre/test/Conversion/rewrite-descriptor-layout-gather.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ module {
// CHECK-SAME: %[[VAL_0:.*]]: !tt.ptr<f32>, %[[VAL_1:.*]]: !tt.ptr<i32>, %[[VAL_2:.*]]: !tt.ptr<f32>) {
// CHECK: %[[VAL_3:.*]] = arith.constant 0 : i32
// CHECK: %[[VAL_4:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : !tt.ptr<i32> to index
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [32], strides: [1] {coordinate_set = #[[$ATTR_1]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<32xi32>
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [32], strides: [1] {coordinate_set = #[[$ATTR_1]], memory_space = #ktdp.memory_space<global>} : memref<32xi32>
// CHECK: %[[VAL_6:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_7:.*]] = builtin.unrealized_conversion_cast %[[VAL_0]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_8:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [2, 512, 64], strides: [32768, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<2x512x64xf32>
// CHECK: %[[VAL_9:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [512, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<512x128xf32>
// CHECK: %[[VAL_8:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [2, 512, 64], strides: [32768, 64, 1] {coordinate_set = #[[$ATTR_2]], memory_space = #ktdp.memory_space<global>} : memref<2x512x64xf32>
// CHECK: %[[VAL_9:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [512, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_3]], memory_space = #ktdp.memory_space<global>} : memref<512x128xf32>
// CHECK: %[[VAL_10:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_11:.*]] = ktdp.construct_indirect_access_tile intermediate_variables(%[[VAL_12:.*]], %[[VAL_13:.*]], %[[VAL_14:.*]]) %[[VAL_8]][((%[[VAL_10]] + %[[VAL_12]] * 64 + %[[VAL_14]]) floordiv 64), ind(%[[VAL_5]]{{\[}}%[[VAL_6]] + %[[VAL_13]]]), ((%[[VAL_10]] + %[[VAL_12]] * 64 + %[[VAL_14]]) mod 64)] {variables_space_order = #[[$ATTR_0]], variables_space_set = #[[$ATTR_4]]} : memref<2x512x64xf32>, memref<32xi32> -> !ktdp.access_tile<2x32x64xindex>
// CHECK: %[[VAL_15:.*]] = ktdp.load %[[VAL_11]] : <2x32x64xindex> -> tensor<2x32x64xf32>
// CHECK: %[[VAL_16:.*]] = builtin.unrealized_conversion_cast %[[VAL_2]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_17:.*]] = ktdp.construct_memory_view %[[VAL_16]], sizes: [2, 32, 64], strides: [2048, 64, 1] {coordinate_set = #[[$ATTR_4]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<2x32x64xf32>
// CHECK: %[[VAL_18:.*]] = ktdp.construct_memory_view %[[VAL_16]], sizes: [32, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_5]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<32x128xf32>
// CHECK: %[[VAL_17:.*]] = ktdp.construct_memory_view %[[VAL_16]], sizes: [2, 32, 64], strides: [2048, 64, 1] {coordinate_set = #[[$ATTR_4]], memory_space = #ktdp.memory_space<global>} : memref<2x32x64xf32>
// CHECK: %[[VAL_18:.*]] = ktdp.construct_memory_view %[[VAL_16]], sizes: [32, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_5]], memory_space = #ktdp.memory_space<global>} : memref<32x128xf32>
// CHECK: %[[VAL_19:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_20:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_21:.*]] = arith.constant 64 : index
Expand Down Expand Up @@ -95,15 +95,15 @@ module {
// CHECK-SAME: %[[VAL_0:.*]]: !tt.ptr<f32>, %[[VAL_1:.*]]: !tt.ptr<i32>, %[[VAL_2:.*]]: !tt.ptr<f32>) {
// CHECK: %[[VAL_3:.*]] = arith.constant 0 : i32
// CHECK: %[[VAL_4:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : !tt.ptr<i32> to index
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [32], strides: [1] {coordinate_set = #[[$ATTR_7]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<32xi32>
// CHECK: %[[VAL_5:.*]] = ktdp.construct_memory_view %[[VAL_4]], sizes: [32], strides: [1] {coordinate_set = #[[$ATTR_7]], memory_space = #ktdp.memory_space<global>} : memref<32xi32>
// CHECK: %[[VAL_6:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_7:.*]] = builtin.unrealized_conversion_cast %[[VAL_0]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_8:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [512, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_8]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<512x128xf32>
// CHECK: %[[VAL_8:.*]] = ktdp.construct_memory_view %[[VAL_7]], sizes: [512, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_8]], memory_space = #ktdp.memory_space<global>} : memref<512x128xf32>
// CHECK: %[[VAL_9:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_10:.*]] = ktdp.construct_indirect_access_tile intermediate_variables(%[[VAL_11:.*]], %[[VAL_12:.*]]) %[[VAL_8]][ind(%[[VAL_5]]{{\[}}%[[VAL_6]] + %[[VAL_11]]]), (%[[VAL_9]] + %[[VAL_12]])] {variables_space_order = #[[$ATTR_6]], variables_space_set = #[[$ATTR_9]]} : memref<512x128xf32>, memref<32xi32> -> !ktdp.access_tile<32x128xindex>
// CHECK: %[[VAL_13:.*]] = ktdp.load %[[VAL_10]] : <32x128xindex> -> tensor<32x128xf32>
// CHECK: %[[VAL_14:.*]] = builtin.unrealized_conversion_cast %[[VAL_2]] : !tt.ptr<f32> to index
// CHECK: %[[VAL_15:.*]] = ktdp.construct_memory_view %[[VAL_14]], sizes: [32, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_9]], memory_space = #ktdp.spyre_memory_space<HBM>} : memref<32x128xf32>
// CHECK: %[[VAL_15:.*]] = ktdp.construct_memory_view %[[VAL_14]], sizes: [32, 128], strides: [128, 1] {coordinate_set = #[[$ATTR_9]], memory_space = #ktdp.memory_space<global>} : memref<32x128xf32>
// CHECK: %[[VAL_16:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_17:.*]] = arith.index_cast %[[VAL_3]] : i32 to index
// CHECK: %[[VAL_18:.*]] = ktdp.construct_access_tile %[[VAL_15]]{{\[}}%[[VAL_16]], %[[VAL_17]]] {access_tile_order = #[[$ATTR_6]], access_tile_set = #[[$ATTR_9]]} : memref<32x128xf32> -> !ktdp.access_tile<32x128xindex>
Expand Down
Loading
Loading