Skip to content

Commit b80c1c4

Browse files
AlexeySachkovAlexeySachkov
committed
Merge remote-tracking branch 'origin/sycl' into private/asachkov/generic-module-splitter
2 parents 863abed + e6d72dc commit b80c1c4

File tree

3,143 files changed

+188153
-57378
lines changed

Some content is hidden

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

3,143 files changed

+188153
-57378
lines changed

‎.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ devops/ @intel/dpcpp-devops-reviewers
8989

9090
# Kernel fusion JIT compiler
9191
sycl-fusion/ @victor-eds @Naghasan @sommerlukas
92+
sycl/doc/design/KernelFusionJIT.md @victor-eds @Naghasan @sommerlukas
9293
sycl/doc/extensions/experimental/sycl_ext_codeplay_kernel_fusion.asciidoc @victor-eds @Naghasan @sommerlukas
9394
sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp @victor-eds @Naghasan @sommerlukas
9495
sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp @victor-eds @Naghasan @sommerlukas
@@ -97,3 +98,4 @@ sycl/source/detail/jit_compiler.hpp @victor-eds @Naghasan @sommerlukas
9798
sycl/source/detail/jit_compiler.cpp @victor-eds @Naghasan @sommerlukas
9899
sycl/source/detail/jit_device_binaries.hpp @victor-eds @Naghasan @sommerlukas
99100
sycl/source/detail/jit_device_binaries.cpp @victor-eds @Naghasan @sommerlukas
101+
sycl/test-e2e/KernelFusion @victor-eds @Naghasan @sommerlukas

‎.github/workflows/sycl_precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
windows_default:
7171
name: Windows
72-
needs: test_matrix
72+
needs: [lint, test_matrix]
7373
if: github.repository == 'intel/llvm'
7474
uses: ./.github/workflows/sycl_windows_build_and_test.yml
7575
with:

‎bolt/include/bolt/Core/BinaryContext.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,8 +1227,7 @@ class BinaryContext {
12271227
Emitter = this->MCE.get();
12281228
SmallString<256> Code;
12291229
SmallVector<MCFixup, 4> Fixups;
1230-
raw_svector_ostream VecOS(Code);
1231-
Emitter->encodeInstruction(Inst, VecOS, Fixups, *STI);
1230+
Emitter->encodeInstruction(Inst, Code, Fixups, *STI);
12321231
return Code.size();
12331232
}
12341233

‎bolt/lib/Core/BinaryContext.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,9 +2289,8 @@ bool BinaryContext::validateInstructionEncoding(
22892289

22902290
SmallString<256> Code;
22912291
SmallVector<MCFixup, 4> Fixups;
2292-
raw_svector_ostream VecOS(Code);
22932292

2294-
MCE->encodeInstruction(Inst, VecOS, Fixups, *STI);
2293+
MCE->encodeInstruction(Inst, Code, Fixups, *STI);
22952294
auto OutputSequence = ArrayRef<uint8_t>((uint8_t *)Code.data(), Code.size());
22962295
if (InputSequence != OutputSequence) {
22972296
if (opts::Verbosity > 1) {

‎bolt/lib/Core/BinaryFunction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,8 +1536,7 @@ bool BinaryFunction::scanExternalRefs() {
15361536
// Emit the instruction using temp emitter and generate relocations.
15371537
SmallString<256> Code;
15381538
SmallVector<MCFixup, 4> Fixups;
1539-
raw_svector_ostream VecOS(Code);
1540-
Emitter.MCE->encodeInstruction(Instruction, VecOS, Fixups, *BC.STI);
1539+
Emitter.MCE->encodeInstruction(Instruction, Code, Fixups, *BC.STI);
15411540

15421541
// Create relocation for every fixup.
15431542
for (const MCFixup &Fixup : Fixups) {
@@ -2039,6 +2038,7 @@ bool BinaryFunction::buildCFG(MCPlusBuilder::AllocatorIdTy AllocatorId) {
20392038
MCInst *PrevInstr = PrevBB->getLastNonPseudoInstr();
20402039
assert(PrevInstr && "no previous instruction for a fall through");
20412040
if (MIB->isUnconditionalBranch(Instr) &&
2041+
!MIB->isIndirectBranch(*PrevInstr) &&
20422042
!MIB->isUnconditionalBranch(*PrevInstr) &&
20432043
!MIB->getConditionalTailCall(*PrevInstr) &&
20442044
!MIB->isReturn(*PrevInstr)) {

‎bolt/lib/Core/DebugData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ void DebugStrOffsetsWriter::initialize(
11661166
"Dwarf String Offsets Byte Size is not supported.");
11671167
uint32_t Index = 0;
11681168
for (uint64_t Offset = 0; Offset < Contr->Size; Offset += DwarfOffsetByteSize)
1169-
IndexToAddressMap[Index++] = *reinterpret_cast<const uint32_t *>(
1169+
IndexToAddressMap[Index++] = support::endian::read32le(
11701170
StrOffsetsSection.Data.data() + Contr->Base + Offset);
11711171
}
11721172

‎bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
265265
return true;
266266
}
267267

268-
DispImm = Inst.getOperand(I).getImm() << 2;
268+
DispImm = Inst.getOperand(I).getImm() * 4;
269269
return true;
270270
}
271271
return false;

‎bolt/test/X86/section-end-sym.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Check that BOLT doesn't consider end-of-section symbols (e.g., _etext) as
22
## functions.
33

4-
# REQUIRES: system-linux, asserts
4+
# REQUIRES: x86_64-linux, asserts
55

66
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-linux %s -o %t.o
77
# RUN: ld.lld %t.o -o %t.exe -q

‎bolt/test/X86/unreachable-jmp.s

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# This checks that we don't create an invalid CFG when there is an
2+
# unreachable direct jump right after an indirect one.
3+
4+
# REQUIRES: system-linux
5+
6+
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
7+
# RUN: %s -o %t.o
8+
# RUN: link_fdata %s %t.o %t.fdata
9+
# RUN: llvm-strip --strip-unneeded %t.o
10+
# RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q -nostdlib
11+
# RUN: llvm-bolt %t.exe -o %t.out --data %t.fdata \
12+
# RUN: --eliminate-unreachable --print-cfg | FileCheck %s
13+
14+
.globl _start
15+
.type _start, %function
16+
_start:
17+
.cfi_startproc
18+
# FDATA: 0 [unknown] 0 1 _start 0 0 1
19+
push %rbp
20+
mov %rsp, %rbp
21+
push %rbx
22+
push %r14
23+
subq $0x20, %rsp
24+
movq %rdi, %rcx
25+
b:
26+
jmpq *JUMP_TABLE(,%rcx,8)
27+
# FDATA: 1 _start #b# 1 _start #hotpath# 0 20
28+
# Unreachable direct jump here. Our CFG should still make sense and properly
29+
# place this instruction in a new basic block.
30+
jmp .lbb2
31+
.lbb1: je .lexit
32+
.lbb2:
33+
xorq %rax, %rax
34+
addq $0x20, %rsp
35+
pop %r14
36+
pop %rbx
37+
pop %rbp
38+
ret
39+
hotpath:
40+
movq $2, %rax
41+
addq $0x20, %rsp
42+
pop %r14
43+
pop %rbx
44+
pop %rbp
45+
ret
46+
.lexit:
47+
movq $1, %rax
48+
addq $0x20, %rsp
49+
pop %r14
50+
pop %rbx
51+
pop %rbp
52+
ret
53+
.cfi_endproc
54+
.size _start, .-_start
55+
56+
.rodata
57+
.globl JUMP_TABLE
58+
JUMP_TABLE:
59+
.quad .lbb1
60+
.quad .lbb2
61+
.quad hotpath
62+
63+
# No basic blocks above should have 4 successors! That is a bug.
64+
# CHECK-NOT: Successors: {{.*}} (mispreds: 0, count: 20), {{.*}} (mispreds: 0, count: 0), {{.*}} (mispreds: 0, count: 0), {{.*}} (mispreds: 0, count: 0)
65+
# Check successful removal of stray direct jmp
66+
# CHECK: UCE removed 1 block

‎clang-tools-extra/clang-include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ const HeaderMapCollector::RegexHeaderMap *getSTLPostfixHeaderMap() {
267267
{"unordered_set$", "<unordered_set>"},
268268
{"utility$", "<utility>"},
269269
{"valarray$", "<valarray>"},
270+
{"variant$", "<variant>"},
270271
{"vector$", "<vector>"},
271272
{"include/complex.h$", "<complex.h>"},
272273
{"include/ctype.h$", "<cctype>"},

‎clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,48 @@ void yamlize(IO &IO, ClangTidyOptions::OptionMap &Options, bool,
117117
}
118118
}
119119

120+
struct ChecksVariant {
121+
std::optional<std::string> AsString;
122+
std::optional<std::vector<std::string>> AsVector;
123+
};
124+
125+
template <>
126+
void yamlize(IO &IO, ChecksVariant &Checks, bool, EmptyContext &Ctx) {
127+
if (!IO.outputting()) {
128+
// Special case for reading from YAML
129+
// Must support reading from both a string or a list
130+
Input &I = reinterpret_cast<Input &>(IO);
131+
if (isa<ScalarNode, BlockScalarNode>(I.getCurrentNode())) {
132+
Checks.AsString = std::string();
133+
yamlize(IO, *Checks.AsString, true, Ctx);
134+
} else if (isa<SequenceNode>(I.getCurrentNode())) {
135+
Checks.AsVector = std::vector<std::string>();
136+
yamlize(IO, *Checks.AsVector, true, Ctx);
137+
} else {
138+
IO.setError("expected string or sequence");
139+
}
140+
}
141+
}
142+
143+
static void mapChecks(IO &IO, std::optional<std::string> &Checks) {
144+
if (IO.outputting()) {
145+
// Output always a string
146+
IO.mapOptional("Checks", Checks);
147+
} else {
148+
// Input as either a string or a list
149+
ChecksVariant ChecksAsVariant;
150+
IO.mapOptional("Checks", ChecksAsVariant);
151+
if (ChecksAsVariant.AsString)
152+
Checks = ChecksAsVariant.AsString;
153+
else if (ChecksAsVariant.AsVector)
154+
Checks = llvm::join(*ChecksAsVariant.AsVector, ",");
155+
}
156+
}
157+
120158
template <> struct MappingTraits<ClangTidyOptions> {
121159
static void mapping(IO &IO, ClangTidyOptions &Options) {
122160
bool Ignored = false;
123-
IO.mapOptional("Checks", Options.Checks);
161+
mapChecks(IO, Options.Checks);
124162
IO.mapOptional("WarningsAsErrors", Options.WarningsAsErrors);
125163
IO.mapOptional("HeaderFileExtensions", Options.HeaderFileExtensions);
126164
IO.mapOptional("ImplementationFileExtensions",

‎clang-tools-extra/clang-tidy/altera/IdDependentBackwardBranchCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ void IdDependentBackwardBranchCheck::registerMatchers(MatchFinder *Finder) {
3131
stmt(
3232
anyOf(declStmt(hasDescendant(varDecl(hasInitializer(ThreadID))
3333
.bind("tid_dep_var"))),
34-
binaryOperator(allOf(
34+
binaryOperator(
3535
isAssignmentOperator(), hasRHS(ThreadID),
3636
hasLHS(anyOf(
3737
declRefExpr(to(varDecl().bind("tid_dep_var"))),
3838
memberExpr(member(
39-
fieldDecl().bind("tid_dep_field")))))))))
39+
fieldDecl().bind("tid_dep_field"))))))))
4040
.bind("straight_assignment"))),
4141
this);
4242

‎clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,16 @@ void SingleWorkItemBarrierCheck::registerMatchers(MatchFinder *Finder) {
2222
Finder->addMatcher(
2323
// Find function declarations...
2424
functionDecl(
25-
allOf(
26-
// That are OpenCL kernels...
27-
hasAttr(attr::Kind::OpenCLKernel),
28-
// And call a barrier function (either 1.x or 2.x version)...
29-
forEachDescendant(callExpr(callee(functionDecl(hasAnyName(
30-
"barrier", "work_group_barrier"))))
31-
.bind("barrier")),
32-
// But do not call an ID function.
33-
unless(hasDescendant(callExpr(callee(functionDecl(
34-
hasAnyName("get_global_id", "get_local_id", "get_group_id",
35-
"get_local_linear_id"))))))))
25+
// That are OpenCL kernels...
26+
hasAttr(attr::Kind::OpenCLKernel),
27+
// And call a barrier function (either 1.x or 2.x version)...
28+
forEachDescendant(callExpr(callee(functionDecl(hasAnyName(
29+
"barrier", "work_group_barrier"))))
30+
.bind("barrier")),
31+
// But do not call an ID function.
32+
unless(hasDescendant(callExpr(callee(functionDecl(
33+
hasAnyName("get_global_id", "get_local_id", "get_group_id",
34+
"get_local_linear_id")))))))
3635
.bind("function"),
3736
this);
3837
}

‎clang-tools-extra/clang-tidy/altera/UnrollLoopsCheck.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ UnrollLoopsCheck::UnrollLoopsCheck(StringRef Name, ClangTidyContext *Context)
2525

2626
void UnrollLoopsCheck::registerMatchers(MatchFinder *Finder) {
2727
const auto HasLoopBound = hasDescendant(
28-
varDecl(allOf(matchesName("__end*"),
29-
hasDescendant(integerLiteral().bind("cxx_loop_bound")))));
28+
varDecl(matchesName("__end*"),
29+
hasDescendant(integerLiteral().bind("cxx_loop_bound"))));
3030
const auto CXXForRangeLoop =
3131
cxxForRangeStmt(anyOf(HasLoopBound, unless(HasLoopBound)));
3232
const auto AnyLoop = anyOf(forStmt(), whileStmt(), doStmt(), CXXForRangeLoop);
3333
Finder->addMatcher(
34-
stmt(allOf(AnyLoop, unless(hasDescendant(stmt(AnyLoop))))).bind("loop"),
35-
this);
34+
stmt(AnyLoop, unless(hasDescendant(stmt(AnyLoop)))).bind("loop"), this);
3635
}
3736

3837
void UnrollLoopsCheck::check(const MatchFinder::MatchResult &Result) {

‎clang-tools-extra/clang-tidy/bugprone/BadSignalToKillThreadCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace clang::tidy::bugprone {
1818

1919
void BadSignalToKillThreadCheck::registerMatchers(MatchFinder *Finder) {
2020
Finder->addMatcher(
21-
callExpr(allOf(callee(functionDecl(hasName("::pthread_kill"))),
22-
argumentCountIs(2)),
21+
callExpr(callee(functionDecl(hasName("::pthread_kill"))),
22+
argumentCountIs(2),
2323
hasArgument(1, integerLiteral().bind("integer-literal")))
2424
.bind("thread-kill"),
2525
this);

‎clang-tools-extra/clang-tidy/bugprone/FoldInitTypeCheck.cpp

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,24 @@ void FoldInitTypeCheck::registerMatchers(MatchFinder *Finder) {
2424
return anyOf(
2525
// Pointer types.
2626
pointsTo(BuiltinTypeWithId(ID)),
27-
// Iterator types.
28-
recordType(hasDeclaration(has(typedefNameDecl(
29-
hasName("value_type"), hasType(BuiltinTypeWithId(ID)))))));
27+
// Iterator types have an `operator*` whose return type is the type we
28+
// care about.
29+
// Notes:
30+
// - `operator*` can be in one of the bases of the iterator class.
31+
// - this does not handle cases when the `operator*` is defined
32+
// outside the iterator class.
33+
recordType(
34+
hasDeclaration(cxxRecordDecl(isSameOrDerivedFrom(has(functionDecl(
35+
hasOverloadedOperatorName("*"),
36+
returns(qualType(hasCanonicalType(anyOf(
37+
// `value_type& operator*();`
38+
references(BuiltinTypeWithId(ID)),
39+
// `value_type operator*();`
40+
BuiltinTypeWithId(ID),
41+
// `auto operator*();`, `decltype(auto) operator*();`
42+
autoType(hasDeducedType(BuiltinTypeWithId(ID)))
43+
//
44+
)))))))))));
3045
};
3146

3247
const auto IteratorParam = parmVarDecl(

‎clang-tools-extra/clang-tidy/bugprone/NotNullTerminatedResultCheck.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ AST_MATCHER_P(Expr, hasDefinition, ast_matchers::internal::Matcher<Expr>,
528528

529529
const char *const VarDeclName = "variable-declaration";
530530
auto DREHasDefinition = ignoringImpCasts(declRefExpr(
531-
allOf(to(varDecl().bind(VarDeclName)),
532-
hasAncestor(compoundStmt(hasDescendant(binaryOperator(
533-
hasLHS(declRefExpr(to(varDecl(equalsBoundNode(VarDeclName))))),
534-
hasRHS(ignoringImpCasts(InnerMatcher)))))))));
531+
to(varDecl().bind(VarDeclName)),
532+
hasAncestor(compoundStmt(hasDescendant(binaryOperator(
533+
hasLHS(declRefExpr(to(varDecl(equalsBoundNode(VarDeclName))))),
534+
hasRHS(ignoringImpCasts(InnerMatcher))))))));
535535

536536
if (DREHasDefinition.matches(*SimpleNode, Finder, Builder))
537537
return true;
@@ -581,9 +581,8 @@ void NotNullTerminatedResultCheck::registerMatchers(MatchFinder *Finder) {
581581

582582
// - Example: std::string str = "foo"; str.size();
583583
auto SizeOrLength =
584-
cxxMemberCallExpr(
585-
allOf(on(expr(AnyOfStringTy).bind("Foo")),
586-
has(memberExpr(member(hasAnyName("size", "length"))))))
584+
cxxMemberCallExpr(on(expr(AnyOfStringTy).bind("Foo")),
585+
has(memberExpr(member(hasAnyName("size", "length")))))
587586
.bind(WrongLengthExprName);
588587

589588
// - Example: char src[] = "foo"; sizeof(src);
@@ -641,8 +640,8 @@ void NotNullTerminatedResultCheck::registerMatchers(MatchFinder *Finder) {
641640

642641
// - Example: foo[bar[baz]].qux; (or just ParmVarDecl)
643642
auto DestUnknownDecl =
644-
declRefExpr(allOf(to(varDecl(AnyOfCharTy).bind(DestVarDeclName)),
645-
expr().bind(UnknownDestName)))
643+
declRefExpr(to(varDecl(AnyOfCharTy).bind(DestVarDeclName)),
644+
expr().bind(UnknownDestName))
646645
.bind(DestExprName);
647646

648647
auto AnyOfDestDecl = ignoringImpCasts(
@@ -659,10 +658,10 @@ void NotNullTerminatedResultCheck::registerMatchers(MatchFinder *Finder) {
659658
hasRHS(ignoringImpCasts(
660659
anyOf(characterLiteral(equals(0U)), integerLiteral(equals(0))))));
661660

662-
auto SrcDecl = declRefExpr(
663-
allOf(to(decl().bind(SrcVarDeclName)),
664-
anyOf(hasAncestor(cxxMemberCallExpr().bind(SrcExprName)),
665-
expr().bind(SrcExprName))));
661+
auto SrcDecl =
662+
declRefExpr(to(decl().bind(SrcVarDeclName)),
663+
anyOf(hasAncestor(cxxMemberCallExpr().bind(SrcExprName)),
664+
expr().bind(SrcExprName)));
666665

667666
auto AnyOfSrcDecl =
668667
ignoringImpCasts(anyOf(stringLiteral().bind(SrcExprName),

0 commit comments

Comments
 (0)