[Mlir-commits] [mlir] [mlir][sparse] make high and 2:4 a level format, not a level property (PR #67206)

[Aart Bik]

https://github.com/aartbik updated https://github.com/llvm/llvm-project/pull/67206

>From 87955abbdce3e36513700d01bfd88c7032370ace Mon Sep 17 00:00:00 2001
From: Aart Bik <ajcbik at google.com>
Date: Fri, 22 Sep 2023 16:25:20 -0700
Subject: [PATCH 1/2] [mlir][sparse] make high and 2:4 a level format, not a
 level property

After some internal discussion, we decided that these features were
best represented as a separate format, and not a property.
---
 .../SparseTensor/IR/SparseTensorAttrDefs.td   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
index 6a8e66335fbc697..b1e6a1927299828 100644
--- a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
+++ b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
@@ -141,20 +141,24 @@ def SparseTensorEncodingAttr : SparseTensor_Attr<"SparseTensorEncoding",
 
     - **dense** : all entries along this level are stored
     - **compressed** : only nonzeros along this level are stored
+    - **loose_compressed** : as compressed, but allows for free space between regions
     - **singleton** : a variant of the compressed format, where coordinates have no siblings
+    - **block2_4** : the compression uses a 2:4 encoding per 1x4 block
+
+    For a compressed level, each position interval is represented in a compact
+    way with a lowerbound `pos(i)` and an upperbound `pos(i+1) - 1`, which implies
+    that successive intervals must appear in order without any "holes" in between
+    them. The loose compressed format relaxes these constrainst by representing each
+    position interval with a lowerbound `lo(i)` and an upperbound `hi(i)`, which
+    allows intervals to appear in arbitrary order and with elbow room between them.
 
-    Different level-formats may have different collections of level-properties.
     By default, each level-type has the property of being unique (no duplicate
-    coordinates at that level), ordered (coordinates appear sorted at that
-    level), and, for compression, storing each position interval in a compact
-    way with a lowerbound `pos(i)`" and an upperbound `pos(i+1) - 1`.
-    The following properties can be added to a level-format to change this
-    default behavior:
+    coordinates at that level) and ordered (coordinates appear sorted at that
+    level). The following properties can be added to a level-format to change
+    this default behavior:
 
     - **nonunique** : duplicate coordinates may appear at the level
     - **nonordered** : coordinates may appear in arbribratry order
-    - **high** : position interval upperbounds are stored explicitly
-    - **block2_4** : the compression uses a 2:4 encoding per 1x4 block
 
     In addition to the map, the following two fields are optional:
 

>From 762f9f9a4cea544fe9f7fba48ce01caadb09ccbe Mon Sep 17 00:00:00 2001
From: Aart Bik <ajcbik at google.com>
Date: Fri, 22 Sep 2023 16:41:12 -0700
Subject: [PATCH 2/2] typo

---
 .../mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
index b1e6a1927299828..e6577aed063ca7f 100644
--- a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
+++ b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td
@@ -148,7 +148,7 @@ def SparseTensorEncodingAttr : SparseTensor_Attr<"SparseTensorEncoding",
     For a compressed level, each position interval is represented in a compact
     way with a lowerbound `pos(i)` and an upperbound `pos(i+1) - 1`, which implies
     that successive intervals must appear in order without any "holes" in between
-    them. The loose compressed format relaxes these constrainst by representing each
+    them. The loose compressed format relaxes these constraints by representing each
     position interval with a lowerbound `lo(i)` and an upperbound `hi(i)`, which
     allows intervals to appear in arbitrary order and with elbow room between them.