[WIP] Channels-to-ObjectFifos: join and distribute pattern support in L2 by abisca · Pull Request #439 · Xilinx/mlir-air

abisca · 2024-02-20T16:31:44Z

No description provided.

…ute objectFifos are not ordered according to memref indices, and objectFifos from L1 to L2 in join case don't have correct size.

…nnels that use L2

…nd_distribute

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+    Operation *endOfLink = nullptr; // one end of a LinkOp (i.e., a put or get)
+    int numLinkEnds = 0; // # ends in this link (i.e., # users of AIE.BufferOp)
+
+    AIE::BDDimLayoutArrayAttr dimensionsToStream = AIE::BDDimLayoutArrayAttr::get(channel->getContext(), {});;


[clang-format] _{reported by reviewdog 🐶}

Suggested change

AIE::BDDimLayoutArrayAttr dimensionsToStream = AIE::BDDimLayoutArrayAttr::get(channel->getContext(), {});;

AIE::BDDimLayoutArrayAttr dimensionsToStream =

AIE::BDDimLayoutArrayAttr::get(channel->getContext(), {});

;

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

      if (res.failed())
        return res;

+      setChannelBufferResources(rewriter, channel, channelPuts[0].getOperation());


[clang-format] _{reported by reviewdog 🐶}

Suggested change

setChannelBufferResources(rewriter, channel, channelPuts[0].getOperation());

setChannelBufferResources(rewriter, channel,

channelPuts[0].getOperation());

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+                                    ? ndcpy.getDstSizes()
+                                    : ndcpy.getSrcSizes();
+      SmallVector<Value> strides = isTileInbound(ndcpy, (int)air::MemorySpace::L1)
+                                      ? ndcpy.getDstStrides()
+                                      : ndcpy.getSrcStrides();


[clang-format] _{reported by reviewdog 🐶}

Suggested change

? ndcpy.getDstSizes()

: ndcpy.getSrcSizes();

SmallVector<Value> strides = isTileInbound(ndcpy, (int)air::MemorySpace::L1)

? ndcpy.getDstStrides()

: ndcpy.getSrcStrides();

? ndcpy.getDstSizes()

: ndcpy.getSrcSizes();

SmallVector<Value> strides =

isTileInbound(ndcpy, (int)air::MemorySpace::L1)

? ndcpy.getDstStrides()

: ndcpy.getSrcStrides();

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+      auto wraps_and_strides =
+          AIE::BDDimLayoutArrayAttr::get(ndcpy->getContext(), ArrayRef(dims));
+      bool useDefaultDataAccessPattern =
+          isAIE2 ? isDefaultDataAccessPattern(sizes, strides, channelPuts[0].getMemref()) : true;


[clang-format] _{reported by reviewdog 🐶}

Suggested change

isAIE2 ? isDefaultDataAccessPattern(sizes, strides, channelPuts[0].getMemref()) : true;

isAIE2 ? isDefaultDataAccessPattern(sizes, strides,

channelPuts[0].getMemref())

: true;

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+                                    ? ndcpy.getDstSizes()
+                                    : ndcpy.getSrcSizes();
+      SmallVector<Value> strides = isTileInbound(ndcpy, (int)air::MemorySpace::L1)
+                                      ? ndcpy.getDstStrides()
+                                      : ndcpy.getSrcStrides();


[clang-format] _{reported by reviewdog 🐶}

Suggested change

? ndcpy.getDstSizes()

: ndcpy.getSrcSizes();

SmallVector<Value> strides = isTileInbound(ndcpy, (int)air::MemorySpace::L1)

? ndcpy.getDstStrides()

: ndcpy.getSrcStrides();

? ndcpy.getDstSizes()

: ndcpy.getSrcSizes();

SmallVector<Value> strides =

isTileInbound(ndcpy, (int)air::MemorySpace::L1)

? ndcpy.getDstStrides()

: ndcpy.getSrcStrides();

github-actions · 2024-05-22T10:51:08Z

mlir/lib/Conversion/AIRToAIEPass.cpp

  LogicalResult findChannelPutGetTile(MyOp op, Value *tile,
-                                      AIE::AIEObjectFifoType *datatype) const {
+                                      std::pair<int, MemRefType> *datatype) const {


[clang-format] _{reported by reviewdog 🐶}

Suggested change

LogicalResult findChannelPutGetTile(MyOp op, Value *tile,

AIE::AIEObjectFifoType *datatype) const {

std::pair<int, MemRefType> *datatype) const {

LogicalResult

findChannelPutGetTile(MyOp op, Value *tile,

std::pair<int, MemRefType> *datatype) const {

github-actions · 2024-05-22T10:51:09Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+                                 air::ChannelOp channel,
+                                 Operation* op) const {


[clang-format] _{reported by reviewdog 🐶}

Suggested change

air::ChannelOp channel,

Operation* op) const {

air::ChannelOp channel, Operation *op) const {

github-actions · 2024-05-22T10:51:09Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+  AIE::ObjectFifoCreateOp createObjectFifo(PatternRewriter &rewriter,
+                                           MemRefType datatype, Value prodTile,
                                           const std::vector<Value> &consTile,
-                                           int depth, StringRef name) const {
-    AIE::ObjectFifoCreateOp fifo = builder.create<AIE::ObjectFifoCreateOp>(
-        builder.getUnknownLoc(), builder.getStringAttr(name), prodTile,
-        consTile, builder.getIntegerAttr(builder.getI32Type(), depth),
-        datatype);
-    return fifo;
+                                           int depth, StringRef name,
+                                           AIE::BDDimLayoutArrayAttr dimensionsToStream,
+                                           AIE::BDDimLayoutArrayArrayAttr dimensionsFromStreamPerConsumer) const {


[clang-format] _{reported by reviewdog 🐶}

Suggested change

AIE::ObjectFifoCreateOp createObjectFifo(PatternRewriter &rewriter,

MemRefType datatype, Value prodTile,

const std::vector<Value> &consTile,

int depth, StringRef name) const {

AIE::ObjectFifoCreateOp fifo = builder.create<AIE::ObjectFifoCreateOp>(

builder.getUnknownLoc(), builder.getStringAttr(name), prodTile,

consTile, builder.getIntegerAttr(builder.getI32Type(), depth),

datatype);

return fifo;

int depth, StringRef name,

AIE::BDDimLayoutArrayAttr dimensionsToStream,

AIE::BDDimLayoutArrayArrayAttr dimensionsFromStreamPerConsumer) const {

AIE::ObjectFifoCreateOp createObjectFifo(

PatternRewriter &rewriter, MemRefType datatype, Value prodTile,

const std::vector<Value> &consTile, int depth, StringRef name,

AIE::BDDimLayoutArrayAttr dimensionsToStream,

AIE::BDDimLayoutArrayArrayAttr dimensionsFromStreamPerConsumer) const {

github-actions · 2024-05-22T10:51:09Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+    return rewriter.create<AIE::ObjectFifoCreateOp>(
+        rewriter.getUnknownLoc(), rewriter.getStringAttr(name), prodTile,
+        consTile, rewriter.getIntegerAttr(rewriter.getI32Type(), depth),
+        AIE::AIEObjectFifoType::get(datatype), dimensionsToStream, dimensionsFromStreamPerConsumer);


[clang-format] _{reported by reviewdog 🐶}

Suggested change

AIE::AIEObjectFifoType::get(datatype), dimensionsToStream, dimensionsFromStreamPerConsumer);

AIE::AIEObjectFifoType::get(datatype), dimensionsToStream,

dimensionsFromStreamPerConsumer);

github-actions · 2024-05-22T10:51:09Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+          {SymbolRefAttr::get(ctx, objFifo.name()), offset});
+  }
+
+  static bool sortLinkObjectFifos(std::pair<Attribute, int64_t> op0, 


[clang-format] _{reported by reviewdog 🐶}

Suggested change

static bool sortLinkObjectFifos(std::pair<Attribute, int64_t> op0,

static bool sortLinkObjectFifos(std::pair<Attribute, int64_t> op0,

github-actions · 2024-06-04T17:02:01Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+    // remove mem_space from memref for objFifo datatype
+    if (datatype->first != (int)air::MemorySpace::L1) {
+      *datatype = {mem_space, memref};
+                   //MemRefType::get(memref.getShape(), memref.getElementType())};


[clang-format] _{reported by reviewdog 🐶}

Suggested change

//MemRefType::get(memref.getShape(), memref.getElementType())};

// MemRefType::get(memref.getShape(), memref.getElementType())};

github-actions · 2024-06-04T17:02:01Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+    //std::sort(input_pairs.begin(), input_pairs.end(), sortLinkObjectFifos);
+    //std::sort(output_pairs.begin(), output_pairs.end(), sortLinkObjectFifos);
+    // retrieve only objectFifo symbol ref attributes


[clang-format] _{reported by reviewdog 🐶}

Suggested change

//std::sort(input_pairs.begin(), input_pairs.end(), sortLinkObjectFifos);

//std::sort(output_pairs.begin(), output_pairs.end(), sortLinkObjectFifos);

// retrieve only objectFifo symbol ref attributes

// std::sort(input_pairs.begin(), input_pairs.end(), sortLinkObjectFifos);

// std::sort(output_pairs.begin(), output_pairs.end(), sortLinkObjectFifos);

// retrieve only objectFifo symbol ref attributes

github-actions · 2024-06-04T17:02:01Z

mlir/lib/Conversion/AIRToAIEPass.cpp

+          rewriter.getArrayAttr(ArrayRef(output_ofs)),
+          srcOffsets, dstOffsets);


[clang-format] _{reported by reviewdog 🐶}

Suggested change

rewriter.getArrayAttr(ArrayRef(output_ofs)),

srcOffsets, dstOffsets);

rewriter.getArrayAttr(ArrayRef(output_ofs)), srcOffsets, dstOffsets);

abisca added 7 commits February 19, 2024 15:22

Changed implementation for L1toL2 1-to-1 support

66c663f

Added tests for join and distribute. Current errors: join and distrib…

9922622

…ute objectFifos are not ordered according to memref indices, and objectFifos from L1 to L2 in join case don't have correct size.

Fix error where objectFifo datatype was not inferred properly for cha…

f4c7cd0

…nnels that use L2

Clang format

4a410a5

Add sorting of objectFifos based on 1DOffset

b5ee9e1

Create struct for linkEnds

f90b738

Merge branch 'main' of https://github.com/Xilinx/mlir-air into join_a…

2a82128

…nd_distribute

jtuyls mentioned this pull request Mar 5, 2024

[RFC] Peeled matmul on MLIR-AIE nod-ai/iree-amd-aie#197

Closed

abisca added 5 commits March 7, 2024 06:06

Use 'unroll' label of for loops to determine depth of objectFifos

4ace32c

Add a way to retrieve data layout transformations from channel put/get

667ce8c

Fixed conflicts with main

300acf6

Merge branch 'main' of https://github.com/Xilinx/mlir-air into join_a…

74dbda7

…nd_distribute

Resolve merge conflicts

fa6d24f

github-actions bot reviewed May 22, 2024

View reviewed changes

abisca added 3 commits June 3, 2024 14:43

Clang format

19cc6f7

Fix error where broadcast tiles where being duplicated

b9d3170

Experimental srcOffsets and dstOffsets in ObjFifo Link

fe1d844

github-actions bot reviewed Jun 4, 2024

View reviewed changes

	setChannelBufferResources(rewriter, channel, channelPuts[0].getOperation());
	setChannelBufferResources(rewriter, channel,
	channelPuts[0].getOperation());

	air::ChannelOp channel,
	Operation* op) const {
	air::ChannelOp channel, Operation *op) const {

	AIE::AIEObjectFifoType::get(datatype), dimensionsToStream, dimensionsFromStreamPerConsumer);
	AIE::AIEObjectFifoType::get(datatype), dimensionsToStream,
	dimensionsFromStreamPerConsumer);

	static bool sortLinkObjectFifos(std::pair<Attribute, int64_t> op0,
	static bool sortLinkObjectFifos(std::pair<Attribute, int64_t> op0,

	//MemRefType::get(memref.getShape(), memref.getElementType())};
	// MemRefType::get(memref.getShape(), memref.getElementType())};

		rewriter.getArrayAttr(ArrayRef(output_ofs)),
		srcOffsets, dstOffsets);

Conversation

abisca commented Feb 20, 2024

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 22, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant