Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e3c4d59

Browse files
hulxvhulxv
authored
Merge branch 'main' into refactor/header-only/dsub
2 parents 4714265 + 9f5e0ac commit e3c4d59

5,060 files changed

Lines changed: 1157290 additions & 122833 deletions

File tree

Some content is hidden

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

‎.ci/compute_projects.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"bolt": {"clang", "lld", "llvm"},
2424
"clang-tools-extra": {"clang", "llvm"},
2525
"compiler-rt": {"clang", "lld"},
26+
"cross-project-tests": {"clang", "lldb", "lld"},
2627
"libc": {"clang", "lld"},
2728
"openmp": {"clang", "lld"},
2829
"flang": {"llvm", "clang"},
@@ -48,6 +49,7 @@
4849
"mlir",
4950
"polly",
5051
"flang",
52+
"cross-project-tests",
5153
},
5254
"lld": {"bolt", "cross-project-tests"},
5355
"clang": {"clang-tools-extra", "cross-project-tests", "lldb"},
@@ -94,7 +96,6 @@
9496
}
9597

9698
EXCLUDE_LINUX = {
97-
"cross-project-tests", # TODO(issues/132796): Tests are failing.
9899
"openmp", # https://github.com/google/llvm-premerge-checks/issues/410
99100
}
100101

@@ -153,7 +154,7 @@
153154
"flang": "check-flang",
154155
"flang-rt": "check-flang-rt",
155156
"libc": "check-libc",
156-
"libclc": "check-libclc-amdgcn-amd-amdhsa-llvm",
157+
"libclc": "check-libclc",
157158
"lld": "check-lld",
158159
"lldb": "check-lldb",
159160
"mlir": "check-mlir",

‎.ci/compute_projects_test.py‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def test_llvm(self):
1515
)
1616
self.assertEqual(
1717
env_variables["projects_to_build"],
18-
"bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
18+
"bolt;clang;clang-tools-extra;cross-project-tests;flang;lld;lldb;llvm;mlir;polly",
1919
)
2020
self.assertEqual(
2121
env_variables["project_check_targets"],
22-
"check-bolt check-clang check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
22+
"check-bolt check-clang check-clang-tools check-cross-project check-flang check-lld check-lldb check-llvm check-mlir check-polly",
2323
)
2424
self.assertEqual(
2525
env_variables["runtimes_to_build"], "libcxx;libcxxabi;libunwind"
@@ -83,11 +83,11 @@ def test_clang(self):
8383
)
8484
self.assertEqual(
8585
env_variables["projects_to_build"],
86-
"clang;clang-tools-extra;lld;lldb;llvm",
86+
"clang;clang-tools-extra;cross-project-tests;lld;lldb;llvm",
8787
)
8888
self.assertEqual(
8989
env_variables["project_check_targets"],
90-
"check-clang check-clang-tools check-lldb",
90+
"check-clang check-clang-tools check-cross-project check-lldb",
9191
)
9292
self.assertEqual(
9393
env_variables["runtimes_to_build"], "compiler-rt;libcxx;libcxxabi;libunwind"
@@ -158,11 +158,11 @@ def test_cir(self):
158158
)
159159
self.assertEqual(
160160
env_variables["projects_to_build"],
161-
"clang;clang-tools-extra;lld;lldb;llvm;mlir",
161+
"clang;clang-tools-extra;cross-project-tests;lld;lldb;llvm;mlir",
162162
)
163163
self.assertEqual(
164164
env_variables["project_check_targets"],
165-
"check-clang check-clang-cir check-clang-tools check-lldb",
165+
"check-clang check-clang-cir check-clang-tools check-cross-project check-lldb",
166166
)
167167
self.assertEqual(
168168
env_variables["runtimes_to_build"], "compiler-rt;libcxx;libcxxabi;libunwind"
@@ -268,7 +268,7 @@ def test_include_libclc_in_runtimes(self):
268268
self.assertEqual(env_variables["runtimes_to_build"], "")
269269
self.assertEqual(
270270
env_variables["runtimes_check_targets"],
271-
"check-libclc-amdgcn-amd-amdhsa-llvm",
271+
"check-libclc",
272272
)
273273
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
274274

@@ -310,7 +310,7 @@ def test_ci(self):
310310
)
311311
self.assertEqual(
312312
env_variables["runtimes_check_targets"],
313-
"check-compiler-rt check-flang-rt check-libc check-libclc-amdgcn-amd-amdhsa-llvm",
313+
"check-compiler-rt check-flang-rt check-libc check-libclc",
314314
)
315315
self.assertEqual(
316316
env_variables["runtimes_check_targets_needs_reconfig"],
@@ -335,7 +335,7 @@ def test_windows_ci(self):
335335
)
336336
self.assertEqual(
337337
env_variables["runtimes_check_targets"],
338-
"check-compiler-rt check-libclc-amdgcn-amd-amdhsa-llvm",
338+
"check-compiler-rt check-libclc",
339339
)
340340
self.assertEqual(
341341
env_variables["runtimes_check_targets_needs_reconfig"],
@@ -384,7 +384,7 @@ def test_premerge_workflow(self):
384384
)
385385
self.assertEqual(
386386
env_variables["runtimes_check_targets"],
387-
"check-compiler-rt check-flang-rt check-libc check-libclc-amdgcn-amd-amdhsa-llvm",
387+
"check-compiler-rt check-flang-rt check-libc check-libclc",
388388
)
389389
self.assertEqual(
390390
env_variables["runtimes_check_targets_needs_reconfig"],
@@ -419,7 +419,7 @@ def test_third_party_benchmark(self):
419419
)
420420
self.assertEqual(
421421
env_variables["runtimes_check_targets"],
422-
"check-compiler-rt check-flang-rt check-libc check-libclc-amdgcn-amd-amdhsa-llvm",
422+
"check-compiler-rt check-flang-rt check-libc check-libclc",
423423
)
424424
self.assertEqual(
425425
env_variables["runtimes_check_targets_needs_reconfig"],
@@ -432,11 +432,11 @@ def test_lit(self):
432432
)
433433
self.assertEqual(
434434
env_variables["projects_to_build"],
435-
"bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
435+
"bolt;clang;clang-tools-extra;cross-project-tests;flang;lld;lldb;llvm;mlir;polly",
436436
)
437437
self.assertEqual(
438438
env_variables["project_check_targets"],
439-
"check-bolt check-clang check-clang-tools check-flang check-lit check-lld check-lldb check-llvm check-mlir check-polly",
439+
"check-bolt check-clang check-clang-tools check-cross-project check-flang check-lit check-lld check-lldb check-llvm check-mlir check-polly",
440440
)
441441
self.assertEqual(
442442
env_variables["runtimes_to_build"], "libcxx;libcxxabi;libunwind"
@@ -450,6 +450,19 @@ def test_lit(self):
450450
"check-cxx check-cxxabi check-unwind",
451451
)
452452

453+
def test_cross_project_tests(self):
454+
env_variables = compute_projects.get_env_variables(
455+
["cross-project-tests/CMakeLists.txt"], "Linux"
456+
)
457+
self.assertEqual(
458+
env_variables["projects_to_build"],
459+
"clang;cross-project-tests;lld;lldb;llvm",
460+
)
461+
self.assertEqual(env_variables["project_check_targets"], "check-cross-project")
462+
self.assertEqual(env_variables["runtimes_to_build"], "")
463+
self.assertEqual(env_variables["runtimes_check_targets"], "")
464+
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
465+
453466

454467
if __name__ == "__main__":
455468
unittest.main()

‎.ci/monolithic-linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enable_cir="${6}"
3232
lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-output-file-name --timeout=1200 --time-tests --succinct"
3333

3434
runtime_cmake_args=()
35-
if [[ " ${runtime_targets} " == *" check-libclc-amdgcn-amd-amdhsa-llvm "* ]]; then
35+
if [[ " ${runtime_targets} " == *" check-libclc "* ]]; then
3636
runtime_cmake_args+=(
3737
-D RUNTIMES_amdgcn-amd-amdhsa-llvm_LLVM_ENABLE_RUNTIMES=libclc
3838
-D LLVM_RUNTIME_TARGETS="default;amdgcn-amd-amdhsa-llvm"

‎.ci/monolithic-windows.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runtimes="${3}"
2121
runtimes_targets="${4}"
2222

2323
runtime_cmake_args=()
24-
if [[ " ${runtimes_targets} " == *" check-libclc-amdgcn-amd-amdhsa-llvm "* ]]; then
24+
if [[ " ${runtimes_targets} " == *" check-libclc "* ]]; then
2525
runtime_cmake_args+=(
2626
-D RUNTIMES_amdgcn-amd-amdhsa-llvm_LLVM_ENABLE_RUNTIMES=libclc
2727
-D LLVM_RUNTIME_TARGETS="default;amdgcn-amd-amdhsa-llvm"

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@
157157
# MLIR Index Dialect
158158
/mlir/**/Index* @mogball
159159

160+
# MLIR Shard Dialect
161+
/mlir/**/*shard* @fschlimb
162+
/mlir/**/*Shard* @fschlimb
163+
160164
# MLIR Python Bindings
161165
/mlir/test/python/ @ftynse @makslevental @stellaraccident @rolfmorel
162166
/mlir/python/ @ftynse @makslevental @stellaraccident @rolfmorel

‎.github/actions/build-container/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ runs:
7878
echo "container-full-name=$container_name" >> $GITHUB_OUTPUT
7979
8080
- name: Create container artifact
81-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
81+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8282
with:
8383
name: ${{ inputs.container-name }}-${{ runner.arch }}
8484
path: "*.tar"

‎.github/workflows/bazel-checks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.repository == 'llvm/llvm-project'
2323
steps:
2424
- name: Fetch LLVM sources
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
persist-credentials: false
2828
- name: Setup Buildifier
@@ -52,7 +52,7 @@ jobs:
5252
if: github.repository == 'llvm/llvm-project'
5353
steps:
5454
- name: Fetch LLVM sources
55-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
55+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5656
with:
5757
persist-credentials: false
5858
# TODO(boomanaiden154): We should use a purpose built container for this. Move

‎.github/workflows/build-ci-container-tooling.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
target: abi-tests
4242
steps:
4343
- name: Checkout LLVM
44-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4545
with:
4646
persist-credentials: false
4747
sparse-checkout: |
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-24.04
6969
steps:
7070
- name: Checkout LLVM
71-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
71+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7272
with:
7373
persist-credentials: false
7474
sparse-checkout: |

‎.github/workflows/build-ci-container-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
container-filename: ${{ steps.vars.outputs.container-filename }}
2626
steps:
2727
- name: Checkout LLVM
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
with:
3030
persist-credentials: false
3131
sparse-checkout: .github/workflows/containers/github-action-ci-windows
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
docker save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
4747
- name: Upload container image
48-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
48+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4949
with:
5050
name: container
5151
path: ${{ steps.vars.outputs.container-filename }}

‎.github/workflows/build-ci-container.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- cd $HOME && printf '#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }' | clang++ -x c++ - && ./a.out | grep Hello
3737
steps:
3838
- name: Checkout LLVM
39-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4040
with:
4141
persist-credentials: false
4242
sparse-checkout: |
@@ -63,7 +63,7 @@ jobs:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6464
steps:
6565
- name: Checkout LLVM
66-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
66+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6767
with:
6868
persist-credentials: false
6969
sparse-checkout: |

0 commit comments

Comments
 (0)