Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
39 changes: 33 additions & 6 deletions .github/actions/versions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ outputs:
llvm-sha:
description: 'LLVM SHA detected in NPU Compiler submodule'
value: ${{ steps.get-llvm-sha.outputs.llvm-sha }}
llvm-version:
description: 'LLVM version detected in NPU Compiler submodule'
value: ${{ steps.get-llvm-version.outputs.llvm-version }}
tbb-version:
description: 'TBB version detected from OpenVINO'
value: ${{ steps.get-tbb-version.outputs.tbb-version }}
Expand Down Expand Up @@ -217,6 +220,34 @@ runs:
echo "LLVM commit sha = $LLVM_SHA"
echo "llvm-sha=$LLVM_SHA" >> $GITHUB_OUTPUT

- name: Get LLVM version
id: get-llvm-version
shell: bash
run: |
LLVM_VERSION="N/A"

if [[ -n "${{ inputs.npu-compiler-repo-path }}" ]]; then
LLVM_VERSION_FILE="${{ inputs.npu-compiler-repo-path }}/thirdparty/llvm-project/cmake/Modules/LLVMVersion.cmake"

if [[ -f "$LLVM_VERSION_FILE" ]]; then
LLVM_VERSION_MAJOR=$(grep -oE 'LLVM_VERSION_MAJOR[[:space:]]+[0-9]+' "$LLVM_VERSION_FILE" | grep -oE '[0-9]+')
LLVM_VERSION_MINOR=$(grep -oE 'LLVM_VERSION_MINOR[[:space:]]+[0-9]+' "$LLVM_VERSION_FILE" | grep -oE '[0-9]+')
LLVM_VERSION_PATCH=$(grep -oE 'LLVM_VERSION_PATCH[[:space:]]+[0-9]+' "$LLVM_VERSION_FILE" | grep -oE '[0-9]+')

if [[ -n "$LLVM_VERSION_MAJOR" && -n "$LLVM_VERSION_MINOR" && -n "$LLVM_VERSION_PATCH" ]]; then
LLVM_VERSION="$LLVM_VERSION_MAJOR.$LLVM_VERSION_MINOR.$LLVM_VERSION_PATCH"
fi

LLVM_SHA="${{ steps.get-llvm-sha.outputs.llvm-sha }}"
if [[ "$LLVM_VERSION" != "N/A" && "$LLVM_SHA" != "N/A" ]]; then
LLVM_VERSION="$LLVM_VERSION.${LLVM_SHA:0:7}"
fi
fi
fi

echo "LLVM version = $LLVM_VERSION"
echo "llvm-version=$LLVM_VERSION" >> $GITHUB_OUTPUT

- name: Get TBB version from OpenVINO
id: get-tbb-version
shell: bash
Expand Down Expand Up @@ -249,17 +280,13 @@ runs:
jq -n \
--arg openvino_sha "${{ steps.read-openvino-sha.outputs.openvino-sha }}" \
--arg npu_compiler_sha "${{ steps.get-npu-sha.outputs.npu-compiler-sha }}" \
--arg llvm_sha "${{ steps.get-llvm-sha.outputs.llvm-sha }}" \
--arg llvm_version "${{ steps.get-llvm-version.outputs.llvm-version }}" \
--arg tbb_version "${{ steps.get-tbb-version.outputs.tbb-version }}" \
--arg opencv_sha "${{ steps.read-ocv-sha.outputs.ocv-sha }}" \
--arg omz_sha "${{ steps.read-omz-sha.outputs.omz-sha }}" \
'{
openvino_sha: $openvino_sha,
npu_compiler_sha: $npu_compiler_sha,
llvm_sha: $llvm_sha,
llvm_version: $llvm_version,
tbb_version: $tbb_version,
opencv_sha: $opencv_sha,
omz_sha: $omz_sha
}' > "$OUTPUT_DIR/build_manifest.json"

MANIFEST_PATH=$(cd "$OUTPUT_DIR" && pwd)/build_manifest.json
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/job_build_cid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ jobs:
-B "${CID_PACKAGE_ARTIFACTS_DIR}" \
-D CPACK_COMPONENTS_ALL=${COMPONENT} \
-D CPACK_CMAKE_GENERATOR=${GENERATOR} \
-D CPACK_INCLUDE_TOPLEVEL_DIRECTORY=OFF \
-D CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY=OFF \
-D CPACK_PACKAGE_FILE_NAME="${{ steps.package-name.outputs.cid-package-base-name }}"

- name: CiD Package renaming
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2026 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/add_native_exec_target.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/add_tool_target.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2025 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/clang_tidy_plugin.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
19 changes: 18 additions & 1 deletion cmake/compile_options.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2025 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down Expand Up @@ -61,6 +61,23 @@ if(MSVC)
# Use compiler intrinsincs
add_compile_options(/Oi)

# Note: CCache requires /Z7 which is set above
if(ENABLE_CCACHE_FOR_VISUAL_STUDIO)
message(STATUS "CCache for Visual Studio Generator is going to be used")
cmake_minimum_required(VERSION 3.21 FATAL_ERROR) # for file(COPY_FILE)

# see https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage-with-cmake
find_program(CCACHE_PATH ccache REQUIRED)
if(CCACHE_PATH)
file(COPY_FILE ${CCACHE_PATH} ${CMAKE_BINARY_DIR}/cl.exe
ONLY_IF_DIFFERENT)
set(CMAKE_VS_GLOBALS
"CLToolExe=cl.exe"
"CLToolPath=${CMAKE_BINARY_DIR}"
"UseMultiToolTask=true"
)
endif()
endif()
endif()

function(enable_warnings_as_errors TARGET_NAME)
Expand Down
2 changes: 1 addition & 1 deletion cmake/compile_options_llvm.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2024-2026 Intel Corporation.
# Copyright (C) 2024-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/compiler_commit_hash.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/embed_bin_file.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
4 changes: 3 additions & 1 deletion cmake/features.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2026 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down Expand Up @@ -79,6 +79,8 @@ if(NOT DEFINED ENABLE_NPU_MICRO_BENCHMARKS)
endif()
ov_option(ENABLE_NPU_MICRO_BENCHMARKS "NPU micro benchmarks" ${ENABLE_NPU_MICRO_BENCHMARKS})

ov_option(ENABLE_CCACHE_FOR_VISUAL_STUDIO "Enable ccache for CMake-generated Visual Studio solution" OFF)

# Enable NPU Execution Engine only for developer build as it is an experimental feature
ov_dependent_option(ENABLE_NPU_EXECUTION_ENGINE "Enable NPU Execution Engine" ON "ENABLE_DEVELOPER_BUILD" OFF)

Expand Down
2 changes: 1 addition & 1 deletion cmake/flatbuffers.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2025 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/lit.cfg.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2025 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/lit_tests.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2025 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
2 changes: 1 addition & 1 deletion cmake/log_level.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2024-2025 Intel Corporation.
# Copyright (C) 2024-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
9 changes: 5 additions & 4 deletions cmake/prep_ldscript.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#
# Copyright (C) 2025 Intel Corporation.
# SPDX-License-Identifier: Apache-2.0
#
#
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

import os
import sys

Expand Down
2 changes: 1 addition & 1 deletion cmake/prepare_cost_model_binary.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
3 changes: 2 additions & 1 deletion scripts/lldb_scripts/NPUDataFormatters.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#
# Copyright (C) 2025 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

import lldb

# Define the constant for dynamic dimension representation
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2022-2026 Intel Corporation.
# Copyright (C) 2022-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand Down
6 changes: 4 additions & 2 deletions src/mlir_runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#
# Copyright (C) 2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
Expand Down Expand Up @@ -32,7 +33,7 @@ target_link_libraries(${TARGET_NAME}
openvino::npu_al
openvino::npu_zero_utils
npu_logger
npu_ov_utils
npu_compiler_interface
)

target_include_directories(${TARGET_NAME}
Expand All @@ -43,6 +44,7 @@ target_include_directories(${TARGET_NAME}

install(TARGETS ${TARGET_NAME}
ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT}
LIBRARY DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT})
LIBRARY DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT}
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT})

add_subdirectory(level_zero_wrapper)
9 changes: 7 additions & 2 deletions src/mlir_runtime/level_zero_wrapper/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2025-2026 Intel Corporation.
# Copyright (C) 2025-2026 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#

Expand All @@ -20,4 +20,9 @@ target_include_directories(${TARGET_NAME} PRIVATE
${LLVM_INCLUDE_DIRS}
)

target_link_libraries(${TARGET_NAME} PRIVATE npu_elf openvino::npu_al openvino::ze_loader openvino::npu_zero_utils npu_compiler_dialect_vpumi37xx)
target_link_libraries(${TARGET_NAME} PRIVATE npu_elf openvino::npu_al openvino::ze_loader openvino::npu_zero_utils npu_compiler_dialect_vpumi37xx npu_compiler_interface)

install(TARGETS ${TARGET_NAME}
ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT}
LIBRARY DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT}
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT ${VPUX_INTERNAL_COMPONENT})
Loading
Loading