[MLIR][NVVM] Update MLIR mapa to reflect new address space #146031
+27
−9
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
modiking
requested review from
durga4github and
grypp
and removed request for
grypp
|
@llvm/pr-subscribers-mlir-core @llvm/pr-subscribers-mlir Author: None (modiking) ChangesThe mapa.shared.cluster variant that takes in addrspace 3 now should output addrspace 7. Update this the td file to reflect this. Testing: Full diff: https://github.com/llvm/llvm-project/pull/146031.diff 4 Files Affected:
diff --git a/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
index 0a6e66919f021..c9d7e2833fcd3 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
@@ -2600,10 +2600,29 @@ def NVVM_GriddepcontrolLaunchDependentsOp
// NVVM Mapa Op
//===----------------------------------------------------------------------===//
+// Helper predicates for address space checking
+def IsGenericAddressSpace : CPred<"llvm::cast<LLVM::LLVMPointerType>($_self).getAddressSpace() == 0">;
+def IsSharedAddressSpace : CPred<"llvm::cast<LLVM::LLVMPointerType>($_self).getAddressSpace() == 3">;
+def IsSharedClusterAddressSpace : CPred<"llvm::cast<LLVM::LLVMPointerType>($_self).getAddressSpace() == 7">;
+
+class NVVM_AddressSpaceMapping<string inputArg, string resultArg> :
+ PredOpTrait<"valid address space mapping for NVVM mapa operation",
+ Or<[
+ // Generic -> Generic
+ And<[
+ SubstLeaves<"$_self", "$" # inputArg # ".getType()", IsGenericAddressSpace>,
+ SubstLeaves<"$_self", "$" # resultArg # ".getType()", IsGenericAddressSpace>
+ ]>,
+ // Shared -> SharedCluster
+ And<[
+ SubstLeaves<"$_self", "$" # inputArg # ".getType()", IsSharedAddressSpace>,
+ SubstLeaves<"$_self", "$" # resultArg # ".getType()", IsSharedClusterAddressSpace>
+ ]>
+ ]>>;
+
def NVVM_MapaOp: NVVM_Op<"mapa",
- [TypesMatchWith<"`res` and `a` should have the same type",
- "a", "res", "$_self">]> {
- let results = (outs AnyTypeOf<[LLVM_PointerGeneric, LLVM_PointerShared]>:$res);
+ [NVVM_AddressSpaceMapping<"a", "res">, NVVMRequiresSM<90>]> {
+ let results = (outs AnyTypeOf<[LLVM_PointerGeneric, LLVM_PointerSharedCluster]>:$res);
let arguments = (ins AnyTypeOf<[LLVM_PointerGeneric, LLVM_PointerShared]>:$a, I32:$b);
string llvmBuilder = [{
diff --git a/mlir/test/Dialect/LLVMIR/invalid.mlir b/mlir/test/Dialect/LLVMIR/invalid.mlir
index 0cd6b1f20a1bf..f239816bcbad9 100644
--- a/mlir/test/Dialect/LLVMIR/invalid.mlir
+++ b/mlir/test/Dialect/LLVMIR/invalid.mlir
@@ -1201,8 +1201,8 @@ func.func @cp_async(%arg0: !llvm.ptr<3>, %arg1: !llvm.ptr<1>) {
// -----
func.func @mapa(%a: !llvm.ptr, %b : i32) {
- // expected-error @below {{`res` and `a` should have the same type}}
- %0 = nvvm.mapa %a, %b: !llvm.ptr -> !llvm.ptr<3>
+ // expected-error @below {{'nvvm.mapa' op failed to verify that valid address space mapping for NVVM mapa operation}}
+ %0 = nvvm.mapa %a, %b: !llvm.ptr -> !llvm.ptr<7>
return
}
diff --git a/mlir/test/Dialect/LLVMIR/nvvm.mlir b/mlir/test/Dialect/LLVMIR/nvvm.mlir
index d3915492c38a0..46e3f1e5200fd 100644
--- a/mlir/test/Dialect/LLVMIR/nvvm.mlir
+++ b/mlir/test/Dialect/LLVMIR/nvvm.mlir
@@ -552,7 +552,7 @@ func.func @mapa(%a: !llvm.ptr, %a_shared: !llvm.ptr<3>, %b : i32) {
// CHECK: nvvm.mapa %{{.*}}
%0 = nvvm.mapa %a, %b: !llvm.ptr -> !llvm.ptr
// CHECK: nvvm.mapa %{{.*}}
- %1 = nvvm.mapa %a_shared, %b: !llvm.ptr<3> -> !llvm.ptr<3>
+ %1 = nvvm.mapa %a_shared, %b: !llvm.ptr<3> -> !llvm.ptr<7>
return
}
diff --git a/mlir/test/Target/LLVMIR/nvvmir.mlir b/mlir/test/Target/LLVMIR/nvvmir.mlir
index 3a0713f2feee8..0cfcd8a4ef18d 100644
--- a/mlir/test/Target/LLVMIR/nvvmir.mlir
+++ b/mlir/test/Target/LLVMIR/nvvmir.mlir
@@ -769,8 +769,8 @@ llvm.func @nvvm_griddepcontrol_launch_dependents() {
llvm.func @nvvm_mapa(%a: !llvm.ptr, %a_shared: !llvm.ptr<3>, %b : i32) {
// CHECK-LLVM: call ptr @llvm.nvvm.mapa(ptr %{{.*}}, i32 %{{.*}})
%0 = nvvm.mapa %a, %b: !llvm.ptr -> !llvm.ptr
- // CHECK-LLVM: call ptr addrspace(3) @llvm.nvvm.mapa.shared.cluster(ptr addrspace(3) %{{.*}}, i32 %{{.*}})
- %1 = nvvm.mapa %a_shared, %b: !llvm.ptr<3> -> !llvm.ptr<3>
+ // CHECK-LLVM: call ptr addrspace(7) @llvm.nvvm.mapa.shared.cluster(ptr addrspace(3) %{{.*}}, i32 %{{.*}})
+ %1 = nvvm.mapa %a_shared, %b: !llvm.ptr<3> -> !llvm.ptr<7>
llvm.return
}
|
durga4github
approved these changes
Jul 2, 2025
grypp
reviewed
Jul 3, 2025
Comment on lines
3017
to
3030
| class NVVM_MapaASCheck<string inputArg, string resultArg> : | ||
| PredOpTrait<"Valid address-space check(or mapping) for mapa Op", | ||
| Or<[ | ||
| // Generic -> Generic | ||
| And<[ | ||
| SubstLeaves<"$_self", "$" # inputArg # ".getType()", IsGenericAddressSpace>, | ||
| SubstLeaves<"$_self", "$" # resultArg # ".getType()", IsGenericAddressSpace> | ||
| ]>, | ||
| // Shared -> SharedCluster | ||
| And<[ | ||
| SubstLeaves<"$_self", "$" # inputArg # ".getType()", IsSharedAddressSpace>, | ||
| SubstLeaves<"$_self", "$" # resultArg # ".getType()", IsSharedClusterAddressSpace> | ||
| ]> | ||
| ]>>; |
There was a problem hiding this comment.
Can we make this check generic check? It is not really mapa specific
There was a problem hiding this comment.
One can use it like following
def NVVM_MapaOp: NVVM_Op<"mapa",
[NVVM_AddressCheckCheck<"res", [LLVM_PointerShared, LLVM_PointerSharedCluster]>, NVVMRequiresSM<90>]> {
There was a problem hiding this comment.
Added a generic check in OpBase.td and use it to build the mapa AS check
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The mapa.shared.cluster variant that takes in addrspace 3 now should output addrspace 7.
This patch updates the NVVMOps.td file to reflect this.