Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@fifield @github-actions
fifield and github-actions[bot] authored Jan 8, 2025
1 parent 97dd9a8 commit e4ae87b
Showing 1 changed file with 42 additions and 29 deletions.
71 changes: 42 additions & 29 deletions lib/Targets/AIETargetXAIEV2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,
<< tileLocStr(col, row) << "));\n";
if (hasAcq || hasRel) {
output << "__mlir_aie_try(XAie_DmaSetLock("
<< tileDMAInstRefStr(col, row, bdNum) << ", " << "XAie_LockInit("
<< acqLockID << "," << acqValue << ")," << "XAie_LockInit("
<< relLockID << "," << relValue << ")));\n";
<< tileDMAInstRefStr(col, row, bdNum) << ", "
<< "XAie_LockInit(" << acqLockID << "," << acqValue << "),"
<< "XAie_LockInit(" << relLockID << "," << relValue << ")));\n";
if (!hasAcq)
output << tileDMAInstStr(col, row, bdNum)
<< ".LockDesc.LockAcqEn = " << disable << ";\n";
Expand All @@ -212,11 +212,15 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,
output << "__mlir_aie_try(XAie_DmaSetAddrLen("
<< tileDMAInstRefStr(col, row, bdNum) << ", /* addrA */ "
<< "mlir_aie_external_get_addr_myBuffer_" << col << row << "_"
<< bdNum << "(), " << " /* len */ " << lenA << "));\n";
<< bdNum << "(), "
<< " /* len */ " << lenA << "));\n";
output << "__mlir_aie_try(XAie_DmaSetAxi("
<< tileDMAInstRefStr(col, row, bdNum) << ", "
<< "/* smid */ 0, " << "/* burstlen */ 4, " << "/* QoS */ 0, "
<< "/* Cache */ 0, " << "/* Secure */ " << enable << "));\n";
<< "/* smid */ 0, "
<< "/* burstlen */ 4, "
<< "/* QoS */ 0, "
<< "/* Cache */ 0, "
<< "/* Secure */ " << enable << "));\n";
} else {
if ((BaseAddrA + offsetA) % 4)
return memOp.emitError("bd address must be 4B (32b) aligned");
Expand All @@ -240,9 +244,9 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,

int nextBdNum = blockMap[nextBlock];
output << "__mlir_aie_try(XAie_DmaSetNextBd("
<< tileDMAInstRefStr(col, row, bdNum) << ", " << " /* nextbd */ "
<< nextBdNum << ", " << " /* enableNextBd */ " << enableNextBd
<< "));\n";
<< tileDMAInstRefStr(col, row, bdNum) << ", "
<< " /* nextbd */ " << nextBdNum << ", "
<< " /* enableNextBd */ " << enableNextBd << "));\n";
}

if (foundBdPacket) {
Expand All @@ -254,8 +258,8 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,
<< tileDMAInstRefStr(col, row, bdNum) << "));\n";
output << "__mlir_aie_try(XAie_DmaWriteBd(" << deviceInstRef << ", "
<< tileDMAInstRefStr(col, row, bdNum) << ", "
<< tileLocStr(col, row) << ", " << " /* bd */ " << bdNum
<< "));\n";
<< tileLocStr(col, row) << ", "
<< " /* bd */ " << bdNum << "));\n";
}
}

Expand All @@ -271,8 +275,8 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,
<< "/* ChNum */" << chNum
<< ", "
// TODO hack until physical dialect changes
<< "/* dmaDir */ DMA_" << dmaDir << ", " << "/* BdNum */"
<< bdNum << "));\n";
<< "/* dmaDir */ DMA_" << dmaDir << ", "
<< "/* BdNum */" << bdNum << "));\n";
} else {
// in english repeat_count==0 means "do it once" and don't repeat but
// libxaie treats repeat_count=1 as do it once.
Expand All @@ -282,12 +286,16 @@ static mlir::LogicalResult generateDMAConfig(OpType memOp, raw_ostream &output,
<< "/* ChNum */" << chNum
<< ", "
// TODO hack until physical dialect changes
<< "/* dmaDir */ DMA_" << dmaDir << ", " << "/* BdNum */"
<< bdNum << ", " << "/* Repeat */ " << repeatCount << ", "
<< "/* EnToken */ " << "XAIE_DISABLE" << "));\n";
<< "/* dmaDir */ DMA_" << dmaDir << ", "
<< "/* BdNum */" << bdNum << ", "
<< "/* Repeat */ " << repeatCount << ", "
<< "/* EnToken */ "
<< "XAIE_DISABLE"
<< "));\n";
}
output << "__mlir_aie_try(XAie_DmaChannelEnable(" << deviceInstRef << ", "
<< tileLocStr(col, row) << ", " << "/* ChNum */ " << chNum
<< tileLocStr(col, row) << ", "
<< "/* ChNum */ " << chNum
<< ", "
// TODO hack until physical dialect changes
<< "/* dmaDir */ DMA_" << dmaDir << "));\n";
Expand Down Expand Up @@ -396,8 +404,8 @@ mlir::LogicalResult xilinx::AIE::AIETranslateToXAIEV2(ModuleOp module,
std::to_string(row) + ".elf";
output << "{\n"
<< "AieRC RC = XAie_LoadElf(" << deviceInstRef << ", "
<< tileLocStr(col, row) << ", " << "(const char*)\"" << fileName
<< "\",0);\n";
<< tileLocStr(col, row) << ", "
<< "(const char*)\"" << fileName << "\",0);\n";
output << "if (RC != XAIE_OK)\n"
<< " __mlir_aie_verbose(fprintf(stderr, \"Failed to load elf "
"for Core[%d,%d], ret is %d\\n\", "
Expand Down Expand Up @@ -565,8 +573,8 @@ mlir::LogicalResult xilinx::AIE::AIETranslateToXAIEV2(ModuleOp module,
auto init = lock.getInit();
if (init)
output << "__mlir_aie_try(XAie_LockSetValue(" << deviceInstRef << ", "
<< tileLocStr(col, row) << ", " << "XAie_LockInit(" << lockID
<< ", " << *init << ")));\n";
<< tileLocStr(col, row) << ", "
<< "XAie_LockInit(" << lockID << ", " << *init << ")));\n";
});
output << "return XAIE_OK;\n";
output << "} // mlir_aie_initialize_locks\n";
Expand Down Expand Up @@ -646,10 +654,13 @@ mlir::LogicalResult xilinx::AIE::AIETranslateToXAIEV2(ModuleOp module,
output << "__mlir_aie_try(XAie_StrmPktSwMstrPortEnable(" << deviceInstRef
<< ", " << tileLocStr("x", "y") << ", "
<< wireBundleToPortType(connectOp.getDestBundle()) << ", "
<< connectOp.destIndex() << ", " << "/* drop_header */ "
<< connectOp.destIndex() << ", "
<< "/* drop_header */ "
<< (isdma ? "XAIE_SS_PKT_DROP_HEADER"
: "XAIE_SS_PKT_DONOT_DROP_HEADER")
<< ", " << "/* arbiter */ " << arbiter << ", " << "/* MSelEn */ "
<< ", "
<< "/* arbiter */ " << arbiter << ", "
<< "/* MSelEn */ "
<< "0x" << llvm::utohexstr(mask) << "));\n";
}

Expand All @@ -669,12 +680,14 @@ mlir::LogicalResult xilinx::AIE::AIETranslateToXAIEV2(ModuleOp module,
output << "__mlir_aie_try(XAie_StrmPktSwSlaveSlotEnable("
<< deviceInstRef << ", " << tileLocStr("x", "y") << ", "
<< wireBundleToPortType(connectOp.getSourceBundle()) << ", "
<< connectOp.sourceIndex() << ", " << "/* slot */ " << slot
<< ", " << "/* packet */ "
<< packetStr(slotOp.valueInt(), /*type*/ 0) << ", "
<< "/* mask */ " << "0x" << llvm::utohexstr(slotOp.maskInt())
<< ", " << "/* msel */ " << msel << ", " << "/* arbiter */ "
<< arbiter << "));\n";
<< connectOp.sourceIndex() << ", "
<< "/* slot */ " << slot << ", "
<< "/* packet */ " << packetStr(slotOp.valueInt(), /*type*/ 0)
<< ", "
<< "/* mask */ "
<< "0x" << llvm::utohexstr(slotOp.maskInt()) << ", "
<< "/* msel */ " << msel << ", "
<< "/* arbiter */ " << arbiter << "));\n";
slot++;
}
}
Expand Down

0 comments on commit e4ae87b

Please sign in to comment.