Skip to content

Commit d0f22f3

Browse files
author
Alexander Batashev
committed
Merge branch 'sycl' into clang_gh_actions
* sycl: (378 commits) [sycl-post-link][NFC] Extracted the code into a subroutine (intel#3042) [SYCL][NFC] Remove commented out code (intel#3029) [CODEOWNERS] Fix ownership of DPC++ tools tests (intel#3047) [SYCL][NFC] Make tests insensitive to dso_local (intel#3037) [SYCL] Fix acquiring a mutex in _pi_context::finalize (intel#3001) [SYCL] Fix various compilation warnings in plugins (intel#2979) [SYCL][ESIMD] Add simd class conversion ctor and operator (intel#3028) [sycl-post-link][NFC] Use range-based for loop. (intel#3033) [SYCL][NFC] Fix warning in self-build (intel#3023) [NFC] Fix sycl-post-link tests to avoid potential race (intel#3031) [SYCL][CUDA] Add missing barrier to collectives (intel#2990) [SYCL] Make Intel attributes consistent with clang attributes. (intel#3022) [SYCL] Bump SYCL minor version (intel#3026) [SYCL][Doc] Added requirement on reference to test PR in commit message (intel#3010) [SYCL] Put constant initializer list data in non-generic addr space. (intel#3005) [SYCL][L0] Fix memory leak in PiDeviceCache and ZeCommandList (intel#2974) [SYCL] Fix detection of free function calls (intel#3003) [SYCL][NFC] Clean up the builder_dir argument description (intel#3021) [SYCL][ESIMD] Fix LowerESIMD crash on a scalar fptoui LLVM instruction (intel#2699) [NFC] Remove redundant call to getMainExecutable() (intel#3018) ...
2 parents 052b59c + a2c00be commit d0f22f3

File tree

1,504 files changed

+771652
-472897
lines changed

Some content is hidden

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

1,504 files changed

+771652
-472897
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ xpti/ @tovinkere @andykaylor
9595
xptifw/ @tovinkere @andykaylor
9696

9797
# DPC++ tools
98-
llvm/tools/file-table-tform/ @kbobrovs @AlexeySachkov
99-
llvm/tools/llvm-foreach/ @AlexeySachkov @Fznamznon
100-
llvm/tools/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
101-
llvm/tools/sycl-post-link/ @kbobrovs @AlexeySachkov
98+
llvm/**/file-table-tform/ @kbobrovs @AlexeySachkov
99+
llvm/**/llvm-foreach/ @AlexeySachkov @Fznamznon
100+
llvm/**/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
101+
llvm/**/sycl-post-link/ @kbobrovs @AlexeySachkov
102102

103103
# Clang offload tools
104104
clang/tools/clang-offload-bundler/ @kbobrovs @sndmitriev

CONTRIBUTING.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ see [ABI Policy Guide](sycl/doc/ABIPolicyGuide.md) for more information.
6262
- For any DPC++-related commit, the `[SYCL]` tag should be present in the
6363
commit message title. To a reasonable extent, additional tags can be used
6464
to signify the component changed, e.g.: `[PI]`, `[CUDA]`, `[Doc]`.
65+
- For product changes which require modification in tests outside of the current repository
66+
(see [Test DPC++ toolchain](sycl/doc/GetStartedGuide.md#test-dpc-toolchain)),
67+
the commit message should contain the link to corresponding test PR, e.g.: E2E
68+
test changes are available under intel/llvm-test-suite#88 or SYCL
69+
conformance test changes are available under KhronosGroup/SYCL-CTS#65 (see
70+
[Autolinked references and URLs](https://docs.github.com/en/free-pro-team/github/writing-on-github/autolinked-references-and-urls)
71+
for more details). The same message should be present both in commit
72+
message and in PR description.
6573

6674
### Review and acceptance testing
6775

buildbot/check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def main():
4949
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
5050
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
5151
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
52-
help="builder directory, which is the directory contains source and build directories")
52+
help="builder directory, which is the directory containing source and build directories")
5353
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
5454
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
5555
parser.add_argument("-t", "--test-suite", metavar="TEST_SUITE", default="check-all", help="check-xxx target")

buildbot/clang_tidy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
help="pull request base branch")
5252
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
5353
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR", required=True,
54-
help="builder directory, which is the directory contains source and build directories")
54+
help="builder directory, which is the directory containing source and build directories")
5555
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", required=True, help="source directory")
5656
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
5757

buildbot/compile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
5252
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
5353
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
54-
help="builder directory, which is the directory contains source and build directories")
54+
help="builder directory, which is the directory containing source and build directories")
5555
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
5656
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
5757
parser.add_argument("-j", "--build-parallelism", metavar="BUILD_PARALLELISM", help="build parallelism")

buildbot/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def main():
123123
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
124124
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
125125
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
126-
help="builder directory, which is the directory contains source and build directories")
126+
help="builder directory, which is the directory containing source and build directories")
127127
# User options
128128
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory (autodetected by default)")
129129
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory. (<src>/build by default)")

buildbot/dependency.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2020.11.11.0.04
44
# https://github.com/intel/llvm/releases/download/2020-WW45/win-oclcpuexp-2020.11.11.0.04_rel.zip
55
ocl_cpu_rt_ver_win=2020.11.11.0.04
66
# Same GPU driver supports Level Zero and OpenCL
7-
# https://github.com/intel/compute-runtime/releases/tag/20.52.18783
8-
ocl_gpu_rt_ver=20.52.18783
7+
# https://github.com/intel/compute-runtime/releases/tag/21.01.18793
8+
ocl_gpu_rt_ver=21.01.18793
99
# Same GPU driver supports Level Zero and OpenCL
1010
# https://downloadmirror.intel.com/30066/a08/igfx_win10_100.9030.zip
1111
ocl_gpu_rt_ver_win=27.20.100.9030
@@ -26,7 +26,7 @@ ocloc_ver_win=27.20.100.8935
2626
[DRIVER VERSIONS]
2727
cpu_driver_lin=2020.11.11.0.04
2828
cpu_driver_win=2020.11.11.0.04
29-
gpu_driver_lin=20.52.18783
29+
gpu_driver_lin=21.01.18793
3030
gpu_driver_win=27.20.100.9030
3131
fpga_driver_lin=2020.11.11.0.04
3232
fpga_driver_win=2020.11.11.0.04

buildbot/dependency.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def main():
9797
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
9898
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
9999
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
100-
help="builder directory, which is the directory contains source and build directories")
100+
help="builder directory, which is the directory containing source and build directories")
101101
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
102102
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
103103
parser.add_argument("-c", "--clean-build", action="store_true", default=False,

clang-tools-extra/clang-tidy/ClangTidy.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
#include "ExpandModularHeadersPPCallbacks.h"
2323
#include "clang-tidy-config.h"
2424
#include "clang/AST/ASTConsumer.h"
25-
#include "clang/AST/ASTContext.h"
26-
#include "clang/AST/Decl.h"
2725
#include "clang/ASTMatchers/ASTMatchFinder.h"
2826
#include "clang/Format/Format.h"
2927
#include "clang/Frontend/ASTConsumers.h"
3028
#include "clang/Frontend/CompilerInstance.h"
31-
#include "clang/Frontend/FrontendActions.h"
3229
#include "clang/Frontend/FrontendDiagnostic.h"
3330
#include "clang/Frontend/MultiplexConsumer.h"
3431
#include "clang/Frontend/TextDiagnosticPrinter.h"
@@ -43,7 +40,6 @@
4340
#include "clang/Tooling/ReplacementsYaml.h"
4441
#include "clang/Tooling/Tooling.h"
4542
#include "llvm/Support/Process.h"
46-
#include "llvm/Support/Signals.h"
4743
#include <algorithm>
4844
#include <utility>
4945

clang-tools-extra/clang-tidy/ClangTidyCheck.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
#include "llvm/ADT/SmallString.h"
1111
#include "llvm/ADT/StringRef.h"
1212
#include "llvm/Support/Error.h"
13-
#include "llvm/Support/WithColor.h"
1413
#include "llvm/Support/YAMLParser.h"
15-
#include "llvm/Support/raw_ostream.h"
1614

1715
namespace clang {
1816
namespace tidy {

0 commit comments

Comments
 (0)