Skip to content

[mlir][sparse] rename map utility #68611

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 2 commits into from
Oct 9, 2023
Merged

[mlir][sparse] rename map utility #68611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da1792
[mlir][sparse] rename map utility
aartbik Oct 9, 2023
6bde507
clang-format of course
aartbik Oct 9, 2023
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
12 changes: 6 additions & 6 deletions mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,12 +774,12 @@ Value sparse_tensor::genReader(OpBuilder &builder, Location loc,
return reader;
}

Value sparse_tensor::genReaderBuffers(OpBuilder &builder, Location loc,
SparseTensorType stt,
ArrayRef<Value> dimShapesValues,
Value dimSizesBuffer,
/*out*/ Value &dim2lvlBuffer,
/*out*/ Value &lvl2dimBuffer) {
Value sparse_tensor::genMapBuffers(OpBuilder &builder, Location loc,
SparseTensorType stt,
ArrayRef<Value> dimShapesValues,
Value dimSizesBuffer,
/*out*/ Value &dim2lvlBuffer,
/*out*/ Value &lvl2dimBuffer) {
const Dimension dimRank = stt.getDimRank();
const Level lvlRank = stt.getLvlRank();
// For an identity mapping, the dim2lvl and lvl2dim mappings are
Expand Down
10 changes: 5 additions & 5 deletions mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,11 @@ Value genReader(OpBuilder &builder, Location loc, SparseTensorType stt,
/*out*/ SmallVectorImpl<Value> &dimShapeValues,
/*out*/ Value &dimSizesBuffer);

/// Generates code to set up the buffer parameters for a reader.
Value genReaderBuffers(OpBuilder &builder, Location loc, SparseTensorType stt,
ArrayRef<Value> dimShapeValues, Value dimSizesBuffer,
/*out*/ Value &dim2lvlBuffer,
/*out*/ Value &lvl2dimBuffer);
/// Generates code to set up the buffer parameters for a map.
Value genMapBuffers(OpBuilder &builder, Location loc, SparseTensorType stt,
ArrayRef<Value> dimShapeValues, Value dimSizesBuffer,
/*out*/ Value &dim2lvlBuffer,
/*out*/ Value &lvl2dimBuffer);

//===----------------------------------------------------------------------===//
// Inlined constant generators.
Expand Down
4 changes: 2 additions & 2 deletions mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,8 +1478,8 @@ struct SparseNewConverter : public OpConversionPattern<NewOp> {
// Now construct the dim2lvl and lvl2dim buffers.
Value dim2lvlBuffer;
Value lvl2dimBuffer;
genReaderBuffers(rewriter, loc, dstTp, dimShapesValues, dimSizesBuffer,
dim2lvlBuffer, lvl2dimBuffer);
genMapBuffers(rewriter, loc, dstTp, dimShapesValues, dimSizesBuffer,
dim2lvlBuffer, lvl2dimBuffer);

// Read the COO tensor data.
Value xs = desc.getAOSMemRef();
Expand Down
10 changes: 5 additions & 5 deletions mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ class NewCallParams final {
params[kParamLvlTypes] = genLvlTypesBuffer(builder, loc, stt);
// Construct dimSizes, lvlSizes, dim2lvl, and lvl2dim buffers.
params[kParamDimSizes] = allocaBuffer(builder, loc, dimSizesValues);
params[kParamLvlSizes] = genReaderBuffers(
builder, loc, stt, dimSizesValues, params[kParamDimSizes],
params[kParamDim2Lvl], params[kParamLvl2Dim]);
params[kParamLvlSizes] =
genMapBuffers(builder, loc, stt, dimSizesValues, params[kParamDimSizes],
params[kParamDim2Lvl], params[kParamLvl2Dim]);
// Secondary and primary types encoding.
setTemplateTypes(stt);
// Finally, make note that initialization is complete.
Expand Down Expand Up @@ -446,8 +446,8 @@ class SparseTensorNewConverter : public OpConversionPattern<NewOp> {
Value dim2lvlBuffer;
Value lvl2dimBuffer;
Value lvlSizesBuffer =
genReaderBuffers(rewriter, loc, stt, dimShapesValues, dimSizesBuffer,
dim2lvlBuffer, lvl2dimBuffer);
genMapBuffers(rewriter, loc, stt, dimShapesValues, dimSizesBuffer,
dim2lvlBuffer, lvl2dimBuffer);
// Use the `reader` to parse the file.
Type opaqueTp = getOpaquePointerType(rewriter);
Type eltTp = stt.getElementType();
Expand Down