Skip to content

[mlir] Add result name for gpu.block_id and gpu.thread_id ops. #83393

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
merged 1 commit into from
Feb 29, 2024
Merged

[mlir] Add result name for gpu.block_id and gpu.thread_id ops. #83393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion mlir/include/mlir/Dialect/GPU/IR/GPUOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ include "mlir/IR/EnumAttr.td"
include "mlir/IR/SymbolInterfaces.td"
include "mlir/Interfaces/ControlFlowInterfaces.td"
include "mlir/Interfaces/DataLayoutInterfaces.td"
include "mlir/IR/OpAsmInterface.td"
include "mlir/Interfaces/FunctionInterfaces.td"
include "mlir/Interfaces/InferIntRangeInterface.td"
include "mlir/Interfaces/InferTypeOpInterface.td"
Expand All @@ -50,9 +51,21 @@ def GPU_DimensionAttr : EnumAttr<GPU_Dialect, GPU_Dimension, "dim">;

class GPU_IndexOp<string mnemonic, list<Trait> traits = []> :
GPU_Op<mnemonic, !listconcat(traits, [
Pure, DeclareOpInterfaceMethods<InferIntRangeInterface>])>,
Pure,
DeclareOpInterfaceMethods<InferIntRangeInterface>,
DeclareOpInterfaceMethods<OpAsmOpInterface, ["getAsmResultNames"]>])>,
Arguments<(ins GPU_DimensionAttr:$dimension)>, Results<(outs Index)> {
let assemblyFormat = "$dimension attr-dict";
let extraClassDefinition = [{
void $cppClass::getAsmResultNames(
llvm::function_ref<void(mlir::Value, mlir::StringRef)> setNameFn) {
auto dimStr = stringifyDimension(getDimensionAttr().getValue());
auto opName = getOperationName();
assert(opName.consume_front("gpu."));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Isn't this changing the behavior between assert and release build?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, i thought it affects only llvm_assert. Actually, this assert is not really needed. I can remote it. WDYT?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes I would just remove the assert here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#83410

SmallString<8> resultName({opName, "_", dimStr});
setNameFn(getResult(),resultName);
}
}];
}

def GPU_ClusterDimOp : GPU_IndexOp<"cluster_dim"> {
Expand Down
15 changes: 15 additions & 0 deletions mlir/test/Dialect/GPU/ops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,39 @@ module attributes {gpu.container_module} {
gpu.module @kernels {
gpu.func @kernel_1(%arg0 : f32, %arg1 : memref<?xf32, 1>) kernel {
%tIdX = gpu.thread_id x
// CHECK: thread_id_x
%tIdY = gpu.thread_id y
// CHECK-NEXT: thread_id_y
%tIdZ = gpu.thread_id z
// CHECK-NEXT: thread_id_z

%bDimX = gpu.block_dim x
// CHECK-NEXT: block_dim_x
%bDimY = gpu.block_dim y
// CHECK-NEXT: block_dim_y
%bDimZ = gpu.block_dim z
// CHECK-NEXT: block_dim_z

%bIdX = gpu.block_id x
// CHECK-NEXT: block_id_x
%bIdY = gpu.block_id y
// CHECK-NEXT: block_id_y
%bIdZ = gpu.block_id z
// CHECK-NEXT: block_id_z

%gDimX = gpu.grid_dim x
// CHECK-NEXT: grid_dim_x
%gDimY = gpu.grid_dim y
// CHECK-NEXT: grid_dim_y
%gDimZ = gpu.grid_dim z
// CHECK-NEXT: grid_dim_z

%gIdX = gpu.global_id x
// CHECK-NEXT: global_id_x
%gIdY = gpu.global_id y
// CHECK-NEXT: global_id_y
%gIdZ = gpu.global_id z
// CHECK-NEXT: global_id_z

%sgId = gpu.subgroup_id : index
%numSg = gpu.num_subgroups : index
Expand Down
2 changes: 1 addition & 1 deletion mlir/test/python/dialects/gpu/dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ def testMMAElementWiseAttr():
module = Module.create()
with InsertionPoint(module.body):
gpu.BlockDimOp(gpu.Dimension.y)
# CHECK: %0 = gpu.block_dim y
# CHECK: %block_dim_y = gpu.block_dim y
print(module)
pass