Skip to content

[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.

Sign up for GitHub

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 1 commit into from
Oct 9, 2023
Merged

[mlir][sparse] add expanded size to API #68614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand All @@ -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]);
Expand All @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/ExecutionEngine/SparseTensor/Storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion mlir/lib/ExecutionEngine/SparseTensorRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down