Skip to content

Commit 3e3bd51

Browse files
committed
Merge branch 'llvm' into review/yang/fix_dsan_destruction
2 parents 864da64 + e02d78b commit 3e3bd51

File tree

140 files changed

+4409
-1288
lines changed

Some content is hidden

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

140 files changed

+4409
-1288
lines changed

.github/workflows/benchmarks_compute.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,23 @@ on:
3434
type: string
3535
required: false
3636
default: ''
37+
sycl_repo:
38+
description: 'Compiler repo'
39+
type: string
40+
required: true
41+
default: 'intel/llvm'
42+
sycl_commit:
43+
description: 'Compiler commit'
44+
type: string
45+
required: false
46+
default: ''
3747

3848
permissions:
3949
contents: read
4050
pull-requests: write
4151

4252
jobs:
4353
e2e-build-hw:
44-
# Run only on upstream; forks will not have the HW
45-
# if: github.repository == 'oneapi-src/unified-runtime'
4654
name: Build SYCL, UR, run Compute Benchmarks
4755
strategy:
4856
matrix:
@@ -105,12 +113,19 @@ jobs:
105113
- name: Checkout SYCL
106114
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
107115
with:
108-
repository: intel/llvm
116+
repository: ${{inputs.sycl_repo}}
109117
ref: refs/heads/sycl
110118
path: sycl-repo
111119
fetch-depth: 1
112120
fetch-tags: false
113121

122+
- name: Fetch specific SYCL commit
123+
if: inputs.sycl_commit != ''
124+
working-directory: ./sycl-repo
125+
run: |
126+
git fetch --depth=1 origin ${{ inputs.sycl_commit }}
127+
git checkout ${{ inputs.sycl_commit }}
128+
114129
- name: Set CUDA env vars
115130
if: matrix.adapter.str_name == 'cuda'
116131
run: |

.github/workflows/cmake.yml

Lines changed: 11 additions & 2 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,8 +37,11 @@ jobs:
3637
- os: 'ubuntu-20.04'
3738
build_type: Release
3839
compiler: {c: gcc-7, cxx: g++-7}
39-
40-
runs-on: ${{matrix.os}}
40+
- os: 'ubuntu-22.04'
41+
build_type: Release
42+
compiler: {c: clang, cxx: clang++}
43+
latency_tracking: '-DUMF_ENABLE_LATENCY_TRACKING=ON'
44+
runs-on: ${{ (matrix.os == 'ubuntu-22.04' && github.repository_owner == 'oneapi-src') && 'intel-ubuntu-22.04' || matrix.os }}
4145

4246
steps:
4347
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -50,6 +54,9 @@ jobs:
5054
- name: Install libhwloc
5155
run: .github/scripts/install_hwloc.sh
5256

57+
- name: Setup PATH
58+
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
59+
5360
- name: Install g++-7
5461
if: matrix.compiler.cxx == 'g++-7'
5562
run: |
@@ -90,6 +97,7 @@ jobs:
9097
-DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
9198
${{matrix.libbacktrace}}
9299
${{matrix.pool_tracking}}
100+
${{matrix.latency_tracking}}
93101
94102
- name: Configure CMake
95103
if: matrix.os == 'ubuntu-20.04'
@@ -104,6 +112,7 @@ jobs:
104112
-DUR_FORMAT_CPP_STYLE=ON
105113
${{matrix.libbacktrace}}
106114
${{matrix.pool_tracking}}
115+
${{matrix.latency_tracking}}
107116
108117
- name: Generate source from spec, check for uncommitted diff
109118
if: matrix.os == 'ubuntu-22.04'

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
analyze-ubuntu:
1414
name: Analyze on Ubuntu
15-
runs-on: ubuntu-latest
15+
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
1616
permissions:
1717
security-events: write
1818

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
# Build job
2525
build:
26-
runs-on: ubuntu-latest
26+
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -57,7 +57,7 @@ jobs:
5757
environment:
5858
name: github-pages
5959
url: ${{ steps.deployment.outputs.page_url }}
60-
runs-on: ubuntu-latest
60+
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
6161
needs: build
6262
steps:
6363
- name: Deploy to GitHub Pages

.github/workflows/e2e_core.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ permissions:
5454
jobs:
5555
changed-files:
5656
name: Check for changed files
57-
runs-on: ubuntu-22.04
57+
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
5858
outputs:
5959
any_changed: ${{ steps.get-changed.outputs.any_changed }}
6060
steps:
@@ -66,6 +66,7 @@ jobs:
6666
files: |
6767
source/adapters/${{inputs.str_name}}/**
6868
source/loader/**
69+
.github/workflows/e2e*
6970
7071
e2e-build-hw:
7172
# We want to run the job only if there are changes in the specific adapter
@@ -168,17 +169,24 @@ jobs:
168169
-DCMAKE_CXX_COMPILER="$(which clang++)"
169170
-DLLVM_LIT="${{github.workspace}}/sycl-repo/llvm/utils/lit/lit.py"
170171
171-
- name: Set test filters for L0
172-
if: matrix.adapter.name == 'L0'
173-
run: |
174-
echo "LIT_XFAIL_NOT=${{inputs.xfail_not}}" >> $GITHUB_ENV
175-
echo "LIT_XFAIL=${{inputs.xfail}}" >> $GITHUB_ENV
176-
echo "LIT_FILTER_OUT=${{inputs.filter_out}}" >> $GITHUB_ENV
172+
- name: Set LIT_XFAIL_NOT
173+
if: inputs.xfail_not != ''
174+
run: echo "LIT_XFAIL_NOT=${{inputs.xfail_not}}" >> $GITHUB_ENV
175+
176+
- name: Set LIT_XFAIL
177+
if: inputs.xfail != ''
178+
run: echo "LIT_XFAIL=${{inputs.xfail}}" >> $GITHUB_ENV
179+
180+
- name: Set LIT_FILTER_OUT
181+
if: inputs.filter_out != ''
182+
run: echo "LIT_FILTER_OUT=${{inputs.filter_out}}" >> $GITHUB_ENV
177183

178184
# TODO: remove once intel/llvm lit tests can properly recognize the GPU
179185
- name: Configure hardware platform feature for L0
180186
if: matrix.adapter.name == 'L0'
181-
run: sed -i '/import lit.llvm/i config.available_features.add("gpu-intel-pvc-1T")' build-e2e/lit.site.cfg.py
187+
run: |
188+
sed -i '/import lit.llvm/i config.available_features.add("gpu-intel-pvc-1T")' build-e2e/lit.site.cfg.py
189+
sed -i '/import lit.llvm/i config.available_features.add("gpu-intel-pvc")' build-e2e/lit.site.cfg.py
182190
183191
- name: Run e2e tests
184192
id: tests

.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: "Matrix/SG32/get_coord_int8_matB.cpp;Matrix/element_wise_all_ops_1d.cpp;Matrix/element_wise_all_ops_1d_cont.cpp;Matrix/element_wise_all_ops_scalar.cpp;Matrix/get_coord_int8_matB.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp;Plugin/level_zero_barrier_optimization.cpp"
24+
xfail: "Config/select_device.cpp;DeviceCodeSplit/grf.cpp;ESIMD/grf.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;Plugin/level_zero_barrier_optimization.cpp"
2525
# Flaky tests
26-
filter_out: "UserDefinedReductions/user_defined_reductions.cpp"
26+
filter_out: "ESIMD/named_barriers/loop_extended.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 -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/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
permissions:
1919
contents: read
2020
pull-requests: write
21-
runs-on: ubuntu-latest
21+
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
2222
steps:
2323
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

.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 * * *'

0 commit comments

Comments
 (0)