From 058ba76d07f91148dd409d9cea99ce9bc2273e39 Mon Sep 17 00:00:00 2001 From: erwei-xilinx Date: Fri, 9 Aug 2024 15:15:22 -0700 Subject: [PATCH] Enable packet attribute in aie.dma_bd op (#1674) --- include/aie/Dialect/AIE/IR/AIEOps.td | 29 ++++++++++++++++++++++++++++ lib/Dialect/AIE/IR/AIEDialect.cpp | 6 ++++++ lib/Targets/AIETargetCDODirect.cpp | 7 +++++++ test/dialect/AIE/bad_dma_op.mlir | 20 ++++++++++++++++++- test/npu-xrt/packet_flow/aie.mlir | 9 +++------ 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/include/aie/Dialect/AIE/IR/AIEOps.td b/include/aie/Dialect/AIE/IR/AIEOps.td index 349d640f33..89df4982fa 100644 --- a/include/aie/Dialect/AIE/IR/AIEOps.td +++ b/include/aie/Dialect/AIE/IR/AIEOps.td @@ -866,6 +866,7 @@ def AIE_DMABDOp: AIE_Op<"dma_bd", []> { OptionalAttr:$pad_dimensions, DefaultValuedOptionalAttr:$pad_value, OptionalAttr:$bd_id, + OptionalAttr:$packet, // should never be assigned by user... OptionalAttr:$next_bd_id ); @@ -912,6 +913,34 @@ def AIE_DMABDOp: AIE_Op<"dma_bd", []> { $_state.addAttribute("len", $_builder.getI32IntegerAttr(len)); $_state.addAttribute("dimensions", dims); $_state.addAttribute("pad_dimensions", paddims); + }]>, + OpBuilder<(ins "mlir::Value":$buffer, "int":$offset, "int":$len, "PacketInfoAttr":$pkt), [{ + $_state.addOperands(buffer); + $_state.addAttribute("offset", $_builder.getI32IntegerAttr(offset)); + $_state.addAttribute("len", $_builder.getI32IntegerAttr(len)); + $_state.addAttribute("packet", pkt); + }]>, + OpBuilder<(ins "mlir::Value":$buffer, "int":$offset, "int":$len, "BDDimLayoutArrayAttr":$dims, "PacketInfoAttr":$pkt), [{ + $_state.addOperands(buffer); + $_state.addAttribute("offset", $_builder.getI32IntegerAttr(offset)); + $_state.addAttribute("len", $_builder.getI32IntegerAttr(len)); + $_state.addAttribute("dimensions", dims); + $_state.addAttribute("packet", pkt); + }]>, + OpBuilder<(ins "mlir::Value":$buffer, "int":$offset, "int":$len, "BDPadLayoutArrayAttr":$paddims, "PacketInfoAttr":$pkt), [{ + $_state.addOperands(buffer); + $_state.addAttribute("offset", $_builder.getI32IntegerAttr(offset)); + $_state.addAttribute("len", $_builder.getI32IntegerAttr(len)); + $_state.addAttribute("pad_dimensions", paddims); + $_state.addAttribute("packet", pkt); + }]>, + OpBuilder<(ins "mlir::Value":$buffer, "int":$offset, "int":$len, "BDDimLayoutArrayAttr":$dims, "BDPadLayoutArrayAttr":$paddims, "PacketInfoAttr":$pkt), [{ + $_state.addOperands(buffer); + $_state.addAttribute("offset", $_builder.getI32IntegerAttr(offset)); + $_state.addAttribute("len", $_builder.getI32IntegerAttr(len)); + $_state.addAttribute("dimensions", dims); + $_state.addAttribute("pad_dimensions", paddims); + $_state.addAttribute("packet", pkt); }]> ]; } diff --git a/lib/Dialect/AIE/IR/AIEDialect.cpp b/lib/Dialect/AIE/IR/AIEDialect.cpp index 97e274cabd..40c8e23920 100644 --- a/lib/Dialect/AIE/IR/AIEDialect.cpp +++ b/lib/Dialect/AIE/IR/AIEDialect.cpp @@ -1830,6 +1830,12 @@ LogicalResult DMABDOp::verify() { << offsetInBytes << " (bytes)"; } } + if (auto packetInfo = getPacket()) { + if (packetInfo->getPktType() > 7) + return emitOpError("Packet type field can only hold 3 bits."); + if (packetInfo->getPktId() > 31) + return emitOpError("Packet ID field can only hold 5 bits."); + } if (!getLen() && !getBuffer().getType().hasStaticShape()) return emitOpError() << "buffer with dynamic shape requires static length."; diff --git a/lib/Targets/AIETargetCDODirect.cpp b/lib/Targets/AIETargetCDODirect.cpp index 7eef1723b6..3aac41e281 100644 --- a/lib/Targets/AIETargetCDODirect.cpp +++ b/lib/Targets/AIETargetCDODirect.cpp @@ -248,6 +248,8 @@ LogicalResult configureBdInBlock(XAie_DevInst &devInst, XAie_DmaDesc &dmaTileBd, std::optional nextBdId) { std::optional packetType; std::optional packetID; + + // Below should go auto maybePacketOps = block.getOps(); if (!maybePacketOps.empty()) { assert(llvm::range_size(maybePacketOps) == 1 && @@ -363,6 +365,11 @@ LogicalResult configureBdInBlock(XAie_DevInst &devInst, XAie_DmaDesc &dmaTileBd, nextBdId.value(), enableNextBd); } + if (auto packetInfo = bdOp.getPacket()) { + packetType = packetInfo->getPktType(); + packetID = packetInfo->getPktId(); + } + if (packetID) { if (!packetType) bdOp.emitError("must have packetType with packetID"); diff --git a/test/dialect/AIE/bad_dma_op.mlir b/test/dialect/AIE/bad_dma_op.mlir index 493cb6c240..14ec7c8afd 100644 --- a/test/dialect/AIE/bad_dma_op.mlir +++ b/test/dialect/AIE/bad_dma_op.mlir @@ -8,7 +8,7 @@ // //===----------------------------------------------------------------------===// -// RUN: not aie-opt %s 2>&1 | FileCheck %s +// RUN: not aie-opt -split-input-file %s 2>&1 | FileCheck %s // CHECK: error: 'aie.dma' op DMAOp can only appear in single block region module { @@ -32,3 +32,21 @@ module { } } + +// ----- + +// CHECK: error: 'aie.dma_bd' op Packet ID field can only hold 5 bits. +module { + aie.device(npu1_4col) { + %tile14 = aie.tile(1, 4) + %buf14 = aie.buffer(%tile14) { sym_name = "buf14" } : memref<128xi32> + %mem14 = aie.mem(%tile14) { + %srcDma = aie.dma_start("MM2S", 0, ^bd0, ^end) + ^bd0: + aie.dma_bd(%buf14 : memref<128xi32>, 0, 128, []) {packet = #aie.packet_info} + aie.next_bd ^end + ^end: + aie.end + } + } +} diff --git a/test/npu-xrt/packet_flow/aie.mlir b/test/npu-xrt/packet_flow/aie.mlir index 7819e503c7..45b804499c 100644 --- a/test/npu-xrt/packet_flow/aie.mlir +++ b/test/npu-xrt/packet_flow/aie.mlir @@ -95,14 +95,12 @@ module { }] %1 = aie.dma(MM2S, 0) [{ aie.use_lock(%objFifo_in0_cons_cons_lock, AcquireGreaterEqual, 1) - aie.dma_bd_packet(0, 0) - aie.dma_bd(%objFifo_in0_cons_buff_0 : memref<64x64xi8>) + aie.dma_bd(%objFifo_in0_cons_buff_0 : memref<64x64xi8>) {packet = #aie.packet_info} aie.use_lock(%objFifo_in0_cons_prod_lock, Release, 1) }] %2 = aie.dma(MM2S, 1) [{ aie.use_lock(%objFifo_out0_cons_lock, AcquireGreaterEqual, 1) - aie.dma_bd_packet(0, 2) - aie.dma_bd(%objFifo_out0_buff_0 : memref<64x64xi8>) + aie.dma_bd(%objFifo_out0_buff_0 : memref<64x64xi8>) {packet = #aie.packet_info} aie.use_lock(%objFifo_out0_prod_lock, Release, 1) }] %3 = aie.dma(S2MM, 1) [{ @@ -123,8 +121,7 @@ module { }] %1 = aie.dma(MM2S, 0) [{ aie.use_lock(%objFifo_out1_cons_lock, AcquireGreaterEqual, 1) - aie.dma_bd_packet(0, 1) - aie.dma_bd(%objFifo_out1_buff_0 : memref<64x64xi8>) + aie.dma_bd(%objFifo_out1_buff_0 : memref<64x64xi8>) {packet = #aie.packet_info} aie.use_lock(%objFifo_out1_prod_lock, Release, 1) }] aie.end