Skip to content

Commit 3ec0dde

Browse files
zhaomaosuzhaomaosu
committed
Merge branch 'main' into config-red-zone-size
2 parents 8f15a87 + b1c4b6f commit 3ec0dde

File tree

29 files changed

+414
-168
lines changed

29 files changed

+414
-168
lines changed

‎.github/workflows/e2e_core.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,19 @@ on:
3434
description: Type of workflow trigger
3535
type: string
3636
required: true
37-
37+
xfail:
38+
description: Allow test failures
39+
type: string
40+
required: false
41+
xfail_not:
42+
description: Not xfail
43+
type: string
44+
required: false
45+
filter_out:
46+
description: Tests to filter out completely
47+
type: string
48+
required: false
49+
3850
permissions:
3951
contents: read
4052
pull-requests: write
@@ -103,7 +115,7 @@ jobs:
103115
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
104116
with:
105117
repository: intel/llvm
106-
ref: sycl
118+
ref: refs/heads/sycl
107119
path: sycl-repo
108120

109121
- name: Set CUDA env vars
@@ -112,11 +124,6 @@ jobs:
112124
echo "CUDA_LIB_PATH=/usr/local/cuda/lib64/stubs" >> $GITHUB_ENV
113125
echo "LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
114126
115-
- name: Run pre setup
116-
run: |
117-
source /opt/intel/oneapi/setvars.sh --force
118-
sycl-ls
119-
120127
- name: Configure SYCL
121128
run: >
122129
python3 sycl-repo/buildbot/configure.py
@@ -161,6 +168,12 @@ jobs:
161168
-DCMAKE_CXX_COMPILER="$(which clang++)"
162169
-DLLVM_LIT="${{github.workspace}}/sycl-repo/llvm/utils/lit/lit.py"
163170
171+
- name: Set test filters
172+
run: |
173+
echo "LIT_XFAIL_NOT=${{inputs.xfail_not}}" >> $GITHUB_ENV
174+
echo "LIT_XFAIL=${{inputs.xfail}}" >> $GITHUB_ENV
175+
echo "LIT_FILTER_OUT=${{inputs.filter_out}}" >> $GITHUB_ENV
176+
164177
- name: Run e2e tests
165178
id: tests
166179
run: ninja -C build-e2e check-sycl-e2e

‎.github/workflows/e2e_level_zero.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: E2E Level Zero
2+
3+
on:
4+
schedule:
5+
# Run every day at 23:00 UTC
6+
- cron: '0 23 * * *'
7+
issue_comment:
8+
types: [created, edited]
9+
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
14+
jobs:
15+
e2e-build-hw:
16+
# trigger only if PR comment contains "e2e-level-zero"
17+
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/e2e-level-zero')) || (github.event_name == 'schedule') }}
18+
name: Start e2e job
19+
# use core flow, run it with L0 specific parameters
20+
uses: ./.github/workflows/e2e_core.yml
21+
# parameters that we pass to the core flow
22+
with:
23+
name: "L0"
24+
runner_tag: "L0_E2E"
25+
str_name: "level_zero"
26+
prefix: "ext_oneapi_"
27+
config: ""
28+
unit: "gpu"
29+
trigger: "${{github.event_name}}"
30+
# Failing tests
31+
xfail: "Basic/device-selectors.cpp;ESIMD/preemption.cpp;syclcompat/atomic/atomic_class.cpp;ProgramManager/uneven_kernel_split.cpp;Plugin/level_zero_ext_intel_queue_index.cpp;Plugin/level_zero_ext_intel_cslice.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp;Matrix/element_wise_ops.cpp;Matrix/element_wise_all_ops.cpp;Matrix/SG32/element_wise_all_ops.cpp"
32+
# Flaky tests
33+
filter_out: "GroupAlgorithm/root_group.cpp|Basic/exceptions-SYCL-2020.cpp|Graph/UnsupportedDevice/device_query.cpp|Graph/RecordReplay/exception_inconsistent_contexts.cpp"

‎.github/workflows/labeler.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
labeler:
1518
permissions:
1619
contents: read
1720
pull-requests: write
1821
runs-on: ubuntu-latest
1922
steps:
20-
- uses: actions/labeler@v5
23+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

66
cmake_minimum_required(VERSION 3.20.0 FATAL_ERROR)
7-
project(unified-runtime VERSION 0.9.0)
7+
project(unified-runtime VERSION 0.10.0)
88

99
include(GNUInstallDirs)
1010
include(CheckCXXSourceCompiles)

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![Build and test](https://github.com/oneapi-src/unified-runtime/actions/workflows/cmake.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/cmake.yml)
44
[![E2E Cuda](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_cuda.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_cuda.yml)
55
[![E2E OpenCL](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_opencl.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_opencl.yml)
6+
[![E2E Level Zero](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_level_zero.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/e2e_level_zero.yml)
67
[![CodeQL](https://github.com/oneapi-src/unified-runtime/actions/workflows/codeql.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/codeql.yml)
78
[![Bandit](https://github.com/oneapi-src/unified-runtime/actions/workflows/bandit.yml/badge.svg)](https://github.com/oneapi-src/unified-runtime/actions/workflows/bandit.yml)
89
[![Coverity](https://scan.coverity.com/projects/28213/badge.svg)](https://scan.coverity.com/projects/oneapi-src-unified-runtime)

‎include/ur_api.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
88
*
99
* @file ur_api.h
10-
* @version v0.9-r0
10+
* @version v0.10-r0
1111
*
1212
*/
1313
#ifndef UR_API_H_INCLUDED
@@ -1098,11 +1098,12 @@ urPlatformGetInfo(
10981098
/// - API versions contain major and minor attributes, use
10991099
/// ::UR_MAJOR_VERSION and ::UR_MINOR_VERSION
11001100
typedef enum ur_api_version_t {
1101-
UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6), ///< version 0.6
1102-
UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7), ///< version 0.7
1103-
UR_API_VERSION_0_8 = UR_MAKE_VERSION(0, 8), ///< version 0.8
1104-
UR_API_VERSION_0_9 = UR_MAKE_VERSION(0, 9), ///< version 0.9
1105-
UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 9), ///< latest known version
1101+
UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6), ///< version 0.6
1102+
UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7), ///< version 0.7
1103+
UR_API_VERSION_0_8 = UR_MAKE_VERSION(0, 8), ///< version 0.8
1104+
UR_API_VERSION_0_9 = UR_MAKE_VERSION(0, 9), ///< version 0.9
1105+
UR_API_VERSION_0_10 = UR_MAKE_VERSION(0, 10), ///< version 0.10
1106+
UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 10), ///< latest known version
11061107
/// @cond
11071108
UR_API_VERSION_FORCE_UINT32 = 0x7fffffff
11081109
/// @endcond

‎include/ur_ddi.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
88
*
99
* @file ur_ddi.h
10-
* @version v0.9-r0
10+
* @version v0.10-r0
1111
*
1212
*/
1313
#ifndef UR_DDI_H_INCLUDED

‎include/ur_print.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
88
*
99
* @file ur_print.hpp
10-
* @version v0.9-r0
10+
* @version v0.10-r0
1111
*
1212
*/
1313
#ifndef UR_PRINT_HPP

‎scripts/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Intel One API Unified Runtime API"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.9
41+
PROJECT_NUMBER = v0.10
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎scripts/core/INTRO.rst‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,26 @@ Environment Variables
282282

283283
Specific environment variables can be set to control the behavior of unified runtime or enable certain features.
284284

285+
.. envvar:: UR_LOG_LEVEL_ZERO
286+
287+
Holds parameters for setting Unified Runtime level zero adapter logging. The syntax is described in the Logging_ section.
288+
289+
.. envvar:: UR_LOG_CUDA
290+
291+
Holds parameters for setting Unified Runtime cuda adapter logging. The syntax is described in the Logging_ section.
292+
293+
.. envvar:: UR_LOG_HIP
294+
295+
Holds parameters for setting Unified Runtime hip adapter logging. The syntax is described in the Logging_ section.
296+
297+
.. envvar:: UR_LOG_OPENCL
298+
299+
Holds parameters for setting Unified Runtime opencl adapter logging. The syntax is described in the Logging_ section.
300+
301+
.. envvar:: UR_LOG_NATIVE_CPU
302+
303+
Holds parameters for setting Unified Runtime native cpu logging. The syntax is described in the Logging_ section.
304+
285305
.. envvar:: UR_LOG_LOADER
286306

287307
Holds parameters for setting Unified Runtime loader logging. The syntax is described in the Logging_ section.

0 commit comments

Comments
 (0)