[mlir][vector] Remove unneeded mask restriction #113742
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
Member
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-vector Author: Jacques Pienaar (jpienaar) ChangesThese were added when the only mapping was to LLVM. Full diff: https://github.com/llvm/llvm-project/pull/113742.diff 1 Files Affected:
diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
index c02b16ea931706..8cd34dc003c1a9 100644
--- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
+++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
@@ -1819,17 +1819,17 @@ def Vector_MaskedLoadOp :
Vector_Op<"maskedload">,
Arguments<(ins Arg<AnyMemRef, "", [MemRead]>:$base,
Variadic<Index>:$indices,
- VectorOfRankAndType<[1], [I1]>:$mask,
- VectorOfRank<[1]>:$pass_thru)>,
- Results<(outs VectorOfRank<[1]>:$result)> {
+ VectorOf<[I1]>:$mask,
+ AnyVector:$pass_thru)>,
+ Results<(outs AnyVector:$result)> {
let summary = "loads elements from memory into a vector as defined by a mask vector";
let description = [{
- The masked load reads elements from memory into a 1-D vector as defined
- by a base with indices and a 1-D mask vector. When the mask is set, the
+ The masked load reads elements from memory into a vector as defined
+ by a base with indices and a mask vector. When the mask is set, the
element is read from memory. Otherwise, the corresponding element is taken
- from a 1-D pass-through vector. Informally the semantics are:
+ from a pass-through vector. Informally the semantics are:
```
result[0] := if mask[0] then base[i + 0] else pass_thru[0]
result[1] := if mask[1] then base[i + 1] else pass_thru[1]
@@ -1882,14 +1882,14 @@ def Vector_MaskedStoreOp :
Vector_Op<"maskedstore">,
Arguments<(ins Arg<AnyMemRef, "", [MemWrite]>:$base,
Variadic<Index>:$indices,
- VectorOfRankAndType<[1], [I1]>:$mask,
- VectorOfRank<[1]>:$valueToStore)> {
+ VectorOf<[I1]>:$mask,
+ AnyVector:$valueToStore)> {
let summary = "stores elements from a vector into memory as defined by a mask vector";
let description = [{
- The masked store operation writes elements from a 1-D vector into memory
- as defined by a base with indices and a 1-D mask vector. When the mask is
+ The masked store operation writes elements from a vector into memory
+ as defined by a base with indices and a mask vector. When the mask is
set, the corresponding element from the vector is written to memory. Otherwise,
no action is taken for the element. Informally the semantics are:
```
@@ -2076,17 +2076,17 @@ def Vector_ExpandLoadOp :
Vector_Op<"expandload">,
Arguments<(ins Arg<AnyMemRef, "", [MemRead]>:$base,
Variadic<Index>:$indices,
- VectorOfRankAndType<[1], [I1]>:$mask,
- VectorOfRank<[1]>:$pass_thru)>,
- Results<(outs VectorOfRank<[1]>:$result)> {
+ VectorOf<[I1]>:$mask,
+ AnyVector:$pass_thru)>,
+ Results<(outs AnyVector:$result)> {
let summary = "reads elements from memory and spreads them into a vector as defined by a mask";
let description = [{
- The expand load reads elements from memory into a 1-D vector as defined
- by a base with indices and a 1-D mask vector. When the mask is set, the
+ The expand load reads elements from memory into a vector as defined
+ by a base with indices and a mask vector. When the mask is set, the
next element is read from memory. Otherwise, the corresponding element
- is taken from a 1-D pass-through vector. Informally the semantics are:
+ is taken from a pass-through vector. Informally the semantics are:
```
index = i
result[0] := if mask[0] then base[index++] else pass_thru[0]
@@ -2140,14 +2140,14 @@ def Vector_CompressStoreOp :
Vector_Op<"compressstore">,
Arguments<(ins Arg<AnyMemRef, "", [MemWrite]>:$base,
Variadic<Index>:$indices,
- VectorOfRankAndType<[1], [I1]>:$mask,
- VectorOfRank<[1]>:$valueToStore)> {
+ VectorOf<[I1]>:$mask,
+ AnyVector:$valueToStore)> {
let summary = "writes elements selectively from a vector as defined by a mask";
let description = [{
- The compress store operation writes elements from a 1-D vector into memory
- as defined by a base with indices and a 1-D mask vector. When the mask is
+ The compress store operation writes elements from a vector into memory
+ as defined by a base with indices and a mask vector. When the mask is
set, the corresponding element from the vector is written next to memory.
Otherwise, no action is taken for the element. Informally the semantics are:
```
|
dcaballe
reviewed
Oct 25, 2024
| Results<(outs VectorOfRank<[1]>:$result)> { | ||
| VectorOf<[I1]>:$mask, | ||
| AnyVector:$pass_thru)>, | ||
| Results<(outs AnyVector:$result)> { |
Contributor
There was a problem hiding this comment.
Probably good to add constraints to ensure that pass_thru and result's types match and that the number of elements in mask and one of the other vectors match as well.
Member
Author
There was a problem hiding this comment.
Ha this let to finding a bug in the generated inference with variadics (well known limitations there)
| VectorOfRankAndType<[1], [I1]>:$mask, | ||
| VectorOfRank<[1]>:$valueToStore)> { | ||
| VectorOf<[I1]>:$mask, | ||
| AnyVector:$valueToStore)> { |
Contributor
There was a problem hiding this comment.
For compress and expand, I would state in the doc that the compression/expansion applies only along the innermost dimension.
These were created when the only mapping was to LLVM, rather than some intrinsic property of the op.
jpienaar
requested review from
banach-space and
nicolasvasilache
as code owners
jpienaar
changed the title
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/55/builds/3094 Here is the relevant piece of the build log for the reference |
winner245
pushed a commit
to winner245/llvm-project
that referenced
this pull request
Oct 26, 2024
These were added when the only mapping was to LLVM.
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
These were added when the only mapping was to LLVM.
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.
These were added when the only mapping was to LLVM.