Skip to content

Commit

Permalink
Bug fix for incorrect information in aie_event_runtime_config.json (#…
Browse files Browse the repository at this point in the history 
…8731)
  • Loading branch information
@parthash0804
parthash0804 authored Jan 30, 2025
1 parent 8c1e800 commit 02c4811
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 16 deletions.
19 changes: 15 additions & 4 deletions src/runtime_src/xdp/profile/plugin/aie_profile/util/aie_profile_util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,25 @@ namespace xdp::aie::profile {
// Modify events based on channel number
if (channel > 0) {
// Interface tiles
#ifdef XDP_VE2_BUILD
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
XAIE_EVENT_NOC0_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_S2MM_1_STALLED_LOCK_PL);
XAIE_EVENT_NOC0_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_MEMORY_STARVATION_PL);
#else
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
XAIE_EVENT_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_DMA_MM2S_1_MEMORY_STARVATION_PL);
XAIE_EVENT_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_S2MM_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_DMA_MM2S_1_MEMORY_STARVATION_PL);
#endif
}
}

Expand Down
82 changes: 70 additions & 12 deletions src/runtime_src/xdp/profile/plugin/aie_trace/util/aie_trace_util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,20 @@ namespace xdp::aie::trace {
case XAIE_EVENT_DMA_MM2S_0_STALLED_LOCK_PL:
case XAIE_EVENT_DMA_MM2S_0_STREAM_BACKPRESSURE_PL:
case XAIE_EVENT_DMA_MM2S_0_MEMORY_STARVATION_PL:
#ifdef XDP_VE2_BUILD
case XAIE_EVENT_NOC0_DMA_S2MM_0_START_TASK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_0_FINISHED_BD_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_0_FINISHED_TASK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_0_STALLED_LOCK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_0_STREAM_STARVATION_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_START_TASK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_FINISHED_BD_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_FINISHED_TASK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_STALLED_LOCK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_STREAM_BACKPRESSURE_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_0_MEMORY_STARVATION_PL:
#endif
return 0;
case XAIE_EVENT_DMA_S2MM_1_START_TASK_MEM:
case XAIE_EVENT_DMA_S2MM_1_FINISHED_BD_MEM:
Expand Down Expand Up @@ -578,6 +592,20 @@ namespace xdp::aie::trace {
case XAIE_EVENT_DMA_MM2S_1_STALLED_LOCK_PL:
case XAIE_EVENT_DMA_MM2S_1_STREAM_BACKPRESSURE_PL:
case XAIE_EVENT_DMA_MM2S_1_MEMORY_STARVATION_PL:
#ifdef XDP_VE2_BUILD
case XAIE_EVENT_NOC0_DMA_S2MM_1_START_TASK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_1_FINISHED_BD_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_1_FINISHED_TASK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_1_STALLED_LOCK_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_1_STREAM_STARVATION_PL:
case XAIE_EVENT_NOC0_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_START_TASK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_FINISHED_BD_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_FINISHED_TASK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_STALLED_LOCK_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_STREAM_BACKPRESSURE_PL:
case XAIE_EVENT_NOC0_DMA_MM2S_1_MEMORY_STARVATION_PL:
#endif
return 1;
default:
return -1;
Expand Down Expand Up @@ -618,33 +646,63 @@ namespace xdp::aie::trace {
// Check type to minimize replacements
if (isInputSet(type, metricSet)) {
// Input or MM2S
#ifdef XDP_VE2_BUILD
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_START_TASK_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_START_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_FINISHED_BD_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_FINISHED_BD_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_FINISHED_TASK_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_FINISHED_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_STALLED_LOCK_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_NOC0_DMA_MM2S_1_MEMORY_STARVATION_PL);
#else
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_START_TASK_PL, XAIE_EVENT_DMA_MM2S_1_START_TASK_PL);
XAIE_EVENT_DMA_MM2S_0_START_TASK_PL, XAIE_EVENT_DMA_MM2S_1_START_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_FINISHED_BD_PL, XAIE_EVENT_DMA_MM2S_1_FINISHED_BD_PL);
XAIE_EVENT_DMA_MM2S_0_FINISHED_BD_PL, XAIE_EVENT_DMA_MM2S_1_FINISHED_BD_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_FINISHED_TASK_PL, XAIE_EVENT_DMA_MM2S_1_FINISHED_TASK_PL);
XAIE_EVENT_DMA_MM2S_0_FINISHED_TASK_PL, XAIE_EVENT_DMA_MM2S_1_FINISHED_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_MM2S_1_STALLED_LOCK_PL);
XAIE_EVENT_DMA_MM2S_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_MM2S_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
XAIE_EVENT_DMA_MM2S_0_STREAM_BACKPRESSURE_PL, XAIE_EVENT_DMA_MM2S_1_STREAM_BACKPRESSURE_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_DMA_MM2S_1_MEMORY_STARVATION_PL);
XAIE_EVENT_DMA_MM2S_0_MEMORY_STARVATION_PL, XAIE_EVENT_DMA_MM2S_1_MEMORY_STARVATION_PL);
#endif
}
else {
// Output or S2MM
#ifdef XDP_VE2_BUILD
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_START_TASK_PL, XAIE_EVENT_DMA_S2MM_1_START_TASK_PL);
XAIE_EVENT_NOC0_DMA_S2MM_0_START_TASK_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_START_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_FINISHED_BD_PL, XAIE_EVENT_DMA_S2MM_1_FINISHED_BD_PL);
XAIE_EVENT_NOC0_DMA_S2MM_0_FINISHED_BD_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_FINISHED_BD_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_FINISHED_TASK_PL, XAIE_EVENT_DMA_S2MM_1_FINISHED_TASK_PL);
XAIE_EVENT_NOC0_DMA_S2MM_0_FINISHED_TASK_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_FINISHED_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_S2MM_1_STALLED_LOCK_PL);
XAIE_EVENT_NOC0_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_S2MM_0_STREAM_STARVATION_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_STREAM_STARVATION_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_NOC0_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_NOC0_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
#else
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_STREAM_STARVATION_PL, XAIE_EVENT_DMA_S2MM_1_STREAM_STARVATION_PL);
XAIE_EVENT_DMA_S2MM_0_START_TASK_PL, XAIE_EVENT_DMA_S2MM_1_START_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
XAIE_EVENT_DMA_S2MM_0_FINISHED_BD_PL, XAIE_EVENT_DMA_S2MM_1_FINISHED_BD_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_FINISHED_TASK_PL, XAIE_EVENT_DMA_S2MM_1_FINISHED_TASK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_STALLED_LOCK_PL, XAIE_EVENT_DMA_S2MM_1_STALLED_LOCK_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_STREAM_STARVATION_PL, XAIE_EVENT_DMA_S2MM_1_STREAM_STARVATION_PL);
std::replace(events.begin(), events.end(),
XAIE_EVENT_DMA_S2MM_0_MEMORY_BACKPRESSURE_PL, XAIE_EVENT_DMA_S2MM_1_MEMORY_BACKPRESSURE_PL);
#endif
}
}

Expand Down

0 comments on commit 02c4811

Please sign in to comment.