Skip to content

Commit 1a31073

Browse files
zhaomaosuzhaomaosu
committed
Merge branch 'main' into simplify-device-global
2 parents aefc853 + 42d72b6 commit 1a31073

Some content is hidden

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

69 files changed

+1026
-471
lines changed

‎.github/docker/ubuntu-22.04.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ RUN /opt/install_dpcpp.sh
6767
COPY install_libbacktrace.sh /opt/install_libbacktrace.sh
6868
RUN /opt/install_libbacktrace.sh
6969

70-
# Add a new (non-root) 'user'
71-
ENV USER user
70+
# Add a new (non-root) 'test_user' and switch to it
71+
ENV USER test_user
7272
ENV USERPASS pass
7373
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
74+
USER test_user

‎.github/scripts/get_system_info.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function system_info {
5353
echo "**********/proc/meminfo**********"
5454
cat /proc/meminfo
5555
echo "**********build/bin/urinfo**********"
56-
$(dirname "$(readlink -f "$0")")/../../build/bin/urinfo || true
56+
$(dirname "$(readlink -f "$0")")/../../build/bin/urinfo --no-linear-ids --verbose || true
5757
echo "******OpenCL*******"
5858
# The driver version of OpenCL Graphics is the compute-runtime version
5959
clinfo || echo "OpenCL not installed"

‎.github/workflows/e2e_core.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,22 @@ on:
3434
description: Type of workflow trigger
3535
type: string
3636
required: true
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+
extra_lit_flags:
50+
description: Additional llvm-lit flags to use
51+
type: string
52+
required: false
3753

3854
permissions:
3955
contents: read
@@ -50,7 +66,8 @@ jobs:
5066
str_name: "${{inputs.str_name}}",
5167
prefix: "${{inputs.prefix}}",
5268
config: "${{inputs.config}}",
53-
unit: "${{inputs.unit}}"}
69+
unit: "${{inputs.unit}}",
70+
extra_lit_flags: "${{inputs.extra_lit_flags}}"},
5471
]
5572
build_type: [Release]
5673
compiler: [{c: clang, cxx: clang++}]
@@ -103,7 +120,7 @@ jobs:
103120
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
104121
with:
105122
repository: intel/llvm
106-
ref: sycl
123+
ref: refs/heads/sycl
107124
path: sycl-repo
108125

109126
- name: Set CUDA env vars
@@ -112,11 +129,6 @@ jobs:
112129
echo "CUDA_LIB_PATH=/usr/local/cuda/lib64/stubs" >> $GITHUB_ENV
113130
echo "LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
114131
115-
- name: Run pre setup
116-
run: |
117-
source /opt/intel/oneapi/setvars.sh --force
118-
sycl-ls
119-
120132
- name: Configure SYCL
121133
run: >
122134
python3 sycl-repo/buildbot/configure.py
@@ -160,6 +172,14 @@ jobs:
160172
-DSYCL_TEST_E2E_TARGETS="${{matrix.adapter.prefix}}${{matrix.adapter.str_name}}:${{matrix.adapter.unit}}"
161173
-DCMAKE_CXX_COMPILER="$(which clang++)"
162174
-DLLVM_LIT="${{github.workspace}}/sycl-repo/llvm/utils/lit/lit.py"
175+
-DSYCL_E2E_TESTS_LIT_FLAGS="-sv;${{matrix.adapter.extra_lit_flags}}"
176+
177+
- name: Set test filters for L0
178+
if: matrix.adapter.name == 'L0'
179+
run: |
180+
echo "LIT_XFAIL_NOT=${{inputs.xfail_not}}" >> $GITHUB_ENV
181+
echo "LIT_XFAIL=${{inputs.xfail}}" >> $GITHUB_ENV
182+
echo "LIT_FILTER_OUT=${{inputs.filter_out}}" >> $GITHUB_ENV
163183
164184
- name: Run e2e tests
165185
id: tests

‎.github/workflows/e2e_level_zero.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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: "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"
34+
# These runners by default spawn upwards of 260 workers. That's too much for the GPU.
35+
# We also add a time out just in case some test hangs
36+
extra_lit_flags: "-j 50;--max-time 600"

‎.github/workflows/hadolint.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.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

‎.github/workflows/trivy.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Runs linter for Docker files
2+
name: Trivy
3+
4+
on:
5+
workflow_dispatch:
6+
push:
7+
pull_request:
8+
paths:
9+
- '.github/docker/*Dockerfile'
10+
- '.github/workflows/trivy.yml'
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
linux:
21+
name: Trivy
22+
runs-on: ubuntu-latest
23+
permissions:
24+
security-events: write
25+
26+
steps:
27+
- name: Clone repo
28+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
29+
30+
- name: Run Trivy
31+
uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # v0.17.0
32+
with:
33+
scan-type: 'config'
34+
hide-progress: false
35+
format: 'sarif'
36+
output: 'trivy-results.sarif'
37+
exit-code: 1 # Fail if issue found
38+
# file with suppressions: .trivyignore (in root dir)
39+
40+
- name: Print report and trivyignore file
41+
run: |
42+
echo "### Trivy ignore content:"
43+
cat .trivyignore
44+
echo "### Trivy report:"
45+
cat trivy-results.sarif
46+
47+
- name: Upload results
48+
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
49+
with:
50+
sarif_file: 'trivy-results.sarif'

‎.trivyignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Docs: https://aquasecurity.github.io/trivy/latest/docs/configuration/filtering/#trivyignore
2+
3+
# In docker files:
4+
# HEALTHCHECK is not required for development, nor in CI (failed docker = failed CI).
5+
# We're not hosting any application with usage of the dockers.
6+
AVD-DS-0026

‎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)

0 commit comments

Comments
 (0)