Skip to content

Commit abcc5ca

Browse files
authored
Merge branch 'main' into yc/0806-exclude-shadow-from-coredump
2 parents 58c9b52 + bddc8f3 commit abcc5ca

File tree

195 files changed

+6659
-1871
lines changed

Some content is hidden

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

195 files changed

+6659
-1871
lines changed

.github/workflows/benchmarks_compute.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
default: 'level_zero'
1313
options:
1414
- level_zero
15+
- level_zero_v2
1516
unit:
1617
description: Test unit (cpu/gpu)
1718
type: choice
@@ -57,7 +58,8 @@ jobs:
5758
adapter: [
5859
{str_name: "${{inputs.str_name}}",
5960
sycl_config: "${{inputs.sycl_config_params}}",
60-
unit: "${{inputs.unit}}"}
61+
unit: "${{inputs.unit}}"
62+
}
6163
]
6264
build_type: [Release]
6365
compiler: [{c: clang, cxx: clang++}]
@@ -141,8 +143,8 @@ jobs:
141143
--ci-defaults ${{matrix.adapter.sycl_config}}
142144
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
143145
--cmake-opt="-DSYCL_PI_TESTS=OFF"
144-
--cmake-opt="-DSYCL_PI_UR_USE_FETCH_CONTENT=OFF"
145-
--cmake-opt="-DSYCL_PI_UR_SOURCE_DIR=${{github.workspace}}/ur-repo/"
146+
--cmake-opt="-DSYCL_UR_USE_FETCH_CONTENT=OFF"
147+
--cmake-opt="-DSYCL_UR_SOURCE_DIR=${{github.workspace}}/ur-repo/"
146148
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
147149
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
148150
@@ -155,7 +157,7 @@ jobs:
155157
156158
- name: Run benchmarks
157159
id: benchmarks
158-
run: numactl -N 0 ${{ github.workspace }}/ur-repo/scripts/benchmarks/main.py ~/bench_workdir ${{github.workspace}}/sycl_build ${{ inputs.bench_script_params }}
160+
run: numactl -N 0 ${{ github.workspace }}/ur-repo/scripts/benchmarks/main.py ~/bench_workdir ${{github.workspace}}/sycl_build ${{github.workspace}}/ur-repo ${{ matrix.adapter.str_name }} ${{ inputs.bench_script_params }}
159161

160162
- name: Add comment to PR
161163
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

.github/workflows/build-hw-reusable.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ name: Build - Adapters on HW - Reusable
44
on:
55
workflow_call:
66
inputs:
7-
name:
7+
adapter_name:
8+
required: true
9+
type: string
10+
runner_name:
811
required: true
912
type: string
1013
platform:
@@ -33,7 +36,7 @@ jobs:
3336
strategy:
3437
matrix:
3538
adapter: [
36-
{name: "${{inputs.name}}", platform: "${{inputs.platform}}", static_Loader: "${{inputs.static_loader}}"},
39+
{name: "${{inputs.adapter_name}}", platform: "${{inputs.platform}}", static_Loader: "${{inputs.static_loader}}"},
3740
]
3841
build_type: [Debug, Release]
3942
compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}]
@@ -47,7 +50,7 @@ jobs:
4750
- adapter: {static_Loader: ON}
4851
compiler: {c: clang, cxx: clang++}
4952

50-
runs-on: ${{matrix.adapter.name}}
53+
runs-on: ${{inputs.runner_name}}
5154

5255
steps:
5356
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

.github/workflows/cmake.yml

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
compiler: [{c: gcc, cxx: g++}]
2121
libbacktrace: ['-DVAL_USE_LIBBACKTRACE_BACKTRACE=OFF']
2222
pool_tracking: ['-DUMF_ENABLE_POOL_TRACKING=ON', '-DUMF_ENABLE_POOL_TRACKING=OFF']
23+
latency_tracking: ['-DUMF_ENABLE_LATENCY_TRACKING=OFF']
2324
include:
2425
- os: 'ubuntu-22.04'
2526
build_type: Release
@@ -36,6 +37,10 @@ jobs:
3637
- os: 'ubuntu-20.04'
3738
build_type: Release
3839
compiler: {c: gcc-7, cxx: g++-7}
40+
- os: 'ubuntu-22.04'
41+
build_type: Release
42+
compiler: {c: clang, cxx: clang++}
43+
latency_tracking: '-DUMF_ENABLE_LATENCY_TRACKING=ON'
3944
runs-on: ${{ (matrix.os == 'ubuntu-22.04' && github.repository_owner == 'oneapi-src') && 'intel-ubuntu-22.04' || matrix.os }}
4045

4146
steps:
@@ -92,6 +97,7 @@ jobs:
9297
-DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
9398
${{matrix.libbacktrace}}
9499
${{matrix.pool_tracking}}
100+
${{matrix.latency_tracking}}
95101
96102
- name: Configure CMake
97103
if: matrix.os == 'ubuntu-20.04'
@@ -106,6 +112,7 @@ jobs:
106112
-DUR_FORMAT_CPP_STYLE=ON
107113
${{matrix.libbacktrace}}
108114
${{matrix.pool_tracking}}
115+
${{matrix.latency_tracking}}
109116
110117
- name: Generate source from spec, check for uncommitted diff
111118
if: matrix.os == 'ubuntu-22.04'
@@ -131,39 +138,52 @@ jobs:
131138
name: Level Zero
132139
uses: ./.github/workflows/build-hw-reusable.yml
133140
with:
134-
name: L0
141+
adapter_name: L0
142+
runner_name: L0
143+
144+
level-zero-v2:
145+
name: Level Zero V2
146+
uses: ./.github/workflows/build-hw-reusable.yml
147+
with:
148+
adapter_name: L0_V2
149+
runner_name: L0
135150

136151
level-zero-static:
137152
name: Level Zero static
138153
uses: ./.github/workflows/build-hw-reusable.yml
139154
with:
140-
name: L0
155+
adapter_name: L0
156+
runner_name: L0
141157
static_loader: ON
142158

143159
opencl:
144160
name: OpenCL
145161
uses: ./.github/workflows/build-hw-reusable.yml
146162
with:
147-
name: OPENCL
163+
adapter_name: OPENCL
164+
runner_name: OPENCL
148165
platform: "Intel(R) OpenCL"
149166

150167
cuda:
151168
name: CUDA
152169
uses: ./.github/workflows/build-hw-reusable.yml
153170
with:
154-
name: CUDA
171+
adapter_name: CUDA
172+
runner_name: CUDA
155173

156174
hip:
157175
name: HIP
158176
uses: ./.github/workflows/build-hw-reusable.yml
159177
with:
160-
name: HIP
178+
adapter_name: HIP
179+
runner_name: HIP
161180

162181
native-cpu:
163182
name: Native CPU
164183
uses: ./.github/workflows/build-hw-reusable.yml
165184
with:
166-
name: NATIVE_CPU
185+
adapter_name: NATIVE_CPU
186+
runner_name: NATIVE_CPU
167187

168188
e2e-level-zero:
169189
name: E2E L0
@@ -195,15 +215,20 @@ jobs:
195215
matrix:
196216
os: ['windows-2019', 'windows-2022']
197217
adapter: [
198-
{name: None, var: ''}, {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
218+
{name: None, var: ''}, {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'},
219+
{name: None, var: ''}, {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
199220
]
200221

201222
# TODO: building level zero loader on windows-2019 and clang-cl is currently broken
202223
exclude:
203224
- os: 'windows-2019'
204225
adapter: {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
226+
- os: 'windows-2019'
227+
adapter: {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
205228
- adapter: {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
206229
compiler: {c: clang-cl, cxx: clang-cl}
230+
- adapter: {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
231+
compiler: {c: clang-cl, cxx: clang-cl}
207232

208233
build_type: [Debug, Release]
209234
compiler: [{c: cl, cxx: cl}, {c: clang-cl, cxx: clang-cl}]

.github/workflows/coverity.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2023 Intel Corporation
2+
# Copyright (C) 2023-2024 Intel Corporation
33
#
44
# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
55
# See LICENSE.TXT
@@ -38,11 +38,6 @@ jobs:
3838
- name: Install pip packages
3939
run: pip install -r third_party/requirements.txt
4040

41-
- name: Install apt packages
42-
run: |
43-
sudo apt-get update
44-
sudo apt-get install -y libhwloc-dev
45-
4641
- name: Configure CMake
4742
run: >
4843
cmake

.github/workflows/e2e_core.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ jobs:
130130
--ci-defaults ${{matrix.adapter.config}}
131131
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
132132
--cmake-opt="-DSYCL_PI_TESTS=OFF"
133-
--cmake-opt="-DSYCL_PI_UR_USE_FETCH_CONTENT=OFF"
134-
--cmake-opt="-DSYCL_PI_UR_SOURCE_DIR=${{github.workspace}}/ur-repo/"
133+
--cmake-opt="-DSYCL_UR_USE_FETCH_CONTENT=OFF"
134+
--cmake-opt="-DSYCL_UR_SOURCE_DIR=${{github.workspace}}/ur-repo/"
135135
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
136136
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
137137
@@ -157,7 +157,7 @@ jobs:
157157
- name: Setup SYCL variables
158158
run: |
159159
which clang++ sycl-ls
160-
SYCL_PI_TRACE=-1 sycl-ls
160+
SYCL_UR_TRACE=-1 sycl-ls
161161
162162
- name: Build e2e tests
163163
run: >

.github/workflows/e2e_cuda.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ jobs:
2020
prefix: "ext_oneapi_"
2121
config: "--cuda"
2222
unit: "gpu"
23+
extra_lit_flags: "-sv --max-time=3600"

.github/workflows/e2e_level_zero.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
config: ""
2222
unit: "gpu"
2323
# Failing tests
24-
xfail: "Config/select_device.cpp;DeviceCodeSplit/grf.cpp;ESIMD/grf.cpp;ESIMD/named_barriers/loop_extended.cpp;KernelAndProgram/target_register_alloc_mode.cpp;Matrix/SG32/element_wise_all_ops.cpp;Matrix/SG32/get_coord_int8_matB.cpp;Matrix/get_coord_int8_matB.cpp;Matrix/joint_matrix_prefetch.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp;Plugin/level_zero_barrier_optimization.cpp"
24+
xfail: "DeviceCodeSplit/grf.cpp;ESIMD/grf.cpp;ESIMD/mask_expand_load.cpp;KernelAndProgram/target_register_alloc_mode.cpp;Matrix/SG32/get_coord_int8_matB.cpp;Matrix/get_coord_int8_matB.cpp;Matrix/joint_matrix_prefetch.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp; SYCL :: ESIMD/mask_expand_load.cpp;Matrix/SPVCooperativeMatrix/joint_matrix_bf16_fill_k_cache_OOB.cpp;Matrix/SPVCooperativeMatrix/joint_matrix_out_bounds.cpp;Matrix/SPVCooperativeMatrix/joint_matrix_prefetch.cpp;Matrix/SPVCooperativeMatrix/joint_matrix_rowmajorA_rowmajorB.cpp;Matrix/element_wise_all_ops_1d.cpp;Matrix/element_wise_all_ops_1d_cont.cpp;Matrix/element_wise_all_ops_scalar.cpp;Matrix/joint_matrix_bf16_fill_k_cache_OOB.cpp;Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp;Matrix/joint_matrix_out_bounds.cpp;Matrix/joint_matrix_unaligned_k.cpp"
2525
# Flaky tests
26-
filter_out: ""
26+
filter_out: "ESIMD/named_barriers/loop_extended.cpp;ESIMD/local_accessor_copy_to_from.cpp;"
2727
# These runners by default spawn upwards of 260 workers.
2828
# We also add a time out just in case some test hangs
29-
extra_lit_flags: "--param gpu-intel-pvc=True --param gpu-intel-pvc-1T=True -sv -j 100 --max-time 600"
29+
extra_lit_flags: "--param gpu-intel-pvc=True --param gpu-intel-pvc-1T=True -sv -j 100 --max-time=3600"

.github/workflows/e2e_opencl.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ jobs:
2020
prefix: ""
2121
config: ""
2222
unit: "cpu"
23+
xfail: "AOT/double.cpp;AOT/half.cpp;AOT/reqd-sg-size.cpp;Basic/built-ins/marray_geometric.cpp;KernelCompiler/kernel_compiler_spirv.cpp;KernelCompiler/opencl_queries.cpp"
24+
extra_lit_flags: "-sv --max-time=3600"

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Nightly
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
# Run every day at 23:00 UTC
67
- cron: '0 23 * * *'

CMakeLists.txt

Lines changed: 3 additions & 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.10.0)
7+
project(unified-runtime VERSION 0.11.0)
88

99
# Check if unified runtime is built as a standalone project.
1010
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR UR_STANDALONE_BUILD)
@@ -51,12 +51,14 @@ option(UR_BUILD_ADAPTER_CUDA "Build the CUDA adapter" OFF)
5151
option(UR_BUILD_ADAPTER_HIP "Build the HIP adapter" OFF)
5252
option(UR_BUILD_ADAPTER_NATIVE_CPU "Build the Native-CPU adapter" OFF)
5353
option(UR_BUILD_ADAPTER_ALL "Build all currently supported adapters" OFF)
54+
option(UR_BUILD_ADAPTER_L0_V2 "Build the (experimental) Level-Zero v2 adapter" OFF)
5455
option(UR_BUILD_EXAMPLE_CODEGEN "Build the codegen example." OFF)
5556
option(VAL_USE_LIBBACKTRACE_BACKTRACE "enable libbacktrace validation backtrace for linux" OFF)
5657
option(UR_ENABLE_ASSERTIONS "Enable assertions for all build types" OFF)
5758
option(UR_BUILD_XPTI_LIBS "Build the XPTI libraries when tracing is enabled" ON)
5859
option(UR_STATIC_LOADER "Build loader as a static library" OFF)
5960
option(UR_FORCE_LIBSTDCXX "Force use of libstdc++ in a build using libc++ on Linux" OFF)
61+
option(UR_ENABLE_LATENCY_HISTOGRAM "Enable latncy histogram" OFF)
6062
set(UR_DPCXX "" CACHE FILEPATH "Path of the DPC++ compiler executable")
6163
set(UR_DPCXX_BUILD_FLAGS "" CACHE STRING "Build flags to pass to DPC++ when compiling device programs")
6264
set(UR_SYCL_LIBRARY_DIR "" CACHE PATH

0 commit comments

Comments
 (0)