remove aie to txn from aie-translate and python biding

include/aie-c/Translation.h

@@ -34,10 +34,6 @@ MLIR_CAPI_EXPORTED MlirLogicalResult
 aieTranslateToCDODirect(MlirOperation moduleOp, MlirStringRef workDirPath,
                         bool bigEndian, bool emitUnified, bool cdoDebug,
                         bool aieSim, bool xaieDebug, bool enableCores);
-
-MLIR_CAPI_EXPORTED MlirLogicalResult aieTranslateToTxn(
-    MlirOperation moduleOp, MlirStringRef outputFile, MlirStringRef workDirPath,
-    bool aieSim, bool xaieDebug, bool enableCores);
 MLIR_CAPI_EXPORTED MlirLogicalResult aieTranslateToCtrlpkt(
     MlirOperation moduleOp, MlirStringRef outputFile, MlirStringRef workDirPath,
     bool aieSim, bool xaieDebug, bool enableCores);

include/aie/Conversion/AIEToConfiguration/AIEToConfiguration.h

@@ -0,0 +1,32 @@
+//===- AIEToConfiguration.h -------------------------------------*- C++ -*-===//
+//
+// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (C) 2024, Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef AIE_CONVERSION_AIETOCONFIGURATION_AIETOCONFIGURATION_H
+#define AIE_CONVERSION_AIETOCONFIGURATION_AIETOCONFIGURATION_H
+
+#include "aie/Dialect/AIE/IR/AIEDialect.h"
+#include "aie/Dialect/AIEX/IR/AIEXDialect.h"
+
+#include "mlir/Pass/Pass.h"
+
+#include <memory>
+
+namespace xilinx::AIE {
+
+std::unique_ptr<mlir::OperationPass<xilinx::AIE::DeviceOp>>
+createConvertAIEToTransactionPass();
+
+std::optional<mlir::ModuleOp>
+convertTransactionBinaryToMLIR(mlir::MLIRContext *ctx,
+                               std::vector<uint8_t> &binary);
+
+} // namespace xilinx::AIE
+
+#endif // AIE_CONVERSION_AIETOCONFIGURATION_AIETOCONFIGURATION_H

include/aie/Conversion/CMakeLists.txt

@@ -1,3 +1,8 @@
+# This file is licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# (c) Copyright 2024 Advanced Micro Devices, Inc.
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name Conversion)
 mlir_tablegen(Passes.capi.h.inc -gen-pass-capi-header -prefix Conversion)

include/aie/Conversion/Passes.h

@@ -11,6 +11,7 @@
 #ifndef AIE_CONVERSION_PASSES_H
 #define AIE_CONVERSION_PASSES_H
 
+#include "aie/Conversion/AIEToConfiguration/AIEToConfiguration.h"
 #include "aie/Conversion/AIEVecToLLVM/AIEVecToLLVM.h"
 #include "aie/Conversion/PassesEnums.h.inc"
 

include/aie/Conversion/Passes.td

@@ -51,4 +51,28 @@ def ConvertAIEVecToLLVM : Pass<"convert-aievec-to-llvm", "mlir::ModuleOp"> {
    ];
 }
 
+//===----------------------------------------------------------------------===//
+// AIEToTransaction
+//===----------------------------------------------------------------------===//
+
+def ConvertAIEToTransaction : Pass<"convert-aie-to-transaction",
+                                   "xilinx::AIE::DeviceOp"> {
+  let summary = "Convert AIE dialect to npu transaction operations";
+  let description = [{
+    This pass converts aie.device operations to a sequence of transaction binary
+    operations (writes, masked writes, and block writes) that can be used to
+    to configure the npu device. The transaction operations are emitted as
+    `npu.write32`, `npu.maskwrite32`, and `npu.blockwrite` operations. A new
+    `aiex.runtime_sequence` operation is inserted into the `aie.device` to
+    contain the new transaction operations sequence.
+  }];
+  let constructor = "xilinx::AIE::createConvertAIEToTransactionPass()";
+  let dependentDialects = ["xilinx::AIE::AIEDialect",
+                           "xilinx::AIEX::AIEXDialect"];
+  let options = [
+      Option<"clElfDir", "elf-dir", "std::string", /*default=*/"",
+             "Where to find ELF files">,
+  ];
+}
+
 #endif // AIE_CONVERSION_PASSES

include/aie/Dialect/AIEX/Transforms/AIEXPasses.h

@@ -1,4 +1,4 @@
-//===- AIEPasses.h ----------------------------------------------*- C++ -*-===//
+//===- AIEXPasses.h ---------------------------------------------*- C++ -*-===//
 //
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

include/aie/Targets/AIETargets.h

@@ -35,13 +35,17 @@ mlir::LogicalResult AIETranslateShimSolution(mlir::ModuleOp module,
 mlir::LogicalResult AIETranslateGraphXPE(mlir::ModuleOp module,
                                          llvm::raw_ostream &);
 mlir::LogicalResult AIETranslateToNPU(mlir::ModuleOp module,
-                                      llvm::raw_ostream &output);
-mlir::LogicalResult AIETranslateToNPU(mlir::ModuleOp, std::vector<uint32_t> &);
+                                      llvm::raw_ostream &output,
+                                      llvm::StringRef sequenceName = "");
+mlir::LogicalResult AIETranslateToNPU(mlir::ModuleOp, std::vector<uint32_t> &,
+                                      llvm::StringRef sequenceName = "");
 mlir::LogicalResult
 AIETranslateControlPacketsToUI32Vec(mlir::ModuleOp module,
-                                    llvm::raw_ostream &output);
+                                    llvm::raw_ostream &output,
+                                    llvm::StringRef sequenceName = "");
 mlir::LogicalResult
-AIETranslateControlPacketsToUI32Vec(mlir::ModuleOp, std::vector<uint32_t> &);
+AIETranslateControlPacketsToUI32Vec(mlir::ModuleOp, std::vector<uint32_t> &,
+                                    llvm::StringRef sequenceName = "");
 mlir::LogicalResult AIETranslateToLdScript(mlir::ModuleOp module,
                                            llvm::raw_ostream &output,
                                            int tileCol, int tileRow);
@@ -60,11 +64,6 @@ AIETranslateToCDODirect(mlir::ModuleOp m, llvm::StringRef workDirPath,
                         bool cdoDebug = false, bool aieSim = false,
                         bool xaieDebug = false, bool enableCores = true);
 mlir::LogicalResult
-AIETranslateToTxn(mlir::ModuleOp m, llvm::raw_ostream &output,
-                  llvm::StringRef workDirPath, bool outputBinary = false,
-                  bool aieSim = false, bool xaieDebug = false,
-                  bool enableCores = true);
-mlir::LogicalResult
 AIETranslateToControlPackets(mlir::ModuleOp m, llvm::raw_ostream &output,
                              llvm::StringRef workDirPath,
                              bool outputBinary = false, bool aieSim = false,
@@ -80,9 +79,6 @@ mlir::LogicalResult AIETranslateToAirbin(mlir::ModuleOp module,
 mlir::LogicalResult AIETranslateToTargetArch(mlir::ModuleOp module,
                                              llvm::raw_ostream &output);
 
-std::optional<mlir::ModuleOp>
-AIETranslateBinaryToTxn(mlir::MLIRContext *ctx, std::vector<uint8_t> &binary);
-
 std::optional<mlir::ModuleOp>
 AIETranslateBinaryToCtrlpkt(mlir::MLIRContext *ctx,
                             std::vector<uint8_t> &binary);

lib/CAPI/CMakeLists.txt

@@ -15,6 +15,7 @@ add_mlir_public_c_api_library(AIECAPI
   AIEX
   AIEXTransforms
   AIEXUtils
+  MLIRAIEToConfiguration
   MLIRAIEVecDialect
   MLIRAIEVecAIE1Dialect
   MLIRAIEVecToLLVM

lib/CAPI/Translation.cpp

@@ -10,6 +10,7 @@
 
 #include "aie-c/Translation.h"
 
+#include "aie/Conversion/AIEToConfiguration/AIEToConfiguration.h"
 #include "aie/Dialect/AIE/IR/AIETargetModel.h"
 #include "aie/Targets/AIERT.h"
 #include "aie/Targets/AIETargets.h"
@@ -83,39 +84,6 @@ MlirLogicalResult aieTranslateToCDODirect(MlirOperation moduleOp,
   return wrap(status);
 }
 
-MlirLogicalResult aieTranslateToTxn(MlirOperation moduleOp,
-                                    MlirStringRef outputFile,
-                                    MlirStringRef workDirPath, bool aieSim,
-                                    bool xaieDebug, bool enableCores) {
-  ModuleOp mod = llvm::cast<ModuleOp>(unwrap(moduleOp));
-  bool outputBinary = false;
-
-  std::string errorMessage;
-  auto output = openOutputFile(StringRef(outputFile.data, outputFile.length),
-                               &errorMessage);
-  if (!output) {
-    llvm::errs() << errorMessage << "\n";
-    return wrap(failure());
-  }
-
-  auto status = AIETranslateToTxn(
-      mod, output->os(), llvm::StringRef(workDirPath.data, workDirPath.length),
-      outputBinary, aieSim, xaieDebug, enableCores);
-
-  std::vector<std::string> diagnostics;
-  ScopedDiagnosticHandler handler(mod.getContext(), [&](Diagnostic &d) {
-    llvm::raw_string_ostream(diagnostics.emplace_back())
-        << d.getLocation() << ": " << d;
-  });
-
-  if (failed(status))
-    for (const auto &diagnostic : diagnostics)
-      std::cerr << diagnostic << "\n";
-  else
-    output->keep();
-  return wrap(status);
-}
-
 MlirLogicalResult aieTranslateToCtrlpkt(MlirOperation moduleOp,
                                         MlirStringRef outputFile,
                                         MlirStringRef workDirPath, bool aieSim,
@@ -151,7 +119,7 @@ MlirLogicalResult aieTranslateToCtrlpkt(MlirOperation moduleOp,
 
 MlirOperation aieTranslateBinaryToTxn(MlirContext ctx, MlirStringRef binary) {
   std::vector<uint8_t> binaryData(binary.data, binary.data + binary.length);
-  auto mod = AIETranslateBinaryToTxn(unwrap(ctx), binaryData);
+  auto mod = convertTransactionBinaryToMLIR(unwrap(ctx), binaryData);
   if (!mod)
     return wrap(ModuleOp().getOperation());
   return wrap(mod->getOperation());