Skip to content

Commit 6e9fa03

Browse files
committed
Merge remote-tracking branch 'upstream/sycl' into accessor-property-interface
2 parents 6d19248 + e8e7ae8 commit 6e9fa03

File tree

2,656 files changed

+125773
-67684
lines changed

Some content is hidden

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

2,656 files changed

+125773
-67684
lines changed

.clang-tidy

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,readability-identifier-naming'
1+
Checks: |
2+
-*,
3+
clang-diagnostic-*,
4+
llvm-*,
5+
-llvm-header-guard,
6+
misc-*,
7+
-misc-no-recursion,
8+
-misc-non-private-member-variables-in-classes,
9+
-misc-unused-parameters,
10+
readability-identifier-naming
11+
WarningsAsErrors: |
12+
llvm-*,
13+
-llvm-header-guard,
14+
misc-*,
15+
-misc-no-recursion,
16+
-misc-non-private-member-variables-in-classes,
17+
-misc-unused-parameters,
18+
readability-identifier-naming
219
CheckOptions:
320
- key: readability-identifier-naming.ClassCase
421
value: CamelCase
@@ -24,3 +41,5 @@ CheckOptions:
2441
value: 1
2542
- key: modernize-use-default-member-init.UseAssignment
2643
value: 1
44+
- key: llvm-namespace-comment.ShortNamespaceLines
45+
value: '25'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,5 @@ jobs:
8787
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
8888
release-workflow \
8989
--issue-number ${{ github.event.issue.number }} \
90+
--phab-token ${{ secrets.RELEASE_WORKFLOW_PHAB_TOKEN }} \
9091
auto

.github/workflows/libclang-abi-tests.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,10 @@ jobs:
124124
- name: Dump ABI
125125
run: |
126126
parallel abi-dumper -lver ${{ matrix.ref }} -skip-cxx -public-headers ./install/include/${{ needs.abi-dump-setup.outputs.ABI_HEADERS }} -o {}-${{ matrix.ref }}.abi ./build/lib/{} ::: ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}
127-
# Remove symbol versioning from dumps, so we can compare across major
128-
# versions. We don't need to do this for libclang.so since its ABI
129-
# is stable across major releases and the symbol versions don't change.
130-
if [ -e libclang-cpp.so-${{ matrix.ref }}.abi ]; then
131-
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' libclang-cpp.so-${{ matrix.ref }}.abi
132-
fi
127+
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do
128+
# Remove symbol versioning from dumps, so we can compare across major versions.
129+
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
130+
done
133131
- name: Upload ABI file
134132
uses: actions/upload-artifact@v2
135133
with:

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ on:
3939
lts_matrix:
4040
type: string
4141
required: false
42-
default: ""
42+
default: "[]"
43+
lts_aws_matrix:
44+
type: string
45+
required: false
46+
default: "[]"
4347
lts_cmake_extra_args:
4448
type: string
4549
required: false
@@ -155,9 +159,31 @@ jobs:
155159
name: sycl_lit_${{ inputs.build_artifact_suffix }}
156160
path: lit.tar.xz
157161

158-
llvm_test_suite:
162+
aws-start:
163+
name: Start AWS
159164
needs: build
160-
if: ${{ inputs.lts_matrix != '' }}
165+
if: ${{ inputs.lts_aws_matrix != '[]' }}
166+
runs-on: ubuntu-latest
167+
environment: aws
168+
steps:
169+
- name: Setup script
170+
run: |
171+
mkdir -p ./aws-ec2
172+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/action.yml -P ./aws-ec2
173+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/aws-ec2.js -P ./aws-ec2
174+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/package.json -P ./aws-ec2
175+
npm install ./aws-ec2
176+
- name: Start AWS EC2 runners
177+
uses: ./aws-ec2
178+
with:
179+
runs-on-list: ${{ inputs.lts_aws_matrix }}
180+
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
181+
AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
182+
AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
183+
184+
llvm_test_suite:
185+
needs: [build, aws-start]
186+
if: ${{ !failure() && inputs.lts_matrix != '[]' }}
161187
strategy:
162188
fail-fast: false
163189
max-parallel: ${{ inputs.max_parallel }}
@@ -190,6 +216,7 @@ jobs:
190216
# FIXME cached_checkout fails here, but works everywhere else
191217
- uses: actions/checkout@v2
192218
with:
219+
persist-credentials: false
193220
path: llvm
194221
# TODO should this action be packed into container as well?
195222
- uses: ./llvm/devops/actions/llvm_test_suite
@@ -203,3 +230,26 @@ jobs:
203230
check_sycl_all: ${{ matrix.check_sycl_all }}
204231
results_name_suffix: ${{ matrix.config }}_${{ inputs.build_artifact_suffix }}
205232
cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
233+
234+
aws-stop:
235+
name: Stop AWS
236+
needs: [ aws-start, llvm_test_suite ]
237+
if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
238+
runs-on: ubuntu-latest
239+
environment: aws
240+
steps:
241+
- name: Setup script
242+
run: |
243+
mkdir -p ./aws-ec2
244+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/action.yml -P ./aws-ec2
245+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/aws-ec2.js -P ./aws-ec2
246+
wget raw.githubusercontent.com/intel/llvm/sycl/devops/actions/aws-ec2/package.json -P ./aws-ec2
247+
npm install ./aws-ec2
248+
- name: Stop AWS EC2 runners
249+
uses: ./aws-ec2
250+
with:
251+
runs-on-list: ${{ inputs.lts_aws_matrix }}
252+
mode: stop
253+
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
254+
AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
255+
AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}

.github/workflows/sycl_nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
if: github.repository == 'intel/llvm'
2121
uses: ./.github/workflows/sycl_linux_build_and_test.yml
2222
needs: resolve_matrix
23+
secrets: inherit
2324
with:
2425
build_cache_root: "/__w/"
2526
build_artifact_suffix: default
@@ -29,6 +30,7 @@ jobs:
2930
if: github.repository == 'intel/llvm'
3031
uses: ./.github/workflows/sycl_linux_build_and_test.yml
3132
needs: resolve_matrix
33+
secrets: inherit
3234
with:
3335
build_cache_root: "/__w/"
3436
build_cache_suffix: opaque_pointers

.github/workflows/sycl_post_commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ jobs:
2121
name: Linux Default
2222
needs: resolve_matrix
2323
uses: ./.github/workflows/sycl_linux_build_and_test.yml
24+
secrets: inherit
2425
with:
2526
build_cache_root: "/__w/llvm"
2627
build_artifact_suffix: "post_commit"
2728
lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }}
29+
lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }}
2830
linux_no_assert:
2931
name: Linux (no assert)
3032
uses: ./.github/workflows/sycl_linux_build_and_test.yml
33+
secrets: inherit
3134
with:
3235
build_cache_root: "/__w/llvm"
3336
build_cache_suffix: gcc_no_assertions

.github/workflows/sycl_precommit.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: SYCL
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
branches:
66
- sycl
77
# Do not run builds if changes are only in the following locations
88
paths-ignore:
99
- '.github/ISSUE_TEMPLATE/**'
1010
- '.github/CODEOWNERS'
11+
- '.github/workflows/sycl_update_gpu_driver.yml'
1112
- 'devops/containers/**'
1213
- 'devops/scripts/install_drivers.sh'
1314
- 'devops/scripts/install_build_tools.sh'
@@ -17,6 +18,9 @@ on:
1718
- '**.md'
1819
- '**.rst'
1920

21+
permissions:
22+
contents: read
23+
2024
jobs:
2125
lint:
2226
runs-on: ubuntu-latest
@@ -25,6 +29,8 @@ jobs:
2529
steps:
2630
- uses: actions/checkout@v2
2731
with:
32+
ref: ${{ github.event.pull_request.head.sha }}
33+
persist-credentials: false
2834
fetch-depth: 2
2935
- name: Run clang-format
3036
uses: ./devops/actions/clang-format
@@ -43,9 +49,12 @@ jobs:
4349
needs: [lint, resolve_matrix]
4450
if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
4551
uses: ./.github/workflows/sycl_linux_build_and_test.yml
52+
secrets: inherit
4653
with:
54+
build_ref: ${{ github.event.pull_request.head.sha }}
4755
build_cache_root: "/__w/"
4856
build_cache_size: "8G"
4957
build_artifact_suffix: "default"
5058
build_cache_suffix: "default"
5159
lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }}
60+
lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }}

.github/workflows/sycl_resolve_test_matrix.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,25 @@ on:
1919
type: string
2020
required: true
2121
default: ""
22+
uniq:
23+
description: Unique string to name dynamic runners in AWS
24+
type: string
25+
required: false
26+
default: ${{ github.run_id }}-${{ github.run_attempt }}
2227
outputs:
2328
lts_matrix:
2429
description: "Generated Matrix"
2530
value: ${{ jobs.resolve_matrix.outputs.lts_matrix }}
31+
lts_aws_matrix:
32+
description: "Generated Matrix AWS subset"
33+
value: ${{ jobs.resolve_matrix.outputs.lts_aws_matrix }}
2634
jobs:
2735
resolve_matrix:
2836
name: Resolve Test Matrix
2937
runs-on: ubuntu-latest
3038
outputs:
3139
lts_matrix: ${{ steps.work.outputs.lts_matrix }}
40+
lts_aws_matrix: ${{ steps.work.outputs.lts_aws_matrix }}
3241
steps:
3342
- name: Download scripts and configs
3443
shell: bash

.github/workflows/sycl_update_gpu_driver.yml

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,13 @@ jobs:
1818
- name: Create Pull Request
1919
env:
2020
BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }}
21-
LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
2322
run: |
2423
cd $GITHUB_WORKSPACE
25-
# Set fake identity to fulfil git requirements
2624
git config --global user.name "GitHub Actions"
2725
git config --global user.email "[email protected]"
2826
git checkout -B $BRANCH
2927
git add -u
30-
git commit -m "[GHA] Uplift GPU RT version for Linux CI" || exit 0 # exit if commit is empty
31-
git push https://[email protected]/${{ github.repository }} ${BRANCH}
32-
gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION"
33-
34-
update_driver_linux_staging:
35-
runs-on: ubuntu-latest
36-
if: github.repository == 'intel/llvm'
37-
steps:
38-
- uses: actions/checkout@v2
39-
- name: Update dependencies file
40-
run: |
41-
version="$(python3 devops/scripts/update_drivers.py linux_staging)"
42-
echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV
43-
- name: Update sycl Branch
44-
env:
45-
BRANCH: ci/update_gpu_driver-linux_staging-${{ env.NEW_DRIVER_VERSION }}
46-
LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
run: |
49-
cd $GITHUB_WORKSPACE
50-
# Set fake identity to fulfil git requirements
51-
git config --global user.name "GitHub Actions"
52-
git config --global user.email "[email protected]"
53-
git checkout -B $BRANCH
54-
git add -u
55-
git commit -m "[GHA] Uplift GPU RT version for Nightly Builds" || exit 0 # exit if commit is empty
56-
git push https://[email protected]/${{ github.repository }} ${BRANCH}
57-
gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Nightly Builds" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION"
58-
28+
git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty
29+
git push https://[email protected]/${{ github.repository }} ${BRANCH}
30+
gh pr create --head $BRANCH --title "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" --body "Scheduled drivers uplift"

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Intel LLVM-based projects:
55

66
- [oneAPI DPC++ compiler](#oneapi-dpc-compiler)
77
- [Late-outline OpenMP and OpenMP Offload](#late-outline-openmp-and-openmp-offload)
8+
sudo apt-get install llvm-16-dev llvm-16-tools clang-16 libclang-16-dev
9+
`-DLLVM_EXTERNAL_LIT="/usr/lib/llvm-16/build/utils/lit/lit.py"` is
810

911
## oneAPI DPC++ compiler
1012

bolt/include/bolt/Core/BinaryDomTree.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
#ifndef BOLT_CORE_BINARY_DOMTREE_H
1515
#define BOLT_CORE_BINARY_DOMTREE_H
1616

17+
#include "bolt/Core/BinaryBasicBlock.h"
18+
#include "llvm/IR/Dominators.h"
1719
#include "llvm/Support/GenericDomTreeConstruction.h"
1820

1921
namespace llvm {
2022
namespace bolt {
2123

22-
class BinaryBasicBlock;
2324
using BinaryDomTreeNode = DomTreeNodeBase<BinaryBasicBlock>;
2425
using BinaryDominatorTree = DomTreeBase<BinaryBasicBlock>;
2526

bolt/include/bolt/Core/BinaryFunction.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ class BinaryFunction {
994994
bool hasName(const std::string &FunctionName) const {
995995
auto Res =
996996
forEachName([&](StringRef Name) { return Name == FunctionName; });
997-
return Res.hasValue();
997+
return Res.has_value();
998998
}
999999

10001000
/// Check if any of function names matches the given regex.
@@ -1005,7 +1005,7 @@ class BinaryFunction {
10051005
Optional<StringRef> hasRestoredNameRegex(const StringRef NameRegex) const;
10061006

10071007
/// Return a vector of all possible names for the function.
1008-
const std::vector<StringRef> getNames() const {
1008+
std::vector<StringRef> getNames() const {
10091009
std::vector<StringRef> AllNames;
10101010
forEachName([&AllNames](StringRef Name) {
10111011
AllNames.push_back(Name);
@@ -1427,17 +1427,15 @@ class BinaryFunction {
14271427

14281428
const CallSitesType &getColdCallSites() const { return ColdCallSites; }
14291429

1430-
const ArrayRef<uint8_t> getLSDAActionTable() const { return LSDAActionTable; }
1430+
ArrayRef<uint8_t> getLSDAActionTable() const { return LSDAActionTable; }
14311431

14321432
const LSDATypeTableTy &getLSDATypeTable() const { return LSDATypeTable; }
14331433

14341434
const LSDATypeTableTy &getLSDATypeAddressTable() const {
14351435
return LSDATypeAddressTable;
14361436
}
14371437

1438-
const ArrayRef<uint8_t> getLSDATypeIndexTable() const {
1439-
return LSDATypeIndexTable;
1440-
}
1438+
ArrayRef<uint8_t> getLSDATypeIndexTable() const { return LSDATypeIndexTable; }
14411439

14421440
const LabelsMapType &getLabels() const { return Labels; }
14431441

@@ -1652,7 +1650,6 @@ class BinaryFunction {
16521650
}
16531651
OffsetToCFI.emplace(Offset, FrameInstructions.size());
16541652
FrameInstructions.emplace_back(std::forward<MCCFIInstruction>(Inst));
1655-
return;
16561653
}
16571654

16581655
BinaryBasicBlock::iterator addCFIInstruction(BinaryBasicBlock *BB,

0 commit comments

Comments
 (0)