[OS][ww24] - Upstreaming compiler repository (#99)

* [OS][ww24] - Upstreaming compiler repository

* [OS][ww24] - Upstreaming compiler repository - clang

* [OS][ww24] - Upstreaming compiler repository - OV flags for github actions

* FileCheck error: <stdin> is empty

Author: DariaMityagina

.github/workflows/job_build_mlir_linux.yml

@@ -179,7 +179,7 @@ jobs:
             -DENABLE_MLIR_COMPILER=ON \
             -DENABLE_PLUGINS_XML=ON \
             -DENABLE_PYTHON=ON \
-            -DENABLE_WHEEL=ON \
+            -DENABLE_WHEEL=OFF \
             -DENABLE_TBBBIND_2_5=ON \
             -DENABLE_DEBUG_CAPS=ON \
             -DENABLE_NPU_DEBUG_CAPS=ON \

.github/workflows/ubuntu_22.yml

@@ -29,7 +29,7 @@ jobs:
       build-cache: false
       build-cache-key-suffix: cache_${{ github.ref_name }}
       build-mlir: true
-      build-driver: true
+      build-driver: false
       run-unit-tests: true
       run-lit-tests: true
       run-compilation-tests: true

.github/workflows/ubuntu_24.yml

@@ -29,7 +29,7 @@ jobs:
       build-cache: false
       build-cache-key-suffix: cache_${{ github.ref_name }}
       build-mlir: true
-      build-driver: true
+      build-driver: false
       run-unit-tests: false
       run-lit-tests: false
       run-compilation-tests: true

cmake/compile_options_llvm.cmake

@@ -29,4 +29,5 @@ macro(set_llvm_flags)
     set(LLVM_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
     set(LLVM_BUILD_UTILS ON CACHE BOOL "" FORCE)
     set(LLVM_INSTALL_UTILS ON CACHE BOOL "" FORCE)
+    set(LLVM_ABI_BREAKING_CHECKS "FORCE_OFF" CACHE STRING "" FORCE)
 endmacro()

cmake/features.cmake

@@ -48,6 +48,14 @@ endif()
 
 ov_option(ENABLE_DEVELOPER_BUILD "Enable developer build with extra validation/logging functionality" OFF)
 
+if(NOT DEFINED ENABLE_PRIVATE_COMPILER_OPTIONS)
+    set(ENABLE_PRIVATE_COMPILER_OPTIONS ${ENABLE_DEVELOPER_BUILD})
+endif()
+ov_option(ENABLE_PRIVATE_COMPILER_OPTIONS "Enable the private compiler options, which are accessible via the NPU_COMPILATION_MODE_PARAMS property" ${ENABLE_PRIVATE_COMPILER_OPTIONS})
+if(ENABLE_PRIVATE_COMPILER_OPTIONS)
+    add_definitions(-DPRIVATE_COMPILER_OPTIONS_ENABLED)
+endif()
+
 if(NOT DEFINED MV_TOOLS_PATH AND DEFINED ENV{MV_TOOLS_DIR} AND DEFINED ENV{MV_TOOLS_VERSION})
     set(MV_TOOLS_PATH $ENV{MV_TOOLS_DIR}/$ENV{MV_TOOLS_VERSION})
 endif()

cmake/prep_ldscript.py

@@ -0,0 +1,37 @@
+import os
+import sys
+
+
+def usage():
+    print(f"Usage: python {sys.argv[0]} FILENAME [FILENAME...] OUTPUT_FILENAME")
+    sys.exit(1)
+
+
+def prep_ldscript_header(filename_ld, filename_h, varname):
+    with open(filename_ld, "r") as infile:
+        text = infile.read()
+    lines = [line.strip() for line in text.split("\n")]
+    lines = [line for line in lines if line]
+
+    vardef_begin = f'const char* {varname} = R"ldscript(\n'
+    vardef_end = '\n)ldscript";\n'
+
+    result = "#pragma once\n\n" + vardef_begin + "\n".join(lines) + vardef_end
+
+    with open(filename_h, "w") as outfile:
+        outfile.write(result)
+    print(f" Generated header file as {filename_h}")
+
+
+def main():
+    if len(sys.argv) < 3:
+        usage()
+    input_ld = sys.argv[1]
+    output_h = sys.argv[2]
+    varname = "SHAVE_LD_SCRIPT"
+
+    prep_ldscript_header(input_ld, output_h, varname)
+
+
+if __name__ == "__main__":
+    main()

src/vpux_compiler/CMakeLists.txt

@@ -47,34 +47,6 @@ if(NOT ENABLE_MLIR_COMPILER)
     return()
 endif()
 
-#
-# Embed VPUNN models
-#
-
-find_package(Git REQUIRED)
-
-execute_process(
-    COMMAND ${GIT_EXECUTABLE} lfs pull
-    WORKING_DIRECTORY "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/thirdparty/vpucostmodel")
-
-vpux_embed_bin_file(
-    SOURCE_FILE "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/thirdparty/vpucostmodel/models/vpu_2_7_159.vpunn"
-    HEADER_FILE "${PROJECT_BINARY_DIR}/${gen_base_dst_include_dir}/dialect/VPU/generated/cost_model_data_2_7.hpp.inc"
-    VARIABLE_NAME "COST_MODEL_2_7")
-vpux_embed_bin_file(
-    SOURCE_FILE "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/thirdparty/vpucostmodel/models/vpu_2_7_159.fast.vpunn"
-    HEADER_FILE "${PROJECT_BINARY_DIR}/${gen_base_dst_include_dir}/dialect/VPU/generated/cost_model_data_2_7_fast.hpp.inc"
-    VARIABLE_NAME "COST_MODEL_2_7_FAST")
-
-vpux_embed_bin_file(
-    SOURCE_FILE "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/thirdparty/vpucostmodel/models/vpu_40_159_strict.vpunn"
-    HEADER_FILE "${PROJECT_BINARY_DIR}/${gen_base_dst_include_dir}/dialect/VPU/generated/cost_model_data_4_0.hpp.inc"
-    VARIABLE_NAME "COST_MODEL_4_0")
-vpux_embed_bin_file(
-    SOURCE_FILE "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/thirdparty/vpucostmodel/models/vpu_40_159_strict.fast.vpunn"
-    HEADER_FILE "${PROJECT_BINARY_DIR}/${gen_base_dst_include_dir}/dialect/VPU/generated/cost_model_data_4_0_fast.hpp.inc"
-    VARIABLE_NAME "COST_MODEL_4_0_FAST")
-
 #
 # OBJECT target
 #

src/vpux_compiler/docs/guides/images/badges-core-ultra-processor-family-5-7-9-center.png

@@ -633,7 +633,7 @@ static ::mlir::LogicalResult __mlir_ods_local_type_constraint_ops4(
     unsigned valueIndex) {
   // The type has to be a `mlir::TensorType` and it must have a rank (i.e. the number of dimensions is known)
   // Note: `mlir::TensorType` inherits from `mlir::ShapedType`, which is why the cast to the latter can be executed
-  if (!((((type.isa<::mlir::TensorType>())) && ((type.cast<::mlir::ShapedType>().hasRank()))) && ([](::mlir::Type elementType) { return (true); }(type.cast<::mlir::ShapedType>().getElementType())))) {
+  if (!((((type.isa<::mlir::TensorType>())) && ((mlir::cast<::mlir::ShapedType>(type).hasRank()))) && ([](::mlir::Type elementType) { return (true); }(mlir::cast<::mlir::ShapedType>(type).getElementType())))) {
     return op->emitOpError(valueKind) << " #" << valueIndex
         << " must be ranked tensor of any type values, but got " << type;
   }