Skip to content

Commit

Permalink
[Ubuntu24.04] llvm-project in vpux_plugin fails to compile (#35)
Browse files Browse the repository at this point in the history
* Fix redundant move in initialization

* Fix Ubuntu 24 build - resolve warnings

* Fix Ubuntu 24 build - update llvm submodule
  • Loading branch information
DariaMityagina authored Jun 21, 2024
1 parent 24f9dc6 commit 260a105
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/llvm-project

0 comments on commit 260a105

Please sign in to comment.