Skip to content
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

Modify aie2xclbin tool to allow merging kernels in existing XCLBIN #1561

Merged
merged 2 commits into from
Jun 15, 2024
Merged

Modify aie2xclbin tool to allow merging kernels in existing XCLBIN #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e480489
Modify aie2xclbin tool to allow merging kernels in existing XCLBIN
nirvedhmeshram Jun 13, 2024
4587eb1
Merge branch 'main' into nm_xclbin_merge
nirvedhmeshram Jun 14, 2024
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
83 changes: 65 additions & 18 deletions tools/aie2xclbin/XCLBinGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ static json::Object makeKernelJSON(std::string name, std::string id,

static LogicalResult generateXCLBin(MLIRContext *context, ModuleOp moduleOp,
XCLBinGenConfig &TK,
const StringRef &Output) {
const StringRef &Output,
const StringRef &inputXclbin = "") {
std::string errorMessage;
// Create mem_topology.json.
SmallString<64> memTopologyJsonFile(TK.TempDir);
Expand Down Expand Up @@ -507,7 +508,8 @@ static LogicalResult generateXCLBin(MLIRContext *context, ModuleOp moduleOp,
"type": "PRIMARY",
"pdi_id": "0x01",
"dpu_kernel_ids": [
"0x901"
")" + TK.XCLBinKernelID +
R"("
],
"pre_cdo_groups": [
"0xC1"
Expand Down Expand Up @@ -581,22 +583,66 @@ static LogicalResult generateXCLBin(MLIRContext *context, ModuleOp moduleOp,
if (runTool(bootgenBin, flags, TK.Verbose) != 0)
return moduleOp.emitOpError("failed to execute bootgen");
}

SmallVector<std::string, 20> flags;
// Execute the xclbinutil command.
std::string memArg = "MEM_TOPOLOGY:JSON:" + std::string(memTopologyJsonFile);
std::string partArg =
"AIE_PARTITION:JSON:" + std::string(aiePartitionJsonFile);
{
std::string memArg =
"MEM_TOPOLOGY:JSON:" + std::string(memTopologyJsonFile);
std::string partArg =
"AIE_PARTITION:JSON:" + std::string(aiePartitionJsonFile);
SmallVector<std::string, 20> flags{"--add-replace-section",
memArg,
"--add-kernel",
std::string(kernelsJsonFile),
"--add-replace-section",
partArg,
"--force",
"--output",
std::string(Output)};

if (!inputXclbin.empty()) {
// Create aie_partition.json.
SmallString<64> aieInputPartitionJsonFile(TK.TempDir);
sys::path::append(aieInputPartitionJsonFile, "aie_input_partition.json");

std::string inputPartArg =
"AIE_PARTITION:JSON:" + std::string(aieInputPartitionJsonFile);
SmallVector<std::string, 20> inputFlags{"--dump-section", inputPartArg,
"--force", "--input",
std::string(inputXclbin)};
if (auto xclbinutil = sys::findProgramByName("xclbinutil")) {
if (runTool(*xclbinutil, inputFlags, TK.Verbose) != 0)
return moduleOp.emitOpError("failed to execute xclbinutil");
} else {
return moduleOp.emitOpError("could not find xclbinutil");
}
auto aieInputPartitionOut =
openInputFile(aieInputPartitionJsonFile, &errorMessage);
if (!aieInputPartitionOut)
return moduleOp.emitOpError(errorMessage);
Expected<json::Value> aieInputPartitionOutValue =
llvm::json::parse(aieInputPartitionOut->getBuffer());
json::Array *aieInputPartionPDIs;
aieInputPartionPDIs = aieInputPartitionOutValue->getAsObject()
->getObject("aie_partition")
->getArray("PDIs");
auto aiePartitionOut = openInputFile(aiePartitionJsonFile, &errorMessage);
if (!aiePartitionOut)
return moduleOp.emitOpError(errorMessage);
llvm::Expected<llvm::json::Value> aiePartitionOutValue =
llvm::json::parse(aiePartitionOut->getBuffer());
json::Array *aiePartionPDIs;
aiePartionPDIs = aiePartitionOutValue->getAsObject()
->getObject("aie_partition")
->getArray("PDIs");
aieInputPartionPDIs->insert(aieInputPartionPDIs->end(),
aiePartionPDIs->begin(),
aiePartionPDIs->end());
// rewrite aie partion json file
auto aiePartitionJsonOut =
openOutputFile(aiePartitionJsonFile, &errorMessage);
if (!aiePartitionJsonOut)
return moduleOp.emitOpError(errorMessage);
aiePartitionJsonOut->os() << formatv("{0:2}", *aieInputPartitionOutValue);
aiePartitionJsonOut->keep();
flags.insert(flags.end(), {"--input", std::string(inputXclbin)});

} else {
flags.insert(flags.end(), {"--add-replace-section", memArg});
}
flags.insert(flags.end(), {"--add-kernel", std::string(kernelsJsonFile),
"--add-replace-section", partArg, "--force",
"--output", std::string(Output)});

if (auto xclbinutil = sys::findProgramByName("xclbinutil")) {
if (runTool(*xclbinutil, flags, TK.Verbose) != 0)
Expand Down Expand Up @@ -825,7 +871,8 @@ static LogicalResult generateUnifiedObject(MLIRContext *context,

LogicalResult xilinx::aie2xclbin(MLIRContext *ctx, ModuleOp moduleOp,
XCLBinGenConfig &TK, StringRef OutputNPU,
StringRef OutputXCLBin) {
StringRef OutputXCLBin,
StringRef InputXCLBin = "") {
PassManager pm(ctx, moduleOp.getOperationName());
applyConfigToPassManager(TK, pm);

Expand Down Expand Up @@ -886,7 +933,7 @@ LogicalResult xilinx::aie2xclbin(MLIRContext *ctx, ModuleOp moduleOp,
if (failed(generateCDO(ctx, moduleOp, TK)))
return moduleOp.emitOpError("Failed to generate CDO");

if (failed(generateXCLBin(ctx, moduleOp, TK, OutputXCLBin)))
if (failed(generateXCLBin(ctx, moduleOp, TK, OutputXCLBin, InputXCLBin)))
return moduleOp.emitOpError("Failed to generate XCLBin");

return success();
Expand Down
5 changes: 3 additions & 2 deletions tools/aie2xclbin/XCLBinGen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ struct XCLBinGenConfig {
void findVitis(XCLBinGenConfig &TK);

mlir::LogicalResult aie2xclbin(mlir::MLIRContext *ctx, mlir::ModuleOp moduleOp,
XCLBinGenConfig &TK, llvm::StringRef OutputNPU,
llvm::StringRef OutputXCLBin);
XCLBinGenConfig &TK, llvm::StringRef outputNPU,
llvm::StringRef outputXCLBin,
llvm::StringRef inputXCLBin);

} // namespace xilinx
7 changes: 6 additions & 1 deletion tools/aie2xclbin/aie2xclbin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ cl::opt<std::string>
cl::desc("Output xclbin filename for CDO/XCLBIN target"),
cl::init("final.xclbin"), cl::cat(AIE2XCLBinCat));

cl::opt<std::string> inputXCLBinName(
"input-xclbin-name",
cl::desc("input xclbin filename on which new xclbin is merged into"),
cl::init(""), cl::cat(AIE2XCLBinCat));

cl::opt<std::string> XCLBinKernelName("xclbin-kernel-name",
cl::desc("Kernel name in xclbin file"),
cl::init("MLIR_AIE"),
Expand Down Expand Up @@ -215,7 +220,7 @@ int main(int argc, char *argv[]) {
return 1;

if (failed(aie2xclbin(&ctx, *owning, TK, NPUInstsName.getValue(),
XCLBinName.getValue())))
XCLBinName.getValue(), inputXCLBinName.getValue())))
return 1;

return 0;
Expand Down
Loading