[MLIR] Fix gpu.launch attribution argument printing #161408
Merged
Conversation
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
This was broken and never tested. Not only this could crash for stack-use-after-scope, but it also would have printed something like: ``` value <block argument> of type 'memref<7x8xf64, #gpu.address_space<workgroup>>' at index: 12 ``` insted of the SSA value. It turns out the gpu.func already have a very similar helper that we can reuse here. Fixes llvm#161394
| @llvm/pr-subscribers-mlir Author: Mehdi Amini (joker-eph) ChangesThis was broken and never tested. insted of the SSA value. It turns out the gpu.func already have a very similar helper that we can reuse here. Fixes #161394 Full diff: https://github.com/llvm/llvm-project/pull/161408.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp index 43b02f16aa829..c0f9132de3db4 100644 --- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp +++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp @@ -535,17 +535,26 @@ parseAttributions(OpAsmParser &parser, StringRef keyword, /*allowType=*/true); } -/// Prints a GPU function memory attribution. static void printAttributions(OpAsmPrinter &p, StringRef keyword, - ArrayRef<BlockArgument> values) { + ArrayRef<BlockArgument> values, + ArrayAttr attributes = {}) { if (values.empty()) return; - auto printBlockArg = [](BlockArgument v) { - return llvm::formatv("{} : {}", v, v.getType()); - }; - p << ' ' << keyword << '(' - << llvm::interleaved(llvm::map_range(values, printBlockArg)) << ')'; + p << ' ' << keyword << '('; + llvm::interleaveComma( + llvm::enumerate(values), p, [&p, attributes](auto pair) { + BlockArgument v = pair.value(); + p << v << " : " << v.getType(); + + size_t attributionIndex = pair.index(); + DictionaryAttr attrs; + if (attributes && attributionIndex < attributes.size()) + attrs = llvm::cast<DictionaryAttr>(attributes[attributionIndex]); + if (attrs) + p.printOptionalAttrDict(attrs.getValue()); + }); + p << ')'; } /// Verifies a GPU function memory attribution. @@ -1649,28 +1658,6 @@ ParseResult GPUFuncOp::parse(OpAsmParser &parser, OperationState &result) { return parser.parseRegion(*body, entryArgs); } -static void printAttributions(OpAsmPrinter &p, StringRef keyword, - ArrayRef<BlockArgument> values, - ArrayAttr attributes) { - if (values.empty()) - return; - - p << ' ' << keyword << '('; - llvm::interleaveComma( - llvm::enumerate(values), p, [&p, attributes](auto pair) { - BlockArgument v = pair.value(); - p << v << " : " << v.getType(); - - size_t attributionIndex = pair.index(); - DictionaryAttr attrs; - if (attributes && attributionIndex < attributes.size()) - attrs = llvm::cast<DictionaryAttr>(attributes[attributionIndex]); - if (attrs) - p.printOptionalAttrDict(attrs.getValue()); - }); - p << ')'; -} - void GPUFuncOp::print(OpAsmPrinter &p) { p << ' '; p.printSymbolName(getName()); diff --git a/mlir/test/Dialect/GPU/ops.mlir b/mlir/test/Dialect/GPU/ops.mlir index e3e2474d917c8..7772e7a1681c4 100644 --- a/mlir/test/Dialect/GPU/ops.mlir +++ b/mlir/test/Dialect/GPU/ops.mlir @@ -68,6 +68,31 @@ module attributes {gpu.container_module} { return } + // CHECK-LABEL: func @launch_with_attributions( + func.func @launch_with_attributions(%blk : index, %thrd : index, %float : f32, %data : memref<?xf32,1>) { + // CHECK: gpu.launch + gpu.launch blocks(%bx, %by, %bz) in (%grid_x = %blk, %grid_y = %blk, %grid_z = %blk) + threads(%tx, %ty, %tz) in (%block_x = %thrd, %block_y = %thrd, %block_z = %thrd) + // CHECK-SAME: workgroup(%[[WGROUP1:.*]] : memref<42xf32, 3>, %[[WGROUP2:.*]] : memref<2xf32, 3>) + workgroup(%arg1: memref<42xf32, 3>, %arg2: memref<2xf32, 3>) + // CHECK-SAME: private(%[[PRIVATE1:.*]] : memref<2xf32, 5>, %[[PRIVATE2:.*]] : memref<1xf32, 5>) + private(%arg3: memref<2xf32, 5>, %arg4: memref<1xf32, 5>) + { + "use"(%float) : (f32) -> () + "use"(%data) : (memref<?xf32,1>) -> () + // CHECK: "use"(%[[WGROUP1]], %[[WGROUP2]]) + "use"(%arg1, %arg2) : (memref<42xf32, 3>, memref<2xf32, 3>) -> () + // CHECK: "use"(%[[PRIVATE1]]) + "use"(%arg3) : (memref<2xf32, 5>) -> () + // CHECK: "use"(%[[PRIVATE2]]) + "use"(%arg4) : (memref<1xf32, 5>) -> () + // CHECK: gpu.terminator + gpu.terminator + } + return + } + + gpu.module @kernels { gpu.func @kernel_1(%arg0 : f32, %arg1 : memref<?xf32, 1>) kernel { %tIdX = gpu.thread_id x @@ -228,17 +253,20 @@ module attributes {gpu.container_module} { gpu.module @gpu_funcs { // CHECK-LABEL: gpu.func @kernel_1({{.*}}: f32) - // CHECK: workgroup - // CHECK: private - // CHECK: attributes gpu.func @kernel_1(%arg0: f32) - workgroup(%arg1: memref<42xf32, 3>) - private(%arg2: memref<2xf32, 5>, %arg3: memref<1xf32, 5>) + // CHECK: workgroup(%[[WGROUP1:.*]] : memref<42xf32, 3>, %[[WGROUP2:.*]] : memref<2xf32, 3>) + workgroup(%arg1: memref<42xf32, 3>, %arg2: memref<2xf32, 3>) + // CHECK: private(%[[PRIVATE1:.*]] : memref<2xf32, 5>, %[[PRIVATE2:.*]] : memref<1xf32, 5>) + private(%arg3: memref<2xf32, 5>, %arg4: memref<1xf32, 5>) kernel - attributes {foo="bar"} { - "use"(%arg1) : (memref<42xf32, 3>) -> () - "use"(%arg2) : (memref<2xf32, 5>) -> () - "use"(%arg3) : (memref<1xf32, 5>) -> () + // CHECK: attributes {foo = "bar"} + attributes {foo = "bar"} { + // CHECK: "use"(%[[WGROUP1]], %[[WGROUP2]]) + "use"(%arg1, %arg2) : (memref<42xf32, 3>, memref<2xf32, 3>) -> () + // CHECK: "use"(%[[PRIVATE1]]) + "use"(%arg3) : (memref<2xf32, 5>) -> () + // CHECK: "use"(%[[PRIVATE2]]) + "use"(%arg4) : (memref<1xf32, 5>) -> () gpu.return } |
| @llvm/pr-subscribers-mlir-gpu Author: Mehdi Amini (joker-eph) ChangesThis was broken and never tested. insted of the SSA value. It turns out the gpu.func already have a very similar helper that we can reuse here. Fixes #161394 Full diff: https://github.com/llvm/llvm-project/pull/161408.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp index 43b02f16aa829..c0f9132de3db4 100644 --- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp +++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp @@ -535,17 +535,26 @@ parseAttributions(OpAsmParser &parser, StringRef keyword, /*allowType=*/true); } -/// Prints a GPU function memory attribution. static void printAttributions(OpAsmPrinter &p, StringRef keyword, - ArrayRef<BlockArgument> values) { + ArrayRef<BlockArgument> values, + ArrayAttr attributes = {}) { if (values.empty()) return; - auto printBlockArg = [](BlockArgument v) { - return llvm::formatv("{} : {}", v, v.getType()); - }; - p << ' ' << keyword << '(' - << llvm::interleaved(llvm::map_range(values, printBlockArg)) << ')'; + p << ' ' << keyword << '('; + llvm::interleaveComma( + llvm::enumerate(values), p, [&p, attributes](auto pair) { + BlockArgument v = pair.value(); + p << v << " : " << v.getType(); + + size_t attributionIndex = pair.index(); + DictionaryAttr attrs; + if (attributes && attributionIndex < attributes.size()) + attrs = llvm::cast<DictionaryAttr>(attributes[attributionIndex]); + if (attrs) + p.printOptionalAttrDict(attrs.getValue()); + }); + p << ')'; } /// Verifies a GPU function memory attribution. @@ -1649,28 +1658,6 @@ ParseResult GPUFuncOp::parse(OpAsmParser &parser, OperationState &result) { return parser.parseRegion(*body, entryArgs); } -static void printAttributions(OpAsmPrinter &p, StringRef keyword, - ArrayRef<BlockArgument> values, - ArrayAttr attributes) { - if (values.empty()) - return; - - p << ' ' << keyword << '('; - llvm::interleaveComma( - llvm::enumerate(values), p, [&p, attributes](auto pair) { - BlockArgument v = pair.value(); - p << v << " : " << v.getType(); - - size_t attributionIndex = pair.index(); - DictionaryAttr attrs; - if (attributes && attributionIndex < attributes.size()) - attrs = llvm::cast<DictionaryAttr>(attributes[attributionIndex]); - if (attrs) - p.printOptionalAttrDict(attrs.getValue()); - }); - p << ')'; -} - void GPUFuncOp::print(OpAsmPrinter &p) { p << ' '; p.printSymbolName(getName()); diff --git a/mlir/test/Dialect/GPU/ops.mlir b/mlir/test/Dialect/GPU/ops.mlir index e3e2474d917c8..7772e7a1681c4 100644 --- a/mlir/test/Dialect/GPU/ops.mlir +++ b/mlir/test/Dialect/GPU/ops.mlir @@ -68,6 +68,31 @@ module attributes {gpu.container_module} { return } + // CHECK-LABEL: func @launch_with_attributions( + func.func @launch_with_attributions(%blk : index, %thrd : index, %float : f32, %data : memref<?xf32,1>) { + // CHECK: gpu.launch + gpu.launch blocks(%bx, %by, %bz) in (%grid_x = %blk, %grid_y = %blk, %grid_z = %blk) + threads(%tx, %ty, %tz) in (%block_x = %thrd, %block_y = %thrd, %block_z = %thrd) + // CHECK-SAME: workgroup(%[[WGROUP1:.*]] : memref<42xf32, 3>, %[[WGROUP2:.*]] : memref<2xf32, 3>) + workgroup(%arg1: memref<42xf32, 3>, %arg2: memref<2xf32, 3>) + // CHECK-SAME: private(%[[PRIVATE1:.*]] : memref<2xf32, 5>, %[[PRIVATE2:.*]] : memref<1xf32, 5>) + private(%arg3: memref<2xf32, 5>, %arg4: memref<1xf32, 5>) + { + "use"(%float) : (f32) -> () + "use"(%data) : (memref<?xf32,1>) -> () + // CHECK: "use"(%[[WGROUP1]], %[[WGROUP2]]) + "use"(%arg1, %arg2) : (memref<42xf32, 3>, memref<2xf32, 3>) -> () + // CHECK: "use"(%[[PRIVATE1]]) + "use"(%arg3) : (memref<2xf32, 5>) -> () + // CHECK: "use"(%[[PRIVATE2]]) + "use"(%arg4) : (memref<1xf32, 5>) -> () + // CHECK: gpu.terminator + gpu.terminator + } + return + } + + gpu.module @kernels { gpu.func @kernel_1(%arg0 : f32, %arg1 : memref<?xf32, 1>) kernel { %tIdX = gpu.thread_id x @@ -228,17 +253,20 @@ module attributes {gpu.container_module} { gpu.module @gpu_funcs { // CHECK-LABEL: gpu.func @kernel_1({{.*}}: f32) - // CHECK: workgroup - // CHECK: private - // CHECK: attributes gpu.func @kernel_1(%arg0: f32) - workgroup(%arg1: memref<42xf32, 3>) - private(%arg2: memref<2xf32, 5>, %arg3: memref<1xf32, 5>) + // CHECK: workgroup(%[[WGROUP1:.*]] : memref<42xf32, 3>, %[[WGROUP2:.*]] : memref<2xf32, 3>) + workgroup(%arg1: memref<42xf32, 3>, %arg2: memref<2xf32, 3>) + // CHECK: private(%[[PRIVATE1:.*]] : memref<2xf32, 5>, %[[PRIVATE2:.*]] : memref<1xf32, 5>) + private(%arg3: memref<2xf32, 5>, %arg4: memref<1xf32, 5>) kernel - attributes {foo="bar"} { - "use"(%arg1) : (memref<42xf32, 3>) -> () - "use"(%arg2) : (memref<2xf32, 5>) -> () - "use"(%arg3) : (memref<1xf32, 5>) -> () + // CHECK: attributes {foo = "bar"} + attributes {foo = "bar"} { + // CHECK: "use"(%[[WGROUP1]], %[[WGROUP2]]) + "use"(%arg1, %arg2) : (memref<42xf32, 3>, memref<2xf32, 3>) -> () + // CHECK: "use"(%[[PRIVATE1]]) + "use"(%arg3) : (memref<2xf32, 5>) -> () + // CHECK: "use"(%[[PRIVATE2]]) + "use"(%arg4) : (memref<1xf32, 5>) -> () gpu.return } |
| Thanks for a quick fix! |
mahesh-attarde pushed a commit to mahesh-attarde/llvm-project that referenced this pull request Oct 3, 2025
This was broken and never tested. Not only this could crash for stack-use-after-scope, but it also would have printed something like: ``` value <block argument> of type 'memref<7x8xf64, #gpu.address_space<workgroup>>' at index: 12 ``` insted of the SSA value. It turns out the gpu.func already have a very similar helper that we can reuse here. Fixes llvm#161394
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
This was broken and never tested.
Not only this could crash for stack-use-after-scope, but it also would have printed something like:
insted of the SSA value.
It turns out the gpu.func already have a very similar helper that we can reuse here.
Fixes #161394