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

Jump to bottom

[XDP] Fix to manage stream port ID detection in profile for client #8528

Merged
merged 2 commits into from
Oct 14, 2024
Merged

[XDP] Fix to manage stream port ID detection in profile for client #8528

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
0587566
manage stream port ID detection in client
vipangul Oct 14, 2024
9e44211
removed spaces
vipangul Oct 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
10 changes: 7 additions & 3 deletions src/runtime_src/xdp/profile/plugin/aie_profile/client/aie_profile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ namespace xdp {

aie::profile::configGroupEvents(&aieDevInst, loc, mod, type, metricSet, startEvent, channel0);
if (aie::profile::isStreamSwitchPortEvent(startEvent))
configStreamSwitchPorts(tileMetric.first, loc, type, metricSet, channel0);
configStreamSwitchPorts(tileMetric.first, loc, type, metricSet, channel0, startEvent);

// Convert enums to physical event IDs for reporting purposes
uint8_t tmpStart;
Expand Down Expand Up @@ -257,10 +257,11 @@ namespace xdp {
// NOTE: Used to monitor streams: trace, interfaces, and MEM tiles
void
AieProfile_WinImpl::configStreamSwitchPorts(const tile_type& tile, const XAie_LocType& loc,
const module_type& type, const std::string& metricSet, const uint8_t channel)
const module_type& type, const std::string& metricSet, const uint8_t channel, const XAie_Events startEvent)
{
// Hardcoded
uint8_t rscId = 0;
uint8_t portnum = aie::profile::getPortNumberFromEvent(startEvent);
// AIE Tiles (e.g., trace streams)
if (type == module_type::core) {
auto slaveOrMaster = (metricSet.find("mm2s") != std::string::npos) ?
Expand All @@ -278,7 +279,10 @@ namespace xdp {
// Grab slave/master and stream ID
// NOTE: stored in getTilesForProfiling() above
auto slaveOrMaster = (tile.is_master == 0) ? XAIE_STRMSW_SLAVE : XAIE_STRMSW_MASTER;
auto streamPortId = tile.stream_id;
uint8_t streamPortId = (portnum >= tile.stream_ids.size()) ?
0 : static_cast<uint8_t>(tile.stream_ids.at(portnum));

// auto streamPortId = tile.stream_id;
// Define stream switch port to monitor interface
XAie_EventSelectStrmPort(&aieDevInst, loc, rscId, slaveOrMaster, SOUTH, streamPortId);
std::stringstream msg;
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_src/xdp/profile/plugin/aie_profile/client/aie_profile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace xdp {
void configStreamSwitchPorts(
const tile_type& tile, const XAie_LocType& loc,
const module_type& type, const std::string& metricSet,
const uint8_t channel
const uint8_t channel, const XAie_Events startEvent
);
private:
const std::vector<XAie_ModuleType> falModuleTypes = {
Expand Down
59 changes: 59 additions & 0 deletions src/runtime_src/xdp/profile/plugin/aie_profile/util/aie_profile_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,65 @@ namespace xdp::aie::profile {

return (tlastEvents.find(event) != tlastEvents.end());
}

uint8_t getPortNumberFromEvent(const XAie_Events event)
{
switch (event) {
case XAIE_EVENT_PORT_RUNNING_7_CORE:
case XAIE_EVENT_PORT_STALLED_7_CORE:
case XAIE_EVENT_PORT_IDLE_7_CORE:
case XAIE_EVENT_PORT_RUNNING_7_PL:
case XAIE_EVENT_PORT_STALLED_7_PL:
case XAIE_EVENT_PORT_IDLE_7_PL:
return 7;
case XAIE_EVENT_PORT_RUNNING_6_CORE:
case XAIE_EVENT_PORT_STALLED_6_CORE:
case XAIE_EVENT_PORT_IDLE_6_CORE:
case XAIE_EVENT_PORT_RUNNING_6_PL:
case XAIE_EVENT_PORT_STALLED_6_PL:
case XAIE_EVENT_PORT_IDLE_6_PL:
return 6;
case XAIE_EVENT_PORT_RUNNING_5_CORE:
case XAIE_EVENT_PORT_STALLED_5_CORE:
case XAIE_EVENT_PORT_IDLE_5_CORE:
case XAIE_EVENT_PORT_RUNNING_5_PL:
case XAIE_EVENT_PORT_STALLED_5_PL:
case XAIE_EVENT_PORT_IDLE_5_PL:
return 5;
case XAIE_EVENT_PORT_RUNNING_4_CORE:
case XAIE_EVENT_PORT_STALLED_4_CORE:
case XAIE_EVENT_PORT_IDLE_4_CORE:
case XAIE_EVENT_PORT_RUNNING_4_PL:
case XAIE_EVENT_PORT_STALLED_4_PL:
case XAIE_EVENT_PORT_IDLE_4_PL:
return 4;
case XAIE_EVENT_PORT_RUNNING_3_CORE:
case XAIE_EVENT_PORT_STALLED_3_CORE:
case XAIE_EVENT_PORT_IDLE_3_CORE:
case XAIE_EVENT_PORT_RUNNING_3_PL:
case XAIE_EVENT_PORT_STALLED_3_PL:
case XAIE_EVENT_PORT_IDLE_3_PL:
return 3;
case XAIE_EVENT_PORT_RUNNING_2_CORE:
case XAIE_EVENT_PORT_STALLED_2_CORE:
case XAIE_EVENT_PORT_IDLE_2_CORE:
case XAIE_EVENT_PORT_RUNNING_2_PL:
case XAIE_EVENT_PORT_STALLED_2_PL:
case XAIE_EVENT_PORT_IDLE_2_PL:
return 2;
case XAIE_EVENT_PORT_RUNNING_1_CORE:
case XAIE_EVENT_PORT_STALLED_1_CORE:
case XAIE_EVENT_PORT_IDLE_1_CORE:
case XAIE_EVENT_PORT_RUNNING_1_PL:
case XAIE_EVENT_PORT_STALLED_1_PL:
case XAIE_EVENT_PORT_IDLE_1_PL:
return 1;
default:
return 0;
}
}


/****************************************************************************
* Get XAie module enum at the module index
***************************************************************************/
Expand Down
2 changes: 2 additions & 0 deletions src/runtime_src/xdp/profile/plugin/aie_profile/util/aie_profile_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ namespace xdp::aie::profile {
*/
bool isPortTlastEvent(const XAie_Events event);

uint8_t getPortNumberFromEvent(const XAie_Events event);

/**
* @brief Get XAie module enum at the module index
* @param moduleIndex module index
Expand Down
Loading