Skip to content

[XDP] Better handle partition shifts in VE2 #8781

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

Closed
wants to merge 5 commits into from
+37 −28
Closed

[XDP] Better handle partition shifts in VE2 #8781

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d823c0c
adjusted partition shifts on VE2
Feb 20, 2025
5321c82
Merge branch 'master' of https://github.com/Xilinx/XRT into ve2_parti…
vipangul Feb 20, 2025
f7fe6ef
simplified code
Feb 20, 2025
824886f
added shifting to VE2 profile reporting
Mar 18, 2025
7b642fd
Merge branch 'master' of https://github.com/Xilinx/XRT into ve2_parti…
Mar 21, 2025
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
3 changes: 2 additions & 1 deletion src/runtime_src/xdp/profile/plugin/aie_trace/client/aie_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@ namespace xdp {
auto& metricSet = tileMetric.second;
auto tile = tileMetric.first;
auto col = tile.col;
auto colReport = col + startCol;
auto row = tile.row;
auto subtype = tile.subtype;
auto type = getTileType(row);
Expand Down Expand Up @@ -999,7 +1000,7 @@ namespace xdp {
}

// AIE config object for this tile
auto cfgTile = std::make_unique<aie_cfg_tile>(col+startCol, row, type);
auto cfgTile = std::make_unique<aie_cfg_tile>(colReport, row, type);
cfgTile->type = type;
cfgTile->trace_metric_set = metricSet;
cfgTile->active_core = tile.active_core;
Expand Down
34 changes: 14 additions & 20 deletions src/runtime_src/xdp/profile/plugin/aie_trace/ve2/aie_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,16 +296,14 @@ namespace xdp {
// Currently, assuming only one Hw Context is alive at a time
uint8_t startCol = static_cast<uint8_t>(aiePartitionPt.front().second.get<uint64_t>("start_col"));
uint8_t numCols = static_cast<uint8_t>(aiePartitionPt.front().second.get<uint64_t>("num_cols"));

// NOTE: below is the hard-coded value from metadata
// uint8_t startCol = metadata->getPartitionOverlayStartCols().front();
aie::displayColShiftInfo(startCol);

// Get channel configurations (memory and interface tiles)
auto configChannel0 = metadata->getConfigChannel0();
auto configChannel1 = metadata->getConfigChannel1();

// Get the column shift for partition
// NOTE: If partition is not used, this value is zero.
uint8_t startColShift = metadata->getPartitionOverlayStartCols().front();
aie::displayColShiftInfo(startColShift);

// Zero trace event tile counts
for (int m = 0; m < static_cast<int>(module_type::num_types); ++m) {
for (int n = 0; n <= NUM_TRACE_EVENTS; ++n)
Expand Down Expand Up @@ -350,11 +348,13 @@ namespace xdp {
coreTraceEndEvent = XAIE_EVENT_INSTR_EVENT_1_CORE;

// Iterate over all used/specified tiles
// NOTE: rows are stored as absolute as required by resource manager
// NOTE 1: Rows are absolute values as required by driver
// NOTE 2: If partitions are used, then columns are relative values as required by driver
for (auto& tileMetric : metadata->getConfigMetrics()) {
auto& metricSet = tileMetric.second;
auto tile = tileMetric.first;
auto col = tile.col + startColShift;
auto col = tile.col;
auto colReport = col + startCol;
auto row = tile.row;
auto subtype = tile.subtype;
auto type = aie::getModuleType(row, metadata->getRowOffset());
Expand Down Expand Up @@ -403,7 +403,7 @@ namespace xdp {
}

// AIE config object for this tile
auto cfgTile = std::make_unique<aie_cfg_tile>(col, row, type);
auto cfgTile = std::make_unique<aie_cfg_tile>(colReport, row, type);
cfgTile->type = type;
cfgTile->trace_metric_set = metricSet;
cfgTile->active_core = tile.active_core;
Expand Down Expand Up @@ -862,17 +862,11 @@ namespace xdp {
}

auto shimTrace = shim.traceControl();

if(col == startCol && compilerOptions.enable_multi_layer && xrt_core::config::get_aie_trace_settings_trace_start_broadcast())
{
if (shimTrace->setCntrEvent(XAIE_EVENT_COMBO_EVENT_0_PL, interfaceTileTraceEndEvent) != XAIE_OK)
break;
}
else
{
if (shimTrace->setCntrEvent(interfaceTileTraceStartEvent, interfaceTileTraceEndEvent) != XAIE_OK)
break;
}
XAie_Events shimStart = ((col == 0) && compilerOptions.enable_multi_layer
&& xrt_core::config::get_aie_trace_settings_trace_start_broadcast())
? XAIE_EVENT_COMBO_EVENT_0_PL : interfaceTileTraceStartEvent;
if (shimTrace->setCntrEvent(shimStart, interfaceTileTraceEndEvent) != XAIE_OK)
break;

auto ret = shimTrace->reserve();
if (ret != XAIE_OK) {
Expand Down
Loading