Skip to content

Commit 3bd152f

Browse files
authored
Merge branch 'main' into builtin-blend-to-shuffle-generic
2 parents 59b01f6 + 28d2208 commit 3bd152f

File tree

227 files changed

+8314
-1852
lines changed

Some content is hidden

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

227 files changed

+8314
-1852
lines changed

.ci/generate_test_report_lib.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ def generate_report(
184184
if return_code == 0:
185185
report.extend(
186186
[
187-
"The build succeeded and no tests ran. This is expected in some "
188-
"build configurations."
187+
":white_check_mark: The build succeeded and no tests ran. "
188+
"This is expected in some build configurations."
189189
]
190190
)
191191
else:
@@ -272,6 +272,10 @@ def plural(num_tests):
272272
]
273273
)
274274
report.extend(_format_failures(ninja_failures, failure_explanations))
275+
else:
276+
report.extend(
277+
["", ":white_check_mark: The build succeeded and all tests passed."]
278+
)
275279

276280
if failures or return_code != 0:
277281
report.extend(["", UNRELATED_FAILURES_STR])

.ci/generate_test_report_lib_test.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def test_title_only(self):
194194
"""\
195195
# Foo
196196
197-
The build succeeded and no tests ran. This is expected in some build configurations."""
197+
:white_check_mark: The build succeeded and no tests ran. This is expected in some build configurations."""
198198
),
199199
)
200200

@@ -308,7 +308,9 @@ def test_no_failures(self):
308308
"""\
309309
# Foo
310310
311-
* 1 test passed"""
311+
* 1 test passed
312+
313+
:white_check_mark: The build succeeded and all tests passed."""
312314
)
313315
),
314316
)

.github/workflows/test-unprivileged-download-artifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-24.04
3838
needs: [ upload-test-artifact ]
3939
steps:
40-
- name: Chekcout LLVM
40+
- name: Checkout LLVM
4141
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4242
with:
4343
sparse-checkout: |

clang-tools-extra/clangd/test/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ set(CLANGD_TEST_DEPS
55
split-file
66
)
77

8+
if (LLVM_INCLUDE_BENCHMARKS)
9+
list(APPEND CLANGD_TEST_DEPS IndexBenchmark)
10+
endif()
11+
812
if(CLANGD_BUILD_XPC)
913
list(APPEND CLANGD_TEST_DEPS clangd-xpc-test-client)
1014
list(APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests)

clang-tools-extra/clangd/test/include-cleaner-batch-fix.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
# RUN: cp -r %S/Inputs/include-cleaner %t/include
88
# RUN: echo '-I%t/include' > %t/compile_flags.txt
99
# Create a config file enabling include-cleaner features.
10-
# RUN: echo $'Diagnostics:\n UnusedIncludes: Strict\n MissingIncludes: Strict' >> %t/clangd/config.yaml
10+
# RUN: echo 'Diagnostics:' > %t/clangd/config.yaml
11+
# RUN: echo ' UnusedIncludes: Strict' >> %t/clangd/config.yaml
12+
# RUN: echo ' MissingIncludes: Strict' >> %t/clangd/config.yaml
1113

1214
# RUN: env XDG_CONFIG_HOME=%t clangd -lit-test -enable-config --compile-commands-dir=%t < %s | FileCheck -strict-whitespace %s
1315
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{"workspace":{"workspaceEdit":{"documentChanges":true, "changeAnnotationSupport":{"groupsOnLabel":true}}}},"trace":"off"}}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# Paths are not constructed correctly for the test to run on Windows.
2+
# UNSUPPORTED: system-windows
3+
# REQUIRES: have-benchmarks
14
# RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
2-
# FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command.
3-
# REQUIRES: shell
4-
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi
5+
# RUN: %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01
56
# Pass invalid JSON file and check that IndexBenchmark fails to parse it.
6-
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01 ; fi
7+
# RUN: not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01

clang-tools-extra/clangd/test/lit.cfg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import lit.llvm
2+
import lit.util
23

34
lit.llvm.initialize(lit_config, config)
45
lit.llvm.llvm_config.clang_setup()
@@ -37,6 +38,9 @@ def calculate_arch_features(arch_string):
3738
if config.have_zlib:
3839
config.available_features.add("zlib")
3940

41+
if lit.util.pythonize_bool(config.have_benchmarks):
42+
config.available_features.add("have-benchmarks")
43+
4044
# It is not realistically possible to account for all options that could
4145
# possibly be present in system and user configuration files, so disable
4246
# default configs for the test runs.

clang-tools-extra/clangd/test/lit.site.cfg.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ config.clangd_build_dexp = @CLANGD_BUILD_DEXP@
1919
config.clangd_enable_remote = @CLANGD_ENABLE_REMOTE@
2020
config.clangd_tidy_checks = @CLANGD_TIDY_CHECKS@
2121
config.have_zlib = @LLVM_ENABLE_ZLIB@
22+
config.have_benchmarks = "@LLVM_INCLUDE_BENCHMARKS@"
2223

2324
# Delegate logic to lit.cfg.py.
2425
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py")

clang-tools-extra/clangd/test/system-include-extractor.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
# Create a bin directory to store the mock-driver and add it to the path
77
# RUN: mkdir -p %t.dir/bin
8-
# RUN: export PATH=%t.dir/bin:$PATH
8+
# RUN: %python -c "print(__import__('os').environ['PATH'])" > %t.path
9+
# RUN: export PATH=%t.dir/bin:%{readfile:%t.path}
910
# Generate a mock-driver that will print %temp_dir%/my/dir and
1011
# %temp_dir%/my/dir2 as include search paths.
1112
# RUN: echo '#!/bin/sh' >> %t.dir/bin/my_driver.sh

clang/include/clang/AST/ASTContext.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,10 @@ class ASTContext : public RefCountedBase<ASTContext> {
488488

489489
/// Declaration for the CUDA cudaConfigureCall function.
490490
FunctionDecl *cudaConfigureCallDecl = nullptr;
491+
/// Declaration for the CUDA cudaGetParameterBuffer function.
492+
FunctionDecl *cudaGetParameterBufferDecl = nullptr;
493+
/// Declaration for the CUDA cudaLaunchDevice function.
494+
FunctionDecl *cudaLaunchDeviceDecl = nullptr;
491495

492496
/// Keeps track of all declaration attributes.
493497
///
@@ -1641,6 +1645,18 @@ class ASTContext : public RefCountedBase<ASTContext> {
16411645
return cudaConfigureCallDecl;
16421646
}
16431647

1648+
void setcudaGetParameterBufferDecl(FunctionDecl *FD) {
1649+
cudaGetParameterBufferDecl = FD;
1650+
}
1651+
1652+
FunctionDecl *getcudaGetParameterBufferDecl() {
1653+
return cudaGetParameterBufferDecl;
1654+
}
1655+
1656+
void setcudaLaunchDeviceDecl(FunctionDecl *FD) { cudaLaunchDeviceDecl = FD; }
1657+
1658+
FunctionDecl *getcudaLaunchDeviceDecl() { return cudaLaunchDeviceDecl; }
1659+
16441660
/// Returns true iff we need copy/dispose helpers for the given type.
16451661
bool BlockRequiresCopying(QualType Ty, const VarDecl *D);
16461662

0 commit comments

Comments
 (0)