Changing the order of update_device calls so AIE information is not l…

…ost (#8487)
Xilinx · Oct 3, 2024 · 7cc0a85 · 7cc0a85
1 parent 9b5ad3e
commit 7cc0a85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/runtime_src/core/edge/user/plugin/xdp/shim_callbacks.h b/src/runtime_src/core/edge/user/plugin/xdp/shim_callbacks.h
@@ -47,14 +47,12 @@ void update_device(void* handle)
 #ifndef __HWEM__
   hal::update_device(handle);
   aie::update_device(handle);
+#else
+  hal::hw_emu::update_device(handle);
 #endif
 
   aie::ctr::update_device(handle);
   aie::sts::update_device(handle);
-
-#ifdef __HWEM__
-  hal::hw_emu::update_device(handle);
-#endif
 }
 
 // The flush_device callback should be called just before a new xclbin

diff --git a/src/runtime_src/core/edge/user/shim.cpp b/src/runtime_src/core/edge/user/shim.cpp
@@ -1310,16 +1310,9 @@ int shim::load_hw_axlf(xclDeviceHandle handle, const xclBin *buffer, drm_zocl_cr
     drv->registerAieArray();
   #endif
 
-  #ifndef __HWEM__
-    xdp::hal::update_device(handle);
-    xdp::aie::update_device(handle);
-  #endif
-    xdp::aie::ctr::update_device(handle);
-    xdp::aie::sts::update_device(handle);
+  xdp::update_device(handle);
   #ifndef __HWEM__
     START_DEVICE_PROFILING_CB(handle);
-  #else
-    xdp::hal::hw_emu::update_device(handle);
   #endif
 
   return 0;