[mlir] IntegerRangeAnalysis: don't loop over splat attr #115229
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
IanWood1
changed the title
|
@llvm/pr-subscribers-mlir-arith @llvm/pr-subscribers-mlir Author: Ian Wood (IanWood1) ChangesIf the Full diff: https://github.com/llvm/llvm-project/pull/115229.diff 1 Files Affected:
diff --git a/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp b/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp
index 8682294c8a6972..6646c189eb1c3e 100644
--- a/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp
+++ b/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp
@@ -10,6 +10,7 @@
#include "mlir/Interfaces/InferIntRangeInterface.h"
#include "mlir/Interfaces/Utils/InferIntRangeCommon.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/Debug.h"
#include <optional>
@@ -42,6 +43,12 @@ void arith::ConstantOp::inferResultRanges(ArrayRef<ConstantIntRanges> argRanges,
}
if (auto arrayCstAttr =
llvm::dyn_cast_or_null<DenseIntElementsAttr>(getValue())) {
+ if (arrayCstAttr.isSplat()) {
+ setResultRange(getResult(), ConstantIntRanges::constant(
+ arrayCstAttr.getSplatValue<APInt>()));
+ return;
+ }
+
std::optional<ConstantIntRanges> result;
for (const APInt &val : arrayCstAttr) {
auto range = ConstantIntRanges::constant(val);
|
IanWood1
force-pushed
the
handle_splat
branch
from
df085e1 to
aa13a08
Compare
Hardcode84
reviewed
Nov 6, 2024
kuhar
reviewed
Nov 6, 2024
IanWood1
force-pushed
the
handle_splat
branch
from
de6078a to
ec039cd
Compare
f54cdc5 added tests to check the for the correct handling of splat values and change should really only affect the performance of very large splat constants. So, I'm not sure how this should be tested. |
kuhar
approved these changes
Nov 7, 2024
Oh, yeah, I forgot we already had functional test for splats ). LGTM. |
Hardcode84
approved these changes
Nov 7, 2024
krzysz00
approved these changes
Nov 7, 2024
IanWood1
added a commit
that referenced
this pull request
Nov 7, 2024
)" This reverts commit 3deee23.
IanWood1
added a commit
that referenced
this pull request
Nov 7, 2024
Hitting assertion in IREE https://github.com/iree-org/iree/actions/runs/11732283897/job/32684201665?pr=19066 ``` iree-compile: /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/BuiltinAttributes.h:423: auto mlir::DenseElementsAttr::getValues() const [T = llvm::APInt]: Assertion `succeeded(range) && "element type cannot be iterated"' failed. ``` Reverts #115229
In this case we tag the PR with [NFC] (no functional change) to convey this. |
IanWood1
added a commit
that referenced
this pull request
Nov 8, 2024
Reland #115229 which was reverted by #115388 because it was hitting an assertion in IREE. From the original change: If the `DenseIntElementsAttr` is a splat value, there is no need to loop over the entire attr. Instead, just update with the splat value. The problem with the original implementation is that `SplatElementsAttr` might be an attr of non `APInt` (e.g. float) elements. Instead, check if `DenseIntElementsAttr` is splat and use the splat value. Added a test to ensure there's no crash when handling float attrs.
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
If the `DenseIntElementsAttr` is a splat value, there is no need to loop over the entire attr. Instead, just update with the splat value.
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
…115388) Hitting assertion in IREE https://github.com/iree-org/iree/actions/runs/11732283897/job/32684201665?pr=19066 ``` iree-compile: /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/BuiltinAttributes.h:423: auto mlir::DenseElementsAttr::getValues() const [T = llvm::APInt]: Assertion `succeeded(range) && "element type cannot be iterated"' failed. ``` Reverts llvm#115229
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
…5399) Reland llvm#115229 which was reverted by llvm#115388 because it was hitting an assertion in IREE. From the original change: If the `DenseIntElementsAttr` is a splat value, there is no need to loop over the entire attr. Instead, just update with the splat value. The problem with the original implementation is that `SplatElementsAttr` might be an attr of non `APInt` (e.g. float) elements. Instead, check if `DenseIntElementsAttr` is splat and use the splat value. Added a test to ensure there's no crash when handling float attrs.
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.
If the
DenseIntElementsAttris a splat value, there is no need to loop over the entire attr. Instead, just update with the splat value.