Page MenuHomePhabricator
Differential D122061

[mlir][sparse] Enhancing sparse=>sparse conversion.
ClosedPublic
Actions

Authored by wrengr on Mar 18 2022, 8:08 PM.

Details

Reviewers
aartbik
bixia
penpornk
Commits
rG8cb332406c09: [mlir][sparse] Enhancing sparse=>sparse conversion.
Summary

Fixes: https://github.com/llvm/llvm-project/issues/51652

Depends On D122060

Diff Detail

Event Timeline

wrengr created this revision.Mar 18 2022, 8:08 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 8:09 PM
Herald added subscribers: sdasgup3, wenzhicui, Chia-hungDuan and 17 others. · View Herald Transcript
wrengr requested review of this revision.Mar 18 2022, 8:09 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 8:09 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B155169: Diff 416662.Mar 18 2022, 8:24 PM
wrengr mentioned this in D122054: [mlir][sparse] Introducing options for the SparseTensorConversion pass.Mar 21 2022, 1:24 PM
wrengr mentioned this in D122055: [mlir][sparse] Adding Action::kSparseToSparse for @newSparseTensor.
wrengr mentioned this in D122056: [mlir][sparse] Adding {pointer,index}OverheadTypeEncoding.Mar 21 2022, 1:33 PM
wrengr mentioned this in D122058: [mlir][sparse] Distinguishing "shape" from "sizes" in variable names.Mar 21 2022, 2:49 PM
wrengr mentioned this in rGc7e24db412b3: [mlir][sparse] Introducing options for the SparseTensorConversion pass.Mar 22 2022, 1:11 PM
wrengr mentioned this in rGdf948127ac18: [mlir][sparse] Adding Action::kSparseToSparse for @newSparseTensor.Mar 22 2022, 1:47 PM
wrengr updated this revision to Diff 417401.Mar 22 2022, 2:15 PM

rebase, and fixing build error

Harbormaster completed remote builds in B155702: Diff 417401.Mar 22 2022, 2:15 PM
wrengr updated this revision to Diff 417436.Mar 22 2022, 4:47 PM

redoing the diff

Harbormaster completed remote builds in B155732: Diff 417436.Mar 22 2022, 5:14 PM
wrengr added a child revision: D122435: [mlir][sparse] Moving `delete coo` into codegen instead of runtime library.Mar 24 2022, 2:27 PM
wrengr updated this revision to Diff 418670.Mar 28 2022, 11:59 AM

re-renaming the old appendPointer to appendCurrentPointer (since I've realized the name "finalizeSegment" is better used elsewhere).

wrengr mentioned this in D122060: [mlir][sparse] Factoring out an enumerator over elements of SparseTensorStorage.Mar 29 2022, 12:23 PM
Harbormaster completed remote builds in B156620: Diff 418670.Mar 29 2022, 4:51 PM
wrengr removed a child revision: D122435: [mlir][sparse] Moving `delete coo` into codegen instead of runtime library.Mar 30 2022, 12:33 PM
wrengr updated this revision to Diff 419892.Apr 1 2022, 4:58 PM

Lots of reorganization, subsequent to all the recent changes in the parent revisions.

wrengr added a parent revision: D122936: [mlir][sparse] Moved the ElementConsumer typedef to a "type alias".Apr 1 2022, 4:58 PM
Harbormaster completed remote builds in B157527: Diff 419892.Apr 1 2022, 4:59 PM
wrengr removed a parent revision: D122060: [mlir][sparse] Factoring out an enumerator over elements of SparseTensorStorage.Apr 4 2022, 5:20 PM
wrengr updated this revision to Diff 420357.Apr 4 2022, 5:20 PM
wrengr added a parent revision: D122060: [mlir][sparse] Factoring out an enumerator over elements of SparseTensorStorage.

rebase

wrengr edited the summary of this revision. (Show Details)Apr 4 2022, 5:21 PM
Harbormaster completed remote builds in B157872: Diff 420357.Apr 4 2022, 5:22 PM
wrengr updated this revision to Diff 420370.Apr 4 2022, 7:24 PM

rebase

Harbormaster completed remote builds in B157882: Diff 420370.Apr 4 2022, 7:25 PM
wrengr removed a parent revision: D122060: [mlir][sparse] Factoring out an enumerator over elements of SparseTensorStorage.Apr 5 2022, 12:27 PM
wrengr mentioned this in D122936: [mlir][sparse] Moved the ElementConsumer typedef to a "type alias".Apr 6 2022, 5:33 PM
wrengr updated this revision to Diff 421055.Apr 6 2022, 5:44 PM
wrengr added a parent revision: D122060: [mlir][sparse] Factoring out an enumerator over elements of SparseTensorStorage.

Rebasing for D123166. Also removing a bunch of inline keywords, per MLIR style-guide.

Harbormaster completed remote builds in B158372: Diff 421055.Apr 6 2022, 5:46 PM
wrengr removed a parent revision: D122936: [mlir][sparse] Moved the ElementConsumer typedef to a "type alias".Apr 13 2022, 3:36 PM
wrengr edited the summary of this revision. (Show Details)
wrengr updated this revision to Diff 422678.Apr 13 2022, 3:37 PM

rebase

Harbormaster completed remote builds in B159564: Diff 422678.Apr 13 2022, 4:10 PM
wrengr updated this revision to Diff 428755.May 11 2022, 1:25 PM

Rebasing for the latest version of D122060 (2022-05-11T13:09)

This also introduces a minor change to the enumerator design. Namely, due to the splitting of SparseTensorEnumeratorBase<V> vs SparseTensorEnumerator<P,I,V>, I've had to add the new SparseTensorStorageBase::newEnumerator methods to allow constructing objects of the abstract base type without reintroducing the "<P,I> vs <Q,J> problem" for direct conversion.

wrengr added a comment.May 11 2022, 1:28 PM

Arg! It looks like when I installed the github version of Arcanist to avoid the https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1838310.html bug with Debian's version, the new version isn't automatically applying the formatting script :( So please bear with the overly-long lines for now

wrengr updated this revision to Diff 428771.May 11 2022, 1:59 PM

(attempting to get the clang-formatter to run again)

wrengr updated this revision to Diff 428772.May 11 2022, 2:02 PM

(Previous attempt didn't work, so fixing some things manually)

Harbormaster completed remote builds in B163982: Diff 428772.May 11 2022, 4:04 PM
wrengr updated this revision to Diff 428798.May 11 2022, 4:05 PM

Rerunning git-clang-format

wrengr added a child revision: D125428: [mlir][sparse] Adding "final" keyword wherever appropriate.May 11 2022, 4:11 PM
Harbormaster completed remote builds in B164002: Diff 428798.May 11 2022, 5:57 PM
aartbik accepted this revision.May 16 2022, 1:16 PM
aartbik added inline comments.
mlir/lib/ExecutionEngine/SparseTensorUtils.cpp
569

Yeah! All your abstraction work is paying off!

605

shall we make this an explicit null_ptr for clarity
(I am fine either way but perhaps making it explicit reads clearer)?

943

Fine for this revision, but would it make sense to move this into its own file in the longer run?
Just to split the storage vs. supporting classes a bit more. Probably applies to some of the other classes too by now.

1426

yeah, direct! Sweet!

mlir/test/Dialect/SparseTensor/conversion.mlir
5

period at end

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir
2

period at end of comment

This revision is now accepted and ready to land.May 16 2022, 1:16 PM
wrengr updated this revision to Diff 429856.May 16 2022, 2:33 PM
wrengr marked 2 inline comments as done.

Rebasing for D125596

Harbormaster completed remote builds in B164754: Diff 429856.May 16 2022, 3:20 PM
Closed by commit rG8cb332406c09: [mlir][sparse] Enhancing sparse=>sparse conversion. (authored by wrengr). · Explain WhyMay 16 2022, 3:42 PM
This revision was automatically updated to reflect the committed changes.
wrengr added a commit: rG8cb332406c09: [mlir][sparse] Enhancing sparse=>sparse conversion..

Revision Contents
Changeset List

PathSize
mlir/
lib/
Dialect/
SparseTensor/
Transforms/
76 lines
ExecutionEngine/
362 lines
test/
Dialect/
SparseTensor/
19 lines
Integration/
Dialect/
SparseTensor/
CPU/
102 lines
python/
8 lines

Diff 429882

View Options

mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorConversion.cpp

Loading...
View Options

mlir/lib/ExecutionEngine/SparseTensorUtils.cpp

Loading...
View Options

mlir/test/Dialect/SparseTensor/conversion.mlir

Loading...
View Options

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir

Loading...
View Options

mlir/test/Integration/Dialect/SparseTensor/python/test_stress.py

Loading...