Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 69 additions & 2 deletions mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
#include "mlir/Dialect/EmitC/IR/EmitC.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/BuiltinTypes.h"
#include "mlir/IR/PatternMatch.h"
#include "mlir/IR/TypeRange.h"
#include "mlir/IR/Value.h"
#include "mlir/IR/ValueRange.h"
#include "mlir/Transforms/DialectConversion.h"
#include <cstdint>

Expand Down Expand Up @@ -288,6 +290,70 @@ struct ConvertStore final : public OpConversionPattern<memref::StoreOp> {
return success();
}
};

struct ConvertExtractStridedMetadata final
: public OpConversionPattern<memref::ExtractStridedMetadataOp> {
using OpConversionPattern::OpConversionPattern;

LogicalResult
matchAndRewrite(memref::ExtractStridedMetadataOp extractStridedMetadataOp,
OpAdaptor operands,
ConversionPatternRewriter &rewriter) const override {
Location loc = extractStridedMetadataOp.getLoc();
Value source = extractStridedMetadataOp.getSource();

MemRefType memrefType = cast<MemRefType>(source.getType());
if (!isMemRefTypeLegalForEmitC(memrefType))
return rewriter.notifyMatchFailure(
loc, "incompatible memref type for EmitC conversion");

emitc::ConstantOp zeroIndex = rewriter.create<emitc::ConstantOp>(
loc, rewriter.getIndexType(), rewriter.getIndexAttr(0));
TypedValue<emitc::ArrayType> srcArrayValue =
cast<TypedValue<emitc::ArrayType>>(operands.getSource());
auto createPointerFromEmitcArray = [loc, &rewriter, &zeroIndex,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is similar to a lambda we use in this patch: #151206 . I plan on refactoring this.

srcArrayValue]() -> emitc::ApplyOp {
int64_t rank = srcArrayValue.getType().getRank();
llvm::SmallVector<mlir::Value> indices;
for (int i = 0; i < rank; ++i) {
indices.push_back(zeroIndex);
}
Comment on lines +317 to +320
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
llvm::SmallVector<mlir::Value> indices;
for (int i = 0; i < rank; ++i) {
indices.push_back(zeroIndex);
}
llvm::SmallVector<mlir::Value> indices(rank, zeroIndex);


emitc::SubscriptOp subPtr = rewriter.create<emitc::SubscriptOp>(
loc, srcArrayValue, mlir::ValueRange(indices));
emitc::ApplyOp ptr = rewriter.create<emitc::ApplyOp>(
loc,
emitc::PointerType::get(srcArrayValue.getType().getElementType()),
rewriter.getStringAttr("&"), subPtr);

return ptr;
};

emitc::ApplyOp srcPtr = createPointerFromEmitcArray();
auto [strides, offset] = memrefType.getStridesAndOffset();
Value offsetValue = rewriter.create<emitc::ConstantOp>(
loc, rewriter.getIndexType(), rewriter.getIndexAttr(offset));

SmallVector<Value> results;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SmallVector<Value> results;
SmallVector<Value> results;
unsigned rank = memrefType.getRank();
results.reserve(2 + 2*rank);

You push 2 vals immediately and another 2 items per iteration of the loop, so you know up front how many items you need, and can avoid potentially allocating in the loop below.

results.push_back(srcPtr);
results.push_back(offsetValue);

for (unsigned i = 0, e = memrefType.getRank(); i < e; ++i) {
Value sizeValue = rewriter.create<emitc::ConstantOp>(
loc, rewriter.getIndexType(),
rewriter.getIndexAttr(memrefType.getDimSize(i)));
results.push_back(sizeValue);

Value strideValue = rewriter.create<emitc::ConstantOp>(
loc, rewriter.getIndexType(), rewriter.getIndexAttr(strides[i]));
results.push_back(strideValue);
}

rewriter.replaceOp(extractStridedMetadataOp, results);
return success();
}
};

} // namespace

void mlir::populateMemRefToEmitCTypeConversion(TypeConverter &typeConverter) {
Expand Down Expand Up @@ -320,6 +386,7 @@ void mlir::populateMemRefToEmitCTypeConversion(TypeConverter &typeConverter) {

void mlir::populateMemRefToEmitCConversionPatterns(
RewritePatternSet &patterns, const TypeConverter &converter) {
patterns.add<ConvertAlloca, ConvertAlloc, ConvertGlobal, ConvertGetGlobal,
ConvertLoad, ConvertStore>(converter, patterns.getContext());
patterns.add<ConvertAlloca, ConvertAlloc, ConvertExtractStridedMetadata,
ConvertGlobal, ConvertGetGlobal, ConvertLoad, ConvertStore>(
converter, patterns.getContext());
}
16 changes: 16 additions & 0 deletions mlir/test/Conversion/MemRefToEmitC/memref-to-emitc.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,19 @@ module @globals {
return
}
}

// -----

// CHECK-LABEL: reinterpret_cast
func.func @reinterpret_cast(%arg18: memref<1xi32>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add another test function w/ a memref of higher rank? maybe memref<1x2x3xi8>? and maybe a non-uniform stride?

// CHECK: %0 = builtin.unrealized_conversion_cast %arg0 : memref<1xi32> to !emitc.array<1xi32>
// CHECK: %1 = "emitc.constant"() <{value = 0 : index}> : () -> index
// CHECK: %2 = emitc.subscript %0[%1] : (!emitc.array<1xi32>, index) -> !emitc.lvalue<i32>
// CHECK: %3 = emitc.apply "&"(%2) : (!emitc.lvalue<i32>) -> !emitc.ptr<i32>
// CHECK: %4 = "emitc.constant"() <{value = 0 : index}> : () -> index
// CHECK: %5 = "emitc.constant"() <{value = 1 : index}> : () -> index
// CHECK: %6 = "emitc.constant"() <{value = 1 : index}> : () -> index
%base_buffer_485, %offset_486, %sizes_487, %strides_488 = memref.extract_strided_metadata %arg18 : memref<1xi32> -> memref<i32>, index, index, index
return
}