[XDP] Initial NPU3 support

src/runtime_src/CMakeLists.txt

@@ -92,9 +92,9 @@ else()
   xrt_add_subdirectory(xocl)
   xrt_add_subdirectory(xrt)
   xrt_add_subdirectory(tools/xclbinutil)
-  xrt_add_subdirectory(xdp)
   xrt_add_subdirectory(tools/scripts)
   xrt_add_subdirectory(core)
+  xrt_add_subdirectory(xdp)
 
   # --- Optional HIP bindings ---
   if (XRT_ENABLE_HIP)

src/runtime_src/xdp/profile/database/static_info/aie_constructs.h

@@ -14,6 +14,11 @@
 #include <sstream>
 
 namespace xdp::aie {
+  // Microblaze Debug Module (MDM) Counters
+  // https://docs.amd.com/r/en-US/ug984-vivado-microblaze-ref/Performance-Monitoring)
+  constexpr unsigned int NUM_UC_EVENT_COUNTERS = 5;
+  constexpr unsigned int NUM_UC_LATENCY_COUNTERS = 1;
+
   struct aiecompiler_options
   {
     bool broadcast_enable_core;
@@ -51,7 +56,9 @@ namespace xdp {
 
   enum io_type {
     PLIO = 0,
-    GMIO
+    GMIO,
+    TRACE_DMA,
+    CONTROL_DMA
   };
 
   struct tile_type
@@ -203,14 +210,16 @@ namespace xdp {
     uint8_t channelNumber;
     uint8_t streamId;
     uint8_t burstLength;
+    uint8_t type;
 
     TraceGMIO(uint32_t i, uint8_t col, uint8_t num, 
-              uint8_t stream, uint8_t len)
+              uint8_t stream, uint8_t len, uint8_t t = 0)
       : id(i)
       , shimColumn(col)
       , channelNumber(num)
       , streamId(stream)
       , burstLength(len)
+      , type(t)
     {}
   };
 
@@ -277,8 +286,8 @@ namespace xdp {
       bool port_trace_is_master[NUM_SWITCH_MONITOR_PORTS];
       int8_t port_trace_ids[NUM_SWITCH_MONITOR_PORTS];
       std::string port_trace_names[NUM_SWITCH_MONITOR_PORTS];
-      int8_t s2mm_channels[NUM_CHANNEL_SELECTS] = {-1, -1};
-      int8_t mm2s_channels[NUM_CHANNEL_SELECTS] = {-1, -1};
+      int8_t s2mm_channels[NUM_CHANNEL_SELECTS_MAX] = {-1, -1, -1, -1};
+      int8_t mm2s_channels[NUM_CHANNEL_SELECTS_MAX] = {-1, -1, -1, -1};
       std::string s2mm_names[NUM_MEM_CHANNELS];
       std::string mm2s_names[NUM_MEM_CHANNELS];
       std::vector<aie_cfg_counter> pc;

src/runtime_src/xdp/profile/database/static_info/device_info.cpp

@@ -320,13 +320,13 @@ namespace xdp {
   }
 
   void DeviceInfo::addTraceGMIO(uint32_t id, uint8_t col, uint8_t num,
-                                uint8_t stream, uint8_t len)
+                                uint8_t stream, uint8_t len, uint8_t type)
   {
     ConfigInfo* config = currentConfig() ;
     if (!config || config->currentXclbins.empty())
       return ;
 
-    config->addTraceGMIO(id, col, num, stream, len) ;
+    config->addTraceGMIO(id, col, num, stream, len, type) ;
   }
 
   void DeviceInfo::addAIECounter(uint32_t i, uint8_t col, uint8_t row,

src/runtime_src/xdp/profile/database/static_info/device_info.h

@@ -140,7 +140,7 @@ namespace xdp {
     // ****** Functions for AIE information on the current xclbin ******
     XDP_CORE_EXPORT
     void addTraceGMIO(uint32_t i, uint8_t col, uint8_t num, uint8_t stream,
-                      uint8_t len) ;
+                      uint8_t len, uint8_t type) ;
     XDP_CORE_EXPORT
     void addAIECounter(uint32_t i, uint8_t col, uint8_t row, uint8_t num,
                        uint16_t start, uint16_t end, uint8_t reset,

src/runtime_src/xdp/profile/database/static_info/filetypes/aie_control_config_filetype.cpp

@@ -9,8 +9,9 @@
 
 #include "aie_control_config_filetype.h"
 #include "core/common/message.h"
-#include "xdp/profile/plugin/vp_base/utility.h"
 #include "xdp/profile/database/static_info/aie_util.h"
+#include "xdp/profile/device/tracedefs.h"
+#include "xdp/profile/plugin/vp_base/utility.h"
 #include "xdp/profile/plugin/aie_profile/aie_profile_defs.h"
 
 namespace xdp::aie {
@@ -225,16 +226,18 @@ AIEControlConfigFiletype::getChildGMIOs( const std::string& childStr) const
         //   1 : S2MM channel 1
         //   2 : MM2S channel 0 (slave/input)
         //   3 : MM2S channel 1
-        auto slaveOrMaster = gmio_node.second.get<uint8_t>("type");
+        auto ioType = gmio_node.second.get<uint8_t>("type");
         auto channelNumber = gmio_node.second.get<uint8_t>("channel_number");
 
-        gmio.type = io_type::GMIO;
+        gmio.type =  (ioType == MM2S_CONTROL) ? io_type::CONTROL_DMA
+                  : ((ioType == S2MM_TRACE)   ? io_type::TRACE_DMA : io_type::GMIO);
         gmio.id = gmio_node.second.get<uint32_t>("id");
         gmio.name = gmio_node.second.get<std::string>("name");
         gmio.logicalName = gmio_node.second.get<std::string>("logical_name");
-        gmio.slaveOrMaster = slaveOrMaster;
+        gmio.slaveOrMaster = (ioType >= 2) ? (ioType - 2) : ioType;
         gmio.shimColumn = gmio_node.second.get<uint8_t>("shim_column");
-        gmio.channelNum = (slaveOrMaster == 0) ? (channelNumber - 2) : channelNumber;
+        gmio.channelNum = ((ioType == 0) && (channelNumber >= 2)) 
+                        ? (channelNumber - 2) : channelNumber;
         gmio.streamId = gmio_node.second.get<uint8_t>("stream_id");
         gmio.burstLength = gmio_node.second.get<uint8_t>("burst_length_in_16byte");
 

src/runtime_src/xdp/profile/database/static_info/xclbin_info.cpp

@@ -556,14 +556,15 @@ namespace xdp {
     }
 
     void ConfigInfo::addTraceGMIO(uint32_t id, uint8_t col, uint8_t num,
-                                uint8_t stream, uint8_t len)
+                                  uint8_t stream, uint8_t len, uint8_t t)
     {
       for (auto xclbin : currentXclbins)
       {
         if (xclbin->aie.valid)
         {
-          xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT", "Added GMIO trace of ID "+ std::to_string(id) + ".");
-          xclbin->aie.gmioList.push_back(new TraceGMIO(id, col, num, stream, len)) ;
+          xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT", 
+                                  "Added GMIO trace of ID "+ std::to_string(id) + ".");
+          xclbin->aie.gmioList.push_back(new TraceGMIO(id, col, num, stream, len, t)) ;
           return ;
         }
       }

src/runtime_src/xdp/profile/database/static_info/xclbin_info.h

@@ -242,7 +242,7 @@ namespace xdp {
     std::vector<Monitor*> getUserASMsWithTrace(XclbinInfo* xclbin) ;
 
     void addTraceGMIO(uint32_t id, uint8_t col, uint8_t num,
-                                uint8_t stream, uint8_t len) ;
+                      uint8_t stream, uint8_t len, uint8_t type) ;
     void addAIECounter(uint32_t i, uint8_t col, uint8_t r,
                                  uint8_t num, uint16_t start, uint16_t end,
                                  uint8_t reset, uint64_t load, double freq,

src/runtime_src/xdp/profile/database/static_info_database.cpp

@@ -1108,14 +1108,14 @@ namespace xdp {
   }
 
   void VPStaticDatabase::addTraceGMIO(uint64_t deviceId, uint32_t i,
-                                      uint8_t col, uint8_t num,
-                                      uint8_t stream, uint8_t len)
+                                      uint8_t col, uint8_t num, uint8_t stream, 
+                                      uint8_t len, uint8_t type)
   {
     std::lock_guard<std::mutex> lock(deviceLock) ;
 
     if (deviceInfo.find(deviceId) == deviceInfo.end())
       return ;
-    deviceInfo[deviceId]->addTraceGMIO(i, col, num, stream, len) ;
+    deviceInfo[deviceId]->addTraceGMIO(i, col, num, stream, len, type) ;
   }
 
   void VPStaticDatabase::addAIECounter(uint64_t deviceId, uint32_t i,

src/runtime_src/xdp/profile/database/static_info_database.h

@@ -383,7 +383,7 @@ namespace xdp {
     getAIECfgTiles(uint64_t deviceId) ;
     XDP_CORE_EXPORT TraceGMIO* getTraceGMIO(uint64_t deviceId, uint64_t idx) ;
     XDP_CORE_EXPORT void addTraceGMIO(uint64_t deviceId, uint32_t i, uint8_t col,
-                                 uint8_t num, uint8_t stream, uint8_t len) ;
+                                  uint8_t num, uint8_t stream, uint8_t len, uint8_t type) ;
     XDP_CORE_EXPORT void addAIECounter(uint64_t deviceId, uint32_t i, uint8_t col,
                                   uint8_t row, uint8_t num, uint16_t start,
                                   uint16_t end, uint8_t reset, uint64_t load,