Add PID argument to aie mem and reg read/write apis (#8275)

* Add PID param to aie mem/reg read/write apis Signed-off-by: rbramand <[email protected]> * Address comments on PR Signed-off-by: rbramand <[email protected]> --------- Signed-off-by: rbramand <[email protected]> Co-authored-by: rbramand <[email protected]>
Xilinx · Oct 28, 2024 · 74ee1ed · 74ee1ed
1 parent 49e5201
commit 74ee1ed
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/src/runtime_src/core/common/api/xrt_device.cpp b/src/runtime_src/core/common/api/xrt_device.cpp
@@ -387,11 +387,12 @@ namespace xrt::aie {
 // of that partition. Get patition info using the context id passed and
 // convert relative column index to absolute using this info
 static uint16_t
-get_abs_col(const xrt_core::device* device, uint16_t context_id, uint16_t col)
+get_abs_col(const xrt_core::device* device, pid_t pid, uint16_t context_id, uint16_t col)
 {
   auto data = xrt_core::device_query_default<xrt_core::query::aie_partition_info>(device, {});
   for (const auto& entry : data) {
-    if (std::stoi(entry.metadata.id) != context_id)
+    // compare PID and context id
+    if (entry.pid != pid || std::stoi(entry.metadata.id) != context_id)
       continue;
 
     auto abs_col = col + entry.start_col;
@@ -427,13 +428,13 @@ open_context(xrt::aie::device::access_mode am)
 
 std::vector<char>
 device::
-read_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, uint32_t size) const
+read_aie_mem(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, uint32_t size) const
 {
   return xdp::native::profiling_wrapper("xrt::aie::device::read_aie_mem",
-    [this, &col, row, offset, size, context_id] {
+    [this, &col, row, offset, size, context_id, pid] {
       try {
         // calculate absolute col index
-        auto abs_col = get_abs_col(get_handle().get(), context_id, col);
+        auto abs_col = get_abs_col(get_handle().get(), pid, context_id, col);
         is_4byte_aligned_or_throw(offset); // DRC check
         return get_handle()->read_aie_mem(abs_col, row, offset, size);
       }
@@ -445,13 +446,13 @@ read_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, u
 
 size_t
 device::
-write_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, const std::vector<char>& data)
+write_aie_mem(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, const std::vector<char>& data)
 {
   return xdp::native::profiling_wrapper("xrt::aie::device::write_aie_mem",
-    [this, &col, row, offset, &data, context_id] {
+    [this, &col, row, offset, &data, context_id, pid] {
       try {
         // calculate absolute col index
-        auto abs_col = get_abs_col(get_handle().get(), context_id, col);
+        auto abs_col = get_abs_col(get_handle().get(), pid, context_id, col);
         is_4byte_aligned_or_throw(offset); // DRC check
         return get_handle()->write_aie_mem(abs_col, row, offset, data);
       }
@@ -462,13 +463,13 @@ write_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset,
 }
 uint32_t
 device::
-read_aie_reg(uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr) const
+read_aie_reg(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr) const
 {
   return xdp::native::profiling_wrapper("xrt::device::read_aie_reg",
-    [this, &col, row, reg_addr, context_id] {
+    [this, &col, row, reg_addr, context_id, pid] {
       try {
         // calculate absolute col index
-        auto abs_col = get_abs_col(get_handle().get(), context_id, col);
+        auto abs_col = get_abs_col(get_handle().get(), pid, context_id, col);
         is_4byte_aligned_or_throw(reg_addr); // DRC check
         return get_handle()->read_aie_reg(abs_col, row, reg_addr);
       }
@@ -480,13 +481,13 @@ read_aie_reg(uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr)
 
 bool
 device::
-write_aie_reg(uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr, uint32_t reg_val)
+write_aie_reg(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr, uint32_t reg_val)
 {
   return xdp::native::profiling_wrapper("xrt::device::write_aie_reg",
-    [this, &col, row, reg_addr, &reg_val, context_id] {
+    [this, &col, row, reg_addr, &reg_val, context_id, pid] {
       try {
         // calculate absolute col index
-        auto abs_col = get_abs_col(get_handle().get(), context_id, col);
+        auto abs_col = get_abs_col(get_handle().get(), pid, context_id, col);
         is_4byte_aligned_or_throw(reg_addr); // DRC check
         return get_handle()->write_aie_reg(abs_col, row, reg_addr, reg_val);
       }

diff --git a/src/runtime_src/core/include/xrt/xrt_aie.h b/src/runtime_src/core/include/xrt/xrt_aie.h
@@ -91,6 +91,8 @@ class device : public xrt::device
   /**
    * read_aie_mem() - Read AIE tile's memory
    *
+   * @param pid
+   *   process id of process that opened hw_context
    * @param context_id
    *  context id corresponding to AIE tile
    * @param col
@@ -109,11 +111,13 @@ class device : public xrt::device
    */
   XCL_DRIVER_DLLESPEC
   std::vector<char>
-  read_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, uint32_t size) const;
+  read_aie_mem(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, uint32_t size) const;
 
   /**
    * write_aie_mem() - Write data to AIE tile's memory
    *
+   * @param pid
+   *   process id of process that opened hw_context
    * @param context_id
    *  context id corresponding to AIE tile
    * @param col
@@ -132,11 +136,13 @@ class device : public xrt::device
    */
   XCL_DRIVER_DLLESPEC
   size_t
-  write_aie_mem(uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, const std::vector<char>& data);
+  write_aie_mem(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t offset, const std::vector<char>& data);
 
   /**
    * read_aie_reg() - Read AIE Tile's register
    *
+   * @param pid
+   *   process id of process that opened hw_context
    * @param context_id
    *  context id corresponding to AIE tile
    * @param col
@@ -153,11 +159,13 @@ class device : public xrt::device
    */
   XCL_DRIVER_DLLESPEC
   uint32_t
-  read_aie_reg(uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr) const;
+  read_aie_reg(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr) const;
 
   /**
    * write_aie_reg() - Write AIE Tile's register
    *
+   * @param pid
+   *   process id of process that opened hw_context
    * @param context_id
    *  context id corresponding to AIE tile
    * @param col
@@ -176,7 +184,7 @@ class device : public xrt::device
    */
   XCL_DRIVER_DLLESPEC
   bool
-  write_aie_reg(uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr, uint32_t reg_val);
+  write_aie_reg(pid_t pid, uint16_t context_id, uint16_t col, uint16_t row, uint32_t reg_addr, uint32_t reg_val);
 
 private:
   XCL_DRIVER_DLLESPEC