Skip to content

Commit 7c06067

Browse files
committed
Merge remote-tracking branch 'intel/origin/sycl' into maronas/ext_composite_device
2 parents 81a9a2c + 653af67 commit 7c06067

File tree

5,772 files changed

+682162
-317952
lines changed

Some content is hidden

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

5,772 files changed

+682162
-317952
lines changed

.ci/generate-buildkite-pipeline-premerge

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#
1111
# This file generates a Buildkite pipeline that triggers the various CI jobs for
12-
# the LLVM project during pre-commit CI (each time a Phabricator diff is uploaded).
12+
# the LLVM project during pre-commit CI.
1313
#
1414
# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
1515
#
@@ -22,19 +22,18 @@ set -o pipefail
2222

2323
# Environment variables script works with:
2424

25-
# Fetch origin/main to have an up to date merge base for main...HEAD diff.
26-
git fetch origin main:main
25+
# Set by buildkite
26+
: ${BUILDKITE_PULL_REQUEST_BASE_BRANCH:=}
27+
: ${BUILDKITE_COMMIT:=}
28+
: ${BUILDKITE_BRANCH:=}
29+
# Fetch origin to have an up to date merge base for the diff.
30+
git fetch origin
2731
# List of files affected by this commit
28-
: ${MODIFIED_FILES:=$(git diff --name-only main...HEAD)}
32+
: ${MODIFIED_FILES:=$(git diff --name-only origin/${BUILDKITE_PULL_REQUEST_BASE_BRANCH}...HEAD)}
2933
# Filter rules for generic windows tests
3034
: ${WINDOWS_AGENTS:='{"queue": "windows"}'}
3135
# Filter rules for generic linux tests
3236
: ${LINUX_AGENTS:='{"queue": "linux"}'}
33-
# Service agents, for interacting with Phabricator.
34-
: ${SERVICE_AGENTS:='{"queue": "service"}'}
35-
# Set by buildkite
36-
: ${BUILDKITE_COMMIT:=}
37-
: ${BUILDKITE_BRANCH:=}
3837

3938
reviewID="$(git log --format=%B -n 1 | sed -nE 's/^Review-ID:[[:space:]]*(.+)$/\1/p')"
4039
if [[ "${reviewID}" != "" ]]; then
@@ -284,28 +283,3 @@ if [[ "${windows_projects}" != "" ]]; then
284283
- 'bash .ci/monolithic-windows.sh "$(echo ${windows_projects} | tr ' ' ';')" "$(echo ${windows_check_targets})"'
285284
EOF
286285
fi
287-
288-
# If build was triggered from a Phabricator review - send an update back.
289-
if [[ -n "${ph_target_phid:-}" ]]; then
290-
cat << EOF
291-
- continue_on_failure: true
292-
wait: '~'
293-
- label: ':phabricator: update build status on Phabricator'
294-
agents: ${SERVICE_AGENTS}
295-
artifact_paths:
296-
- 'artifacts/**/*'
297-
commands:
298-
- export SRC=\$\${BUILDKITE_BUILD_PATH}/llvm-premerge-checks
299-
- rm -rf \$\${SRC}
300-
- git clone --depth 1 https://github.com/google/llvm-premerge-checks.git "\$\${SRC}"
301-
- cd \$\${SRC}
302-
- git fetch origin "main":x
303-
- git checkout x
304-
- echo "llvm-premerge-checks commit"
305-
- git rev-parse HEAD
306-
- pip install -q -r \$\${SRC}/scripts/requirements.txt
307-
- cd "\$\$BUILDKITE_BUILD_CHECKOUT_PATH"
308-
- \$\${SRC}/scripts/summary.py
309-
timeout_in_minutes: 10
310-
EOF
311-
fi

.ci/generate-buildkite-pipeline-scheduled

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

.git-blame-ignore-revs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,8 @@ f6d557ee34b6bbdb1dc32f29e34b4a4a8ad35e81
7373

7474
# [libc++] Format the code base (#74334)
7575
9783f28cbb155e4a8d49c12e1c60ce14dcfaf0c7
76+
77+
# [RFC] compiler-rt builtins cleanup and refactoring
78+
082b89b25faae3e45a023caf51b65ca0f02f377f
79+
0ba22f51d128bee9d69756c56c4678097270e10b
80+
84da0e1bb75f8666cf222d2f600f37bebb9ea389

.github/new-prs-labeler.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,49 @@ mc:
7575
clang:driver:
7676
- clang/*/Driver/**
7777

78+
compiler-rt:asan:
79+
- compiler-rt/lib/asan/**
80+
- compiler-rt/include/sanitizer/asan_interface.h
81+
- compiler-rt/test/asan/**
82+
- compiler-rt/lib/asan_abi/**
83+
- compiler-rt/test/asan_abi/**
84+
85+
compiler-rt:builtins:
86+
- compiler-rt/lib/builtins/**
87+
- compiler-rt/test/builtins/**
88+
89+
compiler-rt:cfi:
90+
- compiler-rt/lib/cfi/**
91+
- compiler-rt/test/cfi/**
92+
93+
compiler-rt:fuzzer:
94+
- compiler-rt/lib/fuzzer/**
95+
- compiler-rt/include/fuzzer/**
96+
- compiler-rt/test/fuzzer/**
97+
98+
compiler-rt:hwasan:
99+
- compiler-rt/lib/hwasan/**
100+
- compiler-rt/include/sanitizer/hwasan_interface.h
101+
- compiler-rt/test/hwasan/**
102+
103+
compiler-rt:lsan:
104+
- compiler-rt/lib/lsan/**
105+
- compiler-rt/include/sanitizer/lsan_interface.h
106+
- compiler-rt/test/lsan/**
107+
108+
compiler-rt:msan:
109+
- compiler-rt/lib/msan/**
110+
- compiler-rt/include/sanitizer/msan_interface.h
111+
- compiler-rt/test/msan/**
112+
78113
compiler-rt:sanitizer:
79114
- llvm/lib/Transforms/Instrumentation/*Sanitizer*
80115
- compiler-rt/lib/interception/**
81116
- compiler-rt/lib/*san*/**
117+
- compiler-rt/include/sanitizer/**
82118
- compiler-rt/test/*san*/**
83119
- compiler-rt/lib/fuzzer/**
120+
- compiler-rt/include/fuzzer/**
84121
- compiler-rt/test/fuzzer/**
85122
- compiler-rt/lib/scudo/**
86123
- compiler-rt/test/scudo/**
@@ -89,6 +126,19 @@ compiler-rt:scudo:
89126
- compiler-rt/lib/scudo/**
90127
- compiler-rt/test/scudo/**
91128

129+
compiler-rt:tsan:
130+
- compiler-rt/lib/tsan/**
131+
- compiler-rt/include/sanitizer/tsan_interface.h
132+
- compiler-rt/include/sanitizer/tsan_interface_atomic.h
133+
- compiler-rt/test/tsan/**
134+
135+
compiler-rt:ubsan:
136+
- compiler-rt/lib/ubsan/**
137+
- compiler-rt/include/sanitizer/ubsan_interface.h
138+
- compiler-rt/test/ubsan/**
139+
- compiler-rt/lib/ubsan_minimal/**
140+
- compiler-rt/test/ubsan_minimal/**
141+
92142
xray:
93143
- llvm/tools/llvm-xray/**
94144
- compiler-rt/*/xray/**
@@ -308,6 +358,9 @@ clang-tidy:
308358
- clang-tools-extra/docs/clang-tidy/**
309359
- clang-tools-extra/test/clang-tidy/**
310360

361+
clang-tools-extra:
362+
- clang-tools-extra/**
363+
311364
tools:llvm-mca:
312365
- llvm/tools/llvm-mca/**
313366
- llvm/include/llvm/MCA/**
@@ -591,13 +644,16 @@ mlgo:
591644
- llvm/include/llvm/Analysis/*Runner.h
592645
- llvm/unittests/Analysis/ML*
593646
- llvm/lib/Analysis/FunctionPropertiesAnalysis.cpp
647+
- llvm/lib/Analysis/TrainingLogger.cpp
594648
- llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h
649+
- llvm/include/llvm/Analysis/Utils/TrainingLogger.h
595650
- llvm/test/Analysis/FunctionPropertiesAnalysis/*
596651
- llvm/unittests/Analysis/FunctionPropertiesAnalysisTest.cpp
597652
- llvm/test/Transforms/inline/ML/**
598653
- llvm/lib/CodeGen/ML*
599654
- llvm/unittests/CodeGen/ML*
600655
- llvm/test/CodeGen/MLRegAlloc/**
656+
- llvm/utils/mlgo-utils/*
601657

602658
tools:llvm-exegesis:
603659
- llvm/tools/llvm-exegesis/**

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,35 @@ FROM docker.io/library/ubuntu:22.04 as base
22
ENV LLVM_SYSROOT=/opt/llvm/
33

44
FROM base as toolchain
5-
ENV LLVM_MAJOR=17
6-
ENV LLVM_VERSION=${LLVM_MAJOR}.0.6
7-
ENV LLVM_DIRNAME=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-22.04
8-
ENV LLVM_FILENAME=${LLVM_DIRNAME}.tar.xz
5+
ENV LLVM_VERSION=17.0.6
96

107
RUN apt-get update && \
118
apt-get install -y \
12-
curl \
13-
xz-utils
9+
wget \
10+
gcc \
11+
g++ \
12+
cmake \
13+
ninja-build \
14+
python3
15+
16+
RUN wget https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && tar -xf llvmorg-$LLVM_VERSION.tar.gz
1417

15-
RUN mkdir -p $LLVM_SYSROOT/bin/ $LLVM_SYSROOT/lib/
18+
WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
1619

17-
RUN curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/$LLVM_FILENAME
20+
RUN mkdir build
1821

19-
RUN tar -C $LLVM_SYSROOT --strip-components=1 -xJf $LLVM_FILENAME \
20-
$LLVM_DIRNAME/bin/clang \
21-
$LLVM_DIRNAME/bin/clang++ \
22-
$LLVM_DIRNAME/bin/clang-cl \
23-
$LLVM_DIRNAME/bin/clang-$LLVM_MAJOR \
24-
$LLVM_DIRNAME/bin/lld \
25-
$LLVM_DIRNAME/bin/ld.lld \
26-
$LLVM_DIRNAME/lib/clang/
22+
RUN cmake -B ./build -G Ninja ./llvm \
23+
-C ./clang/cmake/caches/BOLT-PGO.cmake \
24+
-DBOOTSTRAP_LLVM_ENABLE_LLD=ON \
25+
-DBOOTSTRAP_BOOTSTRAP_LLVM_ENABLE_LLD=ON \
26+
-DPGO_INSTRUMENT_LTO=Thin \
27+
-DLLVM_ENABLE_RUNTIMES="compiler-rt" \
28+
-DCMAKE_INSTALL_PREFIX="$LLVM_SYSROOT" \
29+
-DLLVM_ENABLE_PROJECTS="bolt;clang;lld;clang-tools-extra" \
30+
-DLLVM_DISTRIBUTION_COMPONENTS="lld;compiler-rt;clang-format" \
31+
-DCLANG_DEFAULT_LINKER="lld"
2732

33+
RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C ./build install-distribution && rm -rf ./build
2834

2935
FROM base
3036

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
fetch-depth: 1
6464
- name: Get subprojects that have doc changes
6565
id: docs-changed-subprojects
66-
uses: tj-actions/changed-files@v41
66+
uses: tj-actions/changed-files@v42
6767
with:
6868
files_yaml: |
6969
llvm:
@@ -98,7 +98,7 @@ jobs:
9898
with:
9999
fetch-depth: 1
100100
- name: Setup Python env
101-
uses: actions/setup-python@v4
101+
uses: actions/setup-python@v5
102102
with:
103103
python-version: '3.11'
104104
cache: 'pip'

.github/workflows/issue-release-workflow.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
backport-commits:
3434
name: Backport Commits
3535
runs-on: ubuntu-latest
36+
permissions:
37+
issues: write
38+
pull-requests: write
3639
if: >-
3740
(github.repository == 'llvm/llvm-project') &&
3841
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
@@ -58,37 +61,8 @@ jobs:
5861
printf "%s" "$COMMENT_BODY" |
5962
./llvm/utils/git/github-automation.py \
6063
--repo "$GITHUB_REPOSITORY" \
61-
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
64+
--token "${{ secrets.RELEASE_WORKFLOW_PR_CREATE }}" \
6265
release-workflow \
66+
--branch-repo-token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
6367
--issue-number ${{ github.event.issue.number }} \
64-
--phab-token ${{ secrets.RELEASE_WORKFLOW_PHAB_TOKEN }} \
65-
auto
66-
67-
create-pull-request:
68-
name: Create Pull Request
69-
runs-on: ubuntu-latest
70-
if: >-
71-
(github.repository == 'llvm/llvm-project') &&
72-
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
73-
contains(github.event.comment.body, '/branch ')
74-
75-
steps:
76-
- name: Fetch LLVM sources
77-
uses: actions/checkout@v4
78-
with:
79-
persist-credentials: false
80-
81-
- name: Setup Environment
82-
run: |
83-
pip install -r ./llvm/utils/git/requirements.txt
84-
85-
- name: Create Pull Request
86-
run: |
87-
printf "%s" "$COMMENT_BODY" |
88-
./llvm/utils/git/github-automation.py \
89-
--repo "$GITHUB_REPOSITORY" \
90-
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
91-
release-workflow \
92-
--issue-number ${{ github.event.issue.number }} \
93-
--phab-token ${{ secrets.RELEASE_WORKFLOW_PHAB_TOKEN }} \
9468
auto

.github/workflows/issue-subscriber.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- name: Setup Automation Script
2323
working-directory: ./llvm/utils/git/
2424
run: |
25-
chmod a+x github-automation.py
2625
pip install -r requirements.txt
2726
2827
- name: Update watchers
@@ -31,7 +30,7 @@ jobs:
3130
env:
3231
LABEL_NAME: ${{ github.event.label.name }}
3332
run: |
34-
./github-automation.py \
33+
python3 ./github-automation.py \
3534
--token '${{ secrets.ISSUE_SUBSCRIBER_TOKEN }}' \
3635
issue-subscriber \
3736
--issue-number '${{ github.event.issue.number }}' \

0 commit comments

Comments
 (0)