Skip to content

Rename in-tree AIE passes to AMDAIE #479

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 1 commit into from
Jun 28, 2024
Merged

Rename in-tree AIE passes to AMDAIE #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 0 additions & 72 deletions compiler/plugins/target/AMD-AIE/aie/AIEXToStandard.cpp
View file
Open in desktop

This file was deleted.

33 changes: 12 additions & 21 deletions ...AIE/aie/AIEAssignBufferAddressesBasic.cpp → .../aie/AMDAIEAssignBufferAddressesBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,30 @@
#include "mlir/IR/Attributes.h"
#include "mlir/Pass/Pass.h"

#define DEBUG_TYPE "aie-assign-buffers-basic"
#define DEBUG_TYPE "amdaie-assign-buffers-basic"

using namespace mlir;
using namespace xilinx;
using namespace xilinx::AIE;

namespace mlir::iree_compiler::AMDAIE {
struct AIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
struct AMDAIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(
AIEAssignBufferAddressesPassBasic)
AMDAIEAssignBufferAddressesPassBasic)

AIEAssignBufferAddressesPassBasic()
AMDAIEAssignBufferAddressesPassBasic()
: mlir::OperationPass<DeviceOp>(resolveTypeID()) {}
AIEAssignBufferAddressesPassBasic(
const AIEAssignBufferAddressesPassBasic &other)
: mlir::OperationPass<DeviceOp>(other) {}

llvm::StringRef getArgument() const override {
return "aie-assign-buffer-addresses-basic";
return "amdaie-assign-buffer-addresses-basic";
}

llvm::StringRef getName() const override {
return "AIEAssignBufferAddressesBasic";
return "AMDAIEAssignBufferAddressesBasic";
}

std::unique_ptr<mlir::Pass> clonePass() const override {
return std::make_unique<AIEAssignBufferAddressesPassBasic>(
*static_cast<const AIEAssignBufferAddressesPassBasic *>(this));
}

void getDependentDialects(DialectRegistry &registry) const override {
registry.insert<func::FuncDialect>();
registry.insert<AIEDialect>();
return std::make_unique<AMDAIEAssignBufferAddressesPassBasic>(
*static_cast<const AMDAIEAssignBufferAddressesPassBasic *>(this));
}

void runOnOperation() override {
Expand Down Expand Up @@ -85,13 +76,13 @@ struct AIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
};

std::unique_ptr<OperationPass<DeviceOp>>
createAIEAssignBufferAddressesBasicPass() {
return std::make_unique<AIEAssignBufferAddressesPassBasic>();
createAMDAIEAssignBufferAddressesBasicPass() {
return std::make_unique<AMDAIEAssignBufferAddressesPassBasic>();
}

void registerAIEAssignBufferAddressesBasic() {
void registerAMDAIEAssignBufferAddressesBasic() {
mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
return createAIEAssignBufferAddressesBasicPass();
return createAMDAIEAssignBufferAddressesBasicPass();
});
}
} // namespace mlir::iree_compiler::AMDAIE
41 changes: 25 additions & 16 deletions ...-AIE/aie/AIEAssignBufferDescriptorIDs.cpp → ...E/aie/AMDAIEAssignBufferDescriptorIDs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,14 @@
#include "aie/Dialect/AIE/IR/AIEDialect.h"
#include "mlir/Pass/Pass.h"

#define DEBUG_TYPE "aie-assign-bd-ids"
#define DEBUG_TYPE "amdaie-assign-bd-ids"
#define EVEN_BD_ID_START 0
#define ODD_BD_ID_START 24

using namespace mlir;
using namespace xilinx;
using namespace xilinx::AIE;

#define GEN_PASS_DECL_AIEASSIGNBUFFERDESCRIPTORIDS
#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
#undef GEN_PASS_DECL_AIEASSIGNBUFFERDESCRIPTORIDS

#define GEN_PASS_DEF_AIEASSIGNBUFFERDESCRIPTORIDS
#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
#undef GEN_PASS_DEF_AIEASSIGNBUFFERDESCRIPTORIDS

struct BdIdGenerator {
BdIdGenerator(int col, int row, const AIETargetModel &targetModel)
: col(col), row(row), isMemTile(targetModel.isMemTile(col, row)) {}
Expand Down Expand Up @@ -55,9 +47,26 @@ struct BdIdGenerator {

namespace mlir::iree_compiler::AMDAIE {

struct AIEAssignBufferDescriptorIDsPass
: ::impl::AIEAssignBufferDescriptorIDsBase<
AIEAssignBufferDescriptorIDsPass> {
struct AMDAIEAssignBufferDescriptorIDsPass : mlir::OperationPass<DeviceOp> {
MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(
AMDAIEAssignBufferDescriptorIDsPass)

AMDAIEAssignBufferDescriptorIDsPass()
: mlir::OperationPass<DeviceOp>(resolveTypeID()) {}

llvm::StringRef getArgument() const override {
return "amdaie-assign-bd-ids";
}

llvm::StringRef getName() const override {
return "AMDAIEAssignBufferDescriptorIDsPass";
}

std::unique_ptr<mlir::Pass> clonePass() const override {
return std::make_unique<AMDAIEAssignBufferDescriptorIDsPass>(
*static_cast<const AMDAIEAssignBufferDescriptorIDsPass *>(this));
}

void runOnOperation() override {
DeviceOp targetOp = getOperation();
const AIETargetModel &targetModel = targetOp.getTargetModel();
Expand Down Expand Up @@ -133,13 +142,13 @@ struct AIEAssignBufferDescriptorIDsPass
};

std::unique_ptr<OperationPass<DeviceOp>>
createAIEAssignBufferDescriptorIDsPass() {
return std::make_unique<AIEAssignBufferDescriptorIDsPass>();
createAMDAIEAssignBufferDescriptorIDsPass() {
return std::make_unique<AMDAIEAssignBufferDescriptorIDsPass>();
}

void registerAIEAssignBufferDescriptorIDs() {
void registerAMDAIEAssignBufferDescriptorIDs() {
mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
return createAIEAssignBufferDescriptorIDsPass();
return createAMDAIEAssignBufferDescriptorIDsPass();
});
}
} // namespace mlir::iree_compiler::AMDAIE
35 changes: 18 additions & 17 deletions ...s/target/AMD-AIE/aie/AIEAssignLockIDs.cpp → ...arget/AMD-AIE/aie/AMDAIEAssignLockIDs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,27 @@
#include "llvm/ADT/DenseMap.h"
#include "mlir/Pass/Pass.h"

#define DEBUG_TYPE "aie-assign-lock-ids"
#define DEBUG_TYPE "amdaie-assign-lock-ids"

using namespace mlir;
using namespace xilinx;
using namespace xilinx::AIE;

#define GEN_PASS_DECL_AIEASSIGNLOCKIDS
#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
#undef GEN_PASS_DECL_AIEASSIGNLOCKIDS
namespace mlir::iree_compiler::AMDAIE {
struct AMDAIEAssignLockIDsPass : mlir::OperationPass<DeviceOp> {
MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(AMDAIEAssignLockIDsPass)

#define GEN_PASS_DEF_AIEASSIGNLOCKIDS
#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
#undef GEN_PASS_DEF_AIEASSIGNLOCKIDS
AMDAIEAssignLockIDsPass() : mlir::OperationPass<DeviceOp>(resolveTypeID()) {}

namespace mlir::iree_compiler::AMDAIE {
struct AIEAssignLockIDsPass
: ::impl::AIEAssignLockIDsBase<AIEAssignLockIDsPass> {
void getDependentDialects(DialectRegistry &registry) const override {
registry.insert<func::FuncDialect>();
registry.insert<AIEDialect>();
llvm::StringRef getArgument() const override {
return "amdaie-assign-lock-ids";
}

llvm::StringRef getName() const override { return "AMDAIEAssignLockIDsPass"; }

std::unique_ptr<mlir::Pass> clonePass() const override {
return std::make_unique<AMDAIEAssignLockIDsPass>(
*static_cast<const AMDAIEAssignLockIDsPass *>(this));
}

void runOnOperation() override {
Expand Down Expand Up @@ -102,13 +103,13 @@ struct AIEAssignLockIDsPass
}
}
};
std::unique_ptr<OperationPass<DeviceOp>> createAIEAssignLockIDsPass() {
return std::make_unique<AIEAssignLockIDsPass>();
std::unique_ptr<OperationPass<DeviceOp>> createAMDAIEAssignLockIDsPass() {
return std::make_unique<AMDAIEAssignLockIDsPass>();
}

void registerAIEAssignLockIDs() {
void registerAMDAIEAssignLockIDs() {
mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
return createAIEAssignLockIDsPass();
return createAMDAIEAssignLockIDsPass();
});
}
} // namespace mlir::iree_compiler::AMDAIE
Loading
Loading