-
Notifications
You must be signed in to change notification settings - Fork 13.5k
[mlir][sparse] add expanded size to API #68614
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.
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
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
Used for asserting we do not run out of bounds on the expanded access pattern.
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-sparse ChangesUsed for asserting we do not run out of bounds on the expanded access pattern. Full diff: https://github.com/llvm/llvm-project/pull/68614.diff 3 Files Affected:
diff --git a/mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h b/mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h
index 0dd23ac52ac6790..0407bccaae8790c 100644
--- a/mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h
+++ b/mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h
@@ -214,8 +214,10 @@ class SparseTensorStorageBase {
/// * `added` a map from `[0..count)` to last-level coordinates for
/// which `filled` is true and `values` contains the assotiated value.
/// * `count` the size of `added`.
+ /// * `expsz` the size of the expanded vector (verification only).
#define DECL_EXPINSERT(VNAME, V) \
- virtual void expInsert(uint64_t *, V *, bool *, uint64_t *, uint64_t);
+ virtual void expInsert(uint64_t *, V *, bool *, uint64_t *, uint64_t, \
+ uint64_t);
MLIR_SPARSETENSOR_FOREVERY_V(DECL_EXPINSERT)
#undef DECL_EXPINSERT
@@ -426,7 +428,7 @@ class SparseTensorStorage final : public SparseTensorStorageBase {
/// Partially specialize expanded insertions based on template types.
void expInsert(uint64_t *lvlCoords, V *values, bool *filled, uint64_t *added,
- uint64_t count) final {
+ uint64_t count, uint64_t expsz) final {
assert((lvlCoords && values && filled && added) && "Received nullptr");
if (count == 0)
return;
@@ -435,6 +437,7 @@ class SparseTensorStorage final : public SparseTensorStorageBase {
// Restore insertion path for first insert.
const uint64_t lastLvl = getLvlRank() - 1;
uint64_t c = added[0];
+ assert(c <= expsz);
assert(filled[c] && "added coordinate is not filled");
lvlCoords[lastLvl] = c;
lexInsert(lvlCoords, values[c]);
@@ -444,6 +447,7 @@ class SparseTensorStorage final : public SparseTensorStorageBase {
for (uint64_t i = 1; i < count; ++i) {
assert(c < added[i] && "non-lexicographic insertion");
c = added[i];
+ assert(c <= expsz);
assert(filled[c] && "added coordinate is not filled");
lvlCoords[lastLvl] = c;
insPath(lvlCoords, lastLvl, added[i - 1] + 1, values[c]);
diff --git a/mlir/lib/ExecutionEngine/SparseTensor/Storage.cpp b/mlir/lib/ExecutionEngine/SparseTensor/Storage.cpp
index 77861e074e9333b..199e4205a61a25b 100644
--- a/mlir/lib/ExecutionEngine/SparseTensor/Storage.cpp
+++ b/mlir/lib/ExecutionEngine/SparseTensor/Storage.cpp
@@ -90,7 +90,7 @@ MLIR_SPARSETENSOR_FOREVERY_V(IMPL_LEXINSERT)
#define IMPL_EXPINSERT(VNAME, V) \
void SparseTensorStorageBase::expInsert(uint64_t *, V *, bool *, uint64_t *, \
- uint64_t) { \
+ uint64_t, uint64_t) { \
FATAL_PIV("expInsert" #VNAME); \
}
MLIR_SPARSETENSOR_FOREVERY_V(IMPL_EXPINSERT)
diff --git a/mlir/lib/ExecutionEngine/SparseTensorRuntime.cpp b/mlir/lib/ExecutionEngine/SparseTensorRuntime.cpp
index 05da8cd79190ed0..8340fe7dcf925be 100644
--- a/mlir/lib/ExecutionEngine/SparseTensorRuntime.cpp
+++ b/mlir/lib/ExecutionEngine/SparseTensorRuntime.cpp
@@ -480,7 +480,8 @@ MLIR_SPARSETENSOR_FOREVERY_V(IMPL_LEXINSERT)
V *values = MEMREF_GET_PAYLOAD(vref); \
bool *filled = MEMREF_GET_PAYLOAD(fref); \
index_type *added = MEMREF_GET_PAYLOAD(aref); \
- tensor.expInsert(lvlCoords, values, filled, added, count); \
+ uint64_t expsz = vref->sizes[0]; \
+ tensor.expInsert(lvlCoords, values, filled, added, count, expsz); \
}
MLIR_SPARSETENSOR_FOREVERY_V(IMPL_EXPINSERT)
#undef IMPL_EXPINSERT
|
yinying-lisa-li
approved these changes
Oct 9, 2023
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.
Used for asserting we do not run out of bounds on the expanded access pattern.