Bump up the aiebu submodule version to resolve link with aie-rt failu… (

#8353) * Bump up the aiebu submodule version to resolve link with aie-rt failure in Windows build Signed-off-by: Sonal Santan <[email protected]> * Update submodule, aiebu git hash which resolves windows compiler warnings Signed-off-by: Sonal Santan <[email protected]> * Resolve dead code warning in XDP plugin breaking Windows build Signed-off-by: Sonal Santan <[email protected]> * Disable an incorrect? unreachable warning in aie_hlt.cpp which breaks Windows MCDM build Signed-off-by: Sonal Santan <[email protected]> * Pull in the latest aiebu which resolves the last remaining Windows warnings Signed-off-by: Sonal Santan <[email protected]> * Bump up aiebu submodule to resolve warnings in its test code Signed-off-by: Sonal Santan <[email protected]> * More cleanups to make MSVC warning supression MSVC specific Signed-off-by: Sonal Santan <[email protected]> * Guard the #pragma warning with _WIN32 Signed-off-by: Sonal Santan <[email protected]> * Temporary fix to resolve aie-rt warnings causing build failure Signed-off-by: Sonal Santan <[email protected]> * Bump up the aiebu git hash to get additional build fixes Signed-off-by: Sonal Santan <[email protected]> * aiebu now uses cpack of the parent module Signed-off-by: Sonal Santan <[email protected]> * Pull in latest aiebu with install dir fixes Signed-off-by: Sonal Santan <[email protected]> --------- Signed-off-by: Sonal Santan <[email protected]>
Xilinx · Aug 27, 2024 · 52f4caf · 52f4caf
1 parent 374ff61
commit 52f4caf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/runtime_src/core/common/aiebu b/src/runtime_src/core/common/aiebu
diff --git a/src/runtime_src/xdp/profile/plugin/aie_halt/aie_halt_plugin.cpp b/src/runtime_src/xdp/profile/plugin/aie_halt/aie_halt_plugin.cpp
@@ -18,6 +18,7 @@
 
 #include<regex>
 #include<string>
+#include<cassert>
 
 #include "core/common/device.h"
 #include "core/common/message.h"
@@ -95,10 +96,10 @@ namespace xdp {
     }
 
     if (hwCtxImpl != mHwCtxImpl) {
-      xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT", 
+      xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT",
           "New Hw Context Impl passed in AIE Halt Plugin.");
       return;
-    } 
+    }
 
     DeviceDataEntry.valid = false;
     DeviceDataEntry.implementation->finishflushDevice(mHwCtxImpl);
@@ -119,4 +120,4 @@ namespace xdp {
 #endif
   }
 
-}
+}
diff --git a/src/runtime_src/xdp/profile/plugin/aie_halt/clientDev/aie_halt.cpp b/src/runtime_src/xdp/profile/plugin/aie_halt/clientDev/aie_halt.cpp
@@ -50,18 +50,22 @@ namespace xdp {
   {
   }
 
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
   void AIEHaltClientDevImpl::updateDevice(void* hwCtxImpl)
   {
-    xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT", 
+    xrt_core::message::send(xrt_core::message::severity_level::debug, "XRT",
               "In AIEHaltClientDevImpl::updateDevice");
 
     std::unique_ptr<aie::ClientTransaction> txnHandler
         = std::make_unique<aie::ClientTransaction>(mHwContext, "AIE Halt");
 
     if (!txnHandler->initializeKernel("XDP_KERNEL"))
       return;
-  
-    boost::property_tree::ptree aieMetadata;    
+
+    boost::property_tree::ptree aieMetadata;
     try {
       auto device = xrt_core::hw_context_int::get_core_device(mHwContext);
       xrt::xclbin xrtXclbin = device.get()->get_xclbin(device.get()->get_xclbin_uuid());
@@ -133,8 +137,10 @@ namespace xdp {
       return;
     XAie_ClearTransaction(&aieDevInst);
   }
-
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
   void AIEHaltClientDevImpl::finishflushDevice(void* /*hwCtxImpl*/)
   {
   }
-}
+}
+31 −20		CMakeLists.txt
+3 −2		build/build22.bat
+5 −0		lib/CMakeLists.txt
+2 −2		lib/src/CMakeLists.txt
+9 −9		lib/src/gen-copy.cpp
+24 −24		lib/src/gen-preemption.cpp
+1 −1		src/cpp/aiebu/src/CMakeLists.txt
+6 −0		src/cpp/aiebu/src/analyzer/reporter.cpp
+6 −0		src/cpp/aiebu/src/elf/elfwriter.h
+2 −1		src/cpp/aiebu/src/preprocessor/aie2/aie2_blob_preprocessor_input.cpp
+5 −0		test/cpp_test/CMakeLists.txt
+13 −0		test/cpp_test/c_api/aie_test_common.h
+2 −2		test/cpp_test/cpp_api/aie2_test.cpp