Skip to content

Commit a1ae54e

Browse files
UD2025.48 (#221)
* Update submodules * UD2025.48 * 5010 Tests * Update driver * Disable Driver 5010 tests for now
1 parent 9f8730d commit a1ae54e

File tree

3,509 files changed

+101686
-16922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,509 files changed

+101686
-16922
lines changed

.github/actions/compile-models/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ runs:
7272
PLATFORM="METEORLAKE"
7373
elif [[ "${{ inputs.npu-platform }}" == "NPU.4000" ]]; then
7474
PLATFORM="LUNARLAKE"
75+
elif [[ "${{ inputs.npu-platform }}" == "NPU.5010" ]]; then
76+
PLATFORM="PANTHERLAKE"
7577
else
7678
PLATFORM="not_valid_platform"
7779
fi

.github/workflows/job_build_drv_linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
if: ${{ !steps.cache-restore.outputs.cache-hit }}
108108
run: |
109109
sed -i "s|^set(OPENVINO_REPOSITORY .*|set(OPENVINO_REPOSITORY https://github.com/${{ steps.versions.outputs.openvino-repository }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
110+
sed -i "s|^set(OPENVINO_REVISION .*|set(OPENVINO_REVISION ${{ steps.versions.outputs.openvino-sha }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
110111
sed -i '/GIT_REPOSITORY/{n;s|https://github.com/openvinotoolkit/npu_compiler.git|https://github.com/${{ steps.versions.outputs.npu-compiler-repository }}.git|}' ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
111112
sed -i "s|^set(NPU_COMPILER_TAG .*|set(NPU_COMPILER_TAG ${{ steps.versions.outputs.npu-compiler-tag }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
112113
sed -i "s|^set(NPU_COMPILER_REVISION .*|set(NPU_COMPILER_REVISION ${{ steps.versions.outputs.npu-compiler-sha }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake

.github/workflows/job_tests_compilation_linux.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ permissions:
3636

3737
jobs:
3838
CompilationTests:
39-
name: Compilation tests ${{ matrix.npu-platform }}
39+
name: Compilation tests ${{ inputs.compiler-type }} ${{ matrix.npu-platform }}
4040
runs-on: ${{ inputs.test-runner }}
4141
timeout-minutes: 60
4242
env:
@@ -49,23 +49,33 @@ jobs:
4949
strategy:
5050
fail-fast: false
5151
matrix:
52+
npu-platform:
53+
- NPU.3720
54+
- NPU.4000
55+
- NPU.5010
56+
compiler-mode:
57+
- ${{ inputs.compiler-type }}
5258
include:
5359
- npu-platform: NPU.3720
5460
models-config: ./validation/public_models_3720_${{ inputs.compiler-type }}.json
5561
- npu-platform: NPU.4000
5662
models-config: ./validation/public_models_4000_${{ inputs.compiler-type }}.json
63+
- npu-platform: NPU.5010
64+
models-config: ./validation/public_models_5010_${{ inputs.compiler-type }}.json
5765
steps:
5866
- name: Checkout
67+
if: ${{ !(matrix.npu-platform == 'NPU.5010' && inputs.compiler-type == 'DRIVER') }}
5968
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
6069

6170
- name: Download artifacts
71+
if: ${{ !(matrix.npu-platform == 'NPU.5010' && inputs.compiler-type == 'DRIVER') }}
6272
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
6373
with:
6474
name: ${{ inputs.install-package }}
6575
path: ${{ env.INSTALL_PACKAGE_DIR }}
6676

6777
- name: Unpack Driver artifacts
68-
if: ${{ inputs.compiler-type == 'DRIVER' }}
78+
if: ${{ inputs.compiler-type == 'DRIVER' && !(matrix.npu-platform == 'NPU.5010') }}
6979
run: |
7080
cd ${INSTALL_PACKAGE_DIR}
7181
dpkg --extract external/intel-driver-compiler-npu_*.deb .
@@ -75,19 +85,21 @@ jobs:
7585
find . -type f
7686
7787
- name: Install system packages
78-
if: ${{ inputs.compiler-type == 'DRIVER' }}
88+
if: ${{ inputs.compiler-type == 'DRIVER' && !(matrix.npu-platform == 'NPU.5010') }}
7989
run: |
8090
sudo apt update
8191
sudo apt install -y libtbb12
8292
8393
- name: Download models for ${{ matrix.npu-platform }}
94+
if: ${{ !(matrix.npu-platform == 'NPU.5010' && inputs.compiler-type == 'DRIVER') }}
8495
uses: ./.github/actions/download-models
8596
with:
8697
compiler-type: ${{ inputs.compiler-type }}
8798
models-config: ${{ matrix.models-config }}
8899
models-dir: ${{ env.MODELS_DIR }}
89100

90101
- name: Compile models for ${{ matrix.npu-platform }}
102+
if: ${{ !(matrix.npu-platform == 'NPU.5010' && inputs.compiler-type == 'DRIVER') }}
91103
uses: ./.github/actions/compile-models
92104
with:
93105
compiler-type: ${{ inputs.compiler-type }}

.github/workflows/job_tests_unit_mlir_linux.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,11 @@ jobs:
8888
export PATH=$PATH:${PROF_PARSER_PATH}:${LSP_SERVER_PATH}:${VPUX_OPT_PATH}:${VPUX_TRANSLATE_PATH}
8989
cd ${OPENVINO_INSTALL_DIR}/tests/lit-tests
9090
python3 ./lit-tool/lit.py -v --param arch=NPU40XX NPU/NPU
91+
92+
- name: Run NPU50XX LIT tests
93+
if: ${{ inputs.run-lit-tests }}
94+
run: |
95+
source ${OPENVINO_INSTALL_DIR}/setupvars.sh
96+
export PATH=$PATH:${PROF_PARSER_PATH}:${LSP_SERVER_PATH}:${VPUX_OPT_PATH}:${VPUX_TRANSLATE_PATH}
97+
cd ${OPENVINO_INSTALL_DIR}/tests/lit-tests
98+
python3 ./lit-tool/lit.py -v --param arch=NPU50XX NPU/NPU

CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,20 @@ endif()
5151

5252
find_package(OpenVINODeveloperPackage REQUIRED)
5353

54+
# Ensure output directory is available
55+
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY AND OV_LIBRARY_OUTPUT_DIRECTORY)
56+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OV_LIBRARY_OUTPUT_DIRECTORY})
57+
endif()
58+
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY AND OV_ARCHIVE_OUTPUT_DIRECTORY)
59+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OV_ARCHIVE_OUTPUT_DIRECTORY})
60+
endif()
61+
if(NOT CMAKE_PDB_OUTPUT_DIRECTORY AND OV_PDB_OUTPUT_DIRECTORY)
62+
set(CMAKE_PDB_OUTPUT_DIRECTORY ${OV_PDB_OUTPUT_DIRECTORY})
63+
endif()
64+
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY AND OV_RUNTIME_OUTPUT_DIRECTORY)
65+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OV_RUNTIME_OUTPUT_DIRECTORY})
66+
endif()
67+
5468
get_directory_property(defs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
5569
set(OV_BUILD_POSTFIX_VAR)
5670
foreach(def ${defs})

CMakePresets.json

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
"CMAKE_EXPORT_COMPILE_COMMANDS" : true,
112112

113113
"ENABLE_DEVELOPER_BUILD": true,
114+
"LIT_TESTS_USE_LINKS": true,
114115

115116
"ENABLE_VPUX_DOCS": false,
116117
"ENABLE_NPU_MICRO_BENCHMARKS": true
@@ -137,6 +138,7 @@
137138
"CMAKE_EXPORT_COMPILE_COMMANDS" : true,
138139

139140
"ENABLE_DEVELOPER_BUILD": true,
141+
"LIT_TESTS_USE_LINKS": true,
140142

141143
"ENABLE_VPUX_DOCS": false,
142144
"ENABLE_NPU_MICRO_BENCHMARKS": true
@@ -393,20 +395,9 @@
393395
}
394396
},
395397
{
396-
"name": "NPU3720/Simulator",
398+
"name": "Silicon",
397399
"hidden": true,
398-
"inherits": [
399-
"NPU3720",
400-
"Simulator"
401-
],
402-
"configurePreset": "vpuxDeveloper",
403-
"output": {
404-
"verbosity": "verbose"
405-
},
406-
"filter": {
407-
"include": {
408-
"name": "^(npuFuncTests-parallel|SingleImageTests)$"
409-
}
400+
"environment": {
410401
}
411402
},
412403
{
@@ -426,23 +417,6 @@
426417
}
427418
}
428419
},
429-
{
430-
"name": "NPU4000/Simulator",
431-
"hidden": true,
432-
"inherits": [
433-
"NPU4000",
434-
"Simulator"
435-
],
436-
"configurePreset": "vpuxDeveloper",
437-
"output": {
438-
"verbosity": "verbose"
439-
},
440-
"filter": {
441-
"include": {
442-
"name": "^(npuFuncTests-parallel|SingleImageTests)$"
443-
}
444-
}
445-
},
446420
{
447421
"name": "NPU4000/Silicon",
448422
"hidden": true,

cmake/compile_options.cmake

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,19 @@ function(enable_warnings_as_errors TARGET_NAME)
7575
)
7676

7777
if(WARNIGS_WIN_STRICT)
78-
# Use W3 instead of Wall, since W4 introduces some hard-to-fix warnings
79-
target_compile_options(${TARGET_NAME}
80-
PRIVATE
81-
/WX /W3 /wd4244 /wd4267 /wd4293
82-
# TODO(E#86977): check and fix warnings to avoid error c2220
83-
)
84-
78+
if(BUILD_COMPILER_FOR_DRIVER)
79+
target_compile_options(${TARGET_NAME}
80+
PRIVATE
81+
/W3
82+
)
83+
else()
84+
# Use W3 instead of Wall, since W4 introduces some hard-to-fix warnings
85+
target_compile_options(${TARGET_NAME}
86+
PRIVATE
87+
/WX /W3 /wd4244 /wd4267
88+
# TODO(E#86977): check and fix warnings to avoid error c2220
89+
)
90+
endif()
8591
# Disable 3rd-party components warnings
8692
target_compile_options(${TARGET_NAME}
8793
PRIVATE

cmake/features.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ ov_option(ENABLE_SPLIT_DWARF "Use -gsplit-dwarf when compiling the project and -
7878

7979
ov_option(LIT_TESTS_USE_LINKS "Create symlink to lit-tests in the binary directory instead of copying them" OFF)
8080

81-
ov_option(ENABLE_NPU_MICRO_BENCHMARKS "NPU micro benchmarks" OFF)
81+
if(NOT DEFINED ENABLE_NPU_MICRO_BENCHMARKS)
82+
set(ENABLE_NPU_MICRO_BENCHMARKS ${ENABLE_DEVELOPER_BUILD})
83+
endif()
84+
ov_option(ENABLE_NPU_MICRO_BENCHMARKS "NPU micro benchmarks" ${ENABLE_NPU_MICRO_BENCHMARKS})
8285

8386
if(ENABLE_VPUX_DOCS)
8487
find_package(Doxygen)

cmake/lit_tests.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ function(vpux_setup_lit_tests TEST_NAME)
123123
set(EXTRA_AVAILABLE_FEATURES "${EXTRA_AVAILABLE_FEATURES}\nconfig.available_features.add(('${var}-' + config.${var}))")
124124
endforeach()
125125

126+
# Add `dev-build` as an available feature to lit tests, which can be used in the REQUIRES field of the tests
127+
# This is useful for disabling incompatible tests in non-developer environments (e.g. lit-tests that use backend descriptors,
128+
# whose printing / parsing logic behaves differently in developer vs non-developer builds)
129+
if(ENABLE_DEVELOPER_BUILD)
130+
set(EXTRA_AVAILABLE_FEATURES "${EXTRA_AVAILABLE_FEATURES}\nconfig.available_features.add(('dev-build'))")
131+
endif()
132+
126133
if(ENABLE_PREBUILT_LLVM_MLIR_LIBS)
127134
set(LLVM_LIBRARY_DIR ${MLIR_BINARY_PKG_DIR}/lib)
128135
set(LLVM_TOOLS_BINARY_DIR ${MLIR_BINARY_PKG_DIR}/bin)

scripts/run_all_lit_tests.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ echo "PATH_LIT_TOOL=$PATH_LIT_TOOL"
3939

4040
CMD_NPU37XX_TESTS="python3 $PATH_LIT_TOOL --param arch=NPU37XX $PATH_TESTS/NPU"
4141
CMD_NPU40XX_TESTS="python3 $PATH_LIT_TOOL --param arch=NPU40XX $PATH_TESTS/NPU"
42+
CMD_NPU50XX_TESTS="python3 $PATH_LIT_TOOL --param arch=NPU50XX $PATH_TESTS/NPU"
4243

4344
EXIT_CODE=0
4445

@@ -49,6 +50,9 @@ echo ""
4950
echo "Executing tests on NPU40XX platform: $CMD_NPU40XX_TESTS"
5051
eval "$CMD_NPU40XX_TESTS"; EXIT_CODE=$(($EXIT_CODE + $?))
5152
echo ""
53+
echo "Executing tests on NPU50XX platform: $CMD_NPU50XX_TESTS"
54+
eval "$CMD_NPU50XX_TESTS"; EXIT_CODE=$(($EXIT_CODE + $?))
55+
echo ""
5256
if [ $EXIT_CODE -ne 0 ]
5357
then
5458
echo "FAILURES identified"

0 commit comments

Comments
 (0)