From 260a105bf360ccc7a36341af9252f9d3368673a7 Mon Sep 17 00:00:00 2001
From: Daria Mityagina <daria.mityagina@intel.com>
Date: Fri, 21 Jun 2024 17:26:17 +0400
Subject: [PATCH] [Ubuntu24.04] llvm-project in vpux_plugin fails to compile
 (#35)

* Fix redundant move in initialization

* Fix Ubuntu 24 build - resolve warnings

* Fix Ubuntu 24 build - update llvm submodule
---
 .../passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp    | 3 +++
 .../utils/strategy_manager/multi_cluster_strategy_utils.cpp  | 3 ++-
 .../src/dialect/const/utils/constant_folding_cache.cpp       | 5 ++++-
 src/vpux_ngraph_transformations/src/passes/align_scales.cpp  | 2 +-
 thirdparty/llvm-project                                      | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp b/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
index b4eef474ee..e7f69caa74 100644
--- a/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
+++ b/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
@@ -746,6 +746,8 @@ class ConvertVPUIP2VPUMI40XXPass final : public ConvertVPUIP2VPUMI40XXBase<Conve
         return std::pair<mlir::Value, mlir::Value>(kernelRangeOp.getResult(), kernelInvocationOp.getResult());
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
     void replaceVPURTTaskOpWithKernelOps(mlir::MLIRContext* ctx, mlir::ModuleOp& moduleOp, mlir::func::FuncOp& funcOp,
                                          Logger& _log) {
         _log.info("VPUIP_VPUMI40XX pass: replaceVPURTTaskOpWithKernelOps()");
@@ -1035,6 +1037,7 @@ class ConvertVPUIP2VPUMI40XXPass final : public ConvertVPUIP2VPUMI40XXBase<Conve
             }
         }
     }
+#pragma GCC diagnostic pop
 
     void setBarrierIndexValues(mlir::MLIRContext* ctx, mlir::func::FuncOp& funcOp, Logger _log) {
         auto barrierCount = 0;
diff --git a/src/vpux_compiler/src/dialect/VPU/utils/strategy_manager/multi_cluster_strategy_utils.cpp b/src/vpux_compiler/src/dialect/VPU/utils/strategy_manager/multi_cluster_strategy_utils.cpp
index d4f9ca2a00..afd4c932da 100644
--- a/src/vpux_compiler/src/dialect/VPU/utils/strategy_manager/multi_cluster_strategy_utils.cpp
+++ b/src/vpux_compiler/src/dialect/VPU/utils/strategy_manager/multi_cluster_strategy_utils.cpp
@@ -1219,7 +1219,8 @@ SmallVector<uint32_t> vpux::VPU::getDPUCostForNCEOp(VPU::NCEOpInterface nceOp, V
             }
             return vpunnLayers;
         };
-        vpunnLayers = tilingVPUNNLayer(vpunnLayers[0], outTiles);
+        auto layers = tilingVPUNNLayer(vpunnLayers[0], outTiles);
+        vpunnLayers = layers; 
     }
 
     // E#113592 For not supported SEP layer costs - optimize activation spills
diff --git a/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp b/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
index 5936629eb1..9e96737a16 100644
--- a/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
+++ b/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
@@ -23,7 +23,10 @@ void Const::ConstantFoldingCache::enqueueRequest(const Const::FoldingRequest& fo
 
 Const::FoldingRequest Const::ConstantFoldingCache::getRequest() {
     Const::FoldingRequest result;
-    _requestQueue.pop(result);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+     _requestQueue.pop(result);
+#pragma GCC diagnostic pop
     return result;
 }
 
diff --git a/src/vpux_ngraph_transformations/src/passes/align_scales.cpp b/src/vpux_ngraph_transformations/src/passes/align_scales.cpp
index 66ecca9c79..b762e9f1a8 100644
--- a/src/vpux_ngraph_transformations/src/passes/align_scales.cpp
+++ b/src/vpux_ngraph_transformations/src/passes/align_scales.cpp
@@ -400,7 +400,7 @@ bool AlignScales::run_on_model(const std::shared_ptr<ov::Model>& m) {
             continue;
         }
 
-        update_concat_out_fq(std::move(node), fqs_to_align);
+        update_concat_out_fq(node, fqs_to_align);
 
         if (fqs_to_align.size() > 2) {
             adjust_fqs_to_align(fqs_to_align);
diff --git a/thirdparty/llvm-project b/thirdparty/llvm-project
index 35d4b4e0d9..0beab98218 160000
--- a/thirdparty/llvm-project
+++ b/thirdparty/llvm-project
@@ -1 +1 @@
-Subproject commit 35d4b4e0d913a5b7846020f1a14d8bbc00755bfe
+Subproject commit 0beab98218fa688a7bc7886a201e96d517931c72