Skip to content

Commit 6092968

Browse files
krishna2803krishna2803
committed
merge: branch 'main' into users/krishna2803/nextfnbf16
2 parents 12f1923 + b170f17 commit 6092968

File tree

2,113 files changed

+52983
-21979
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,113 files changed

+52983
-21979
lines changed

‎.ci/compute_projects.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
"flang",
5050
},
5151
"lld": {"bolt", "cross-project-tests"},
52-
# TODO(issues/132795): LLDB should be enabled on clang changes.
53-
"clang": {"clang-tools-extra", "cross-project-tests"},
52+
"clang": {"clang-tools-extra", "cross-project-tests", "lldb"},
5453
"mlir": {"flang"},
5554
# Test everything if ci scripts are changed.
5655
".ci": {

‎.ci/compute_projects_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ def test_clang(self):
8383
)
8484
self.assertEqual(
8585
env_variables["projects_to_build"],
86-
"clang;clang-tools-extra;lld;llvm",
86+
"clang;clang-tools-extra;lld;lldb;llvm",
8787
)
8888
self.assertEqual(
8989
env_variables["project_check_targets"],
90-
"check-clang check-clang-tools",
90+
"check-clang check-clang-tools 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;llvm;mlir",
161+
"clang;clang-tools-extra;lld;lldb;llvm;mlir",
162162
)
163163
self.assertEqual(
164164
env_variables["project_check_targets"],
165-
"check-clang check-clang-cir check-clang-tools",
165+
"check-clang check-clang-cir check-clang-tools check-lldb",
166166
)
167167
self.assertEqual(
168168
env_variables["runtimes_to_build"], "compiler-rt;libcxx;libcxxabi;libunwind"

‎.ci/utils.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function at-exit {
2424
retcode=$?
2525

2626
mkdir -p artifacts
27+
sccache --show-stats
2728
sccache --show-stats >> artifacts/sccache_stats.txt
2829
cp "${BUILD_DIR}"/.ninja_log artifacts/.ninja_log
2930
cp "${MONOREPO_ROOT}"/*.log artifacts/ || :

‎.github/workflows/libclang-python-tests.yml‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ permissions:
44
contents: read
55

66
on:
7-
workflow_dispatch:
87
push:
98
branches:
109
- 'main'
@@ -13,29 +12,46 @@ on:
1312
- 'clang/tools/libclang/**'
1413
- 'clang/CMakeList.txt'
1514
- '.github/workflows/libclang-python-tests.yml'
16-
- '.github/workflows/llvm-project-tests.yml'
1715
pull_request:
1816
paths:
1917
- 'clang/bindings/python/**'
2018
- 'clang/tools/libclang/**'
2119
- 'clang/CMakeList.txt'
2220
- '.github/workflows/libclang-python-tests.yml'
23-
- '.github/workflows/llvm-project-tests.yml'
2421

2522
jobs:
2623
check-clang-python:
2724
# Build libclang and then run the libclang Python binding's unit tests.
25+
# There is an issue running on "windows-2019".
26+
# See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
2827
name: Build and run Python unit tests
2928
if: github.repository == 'llvm/llvm-project'
29+
runs-on: ubuntu-24.04
3030
strategy:
3131
fail-fast: false
3232
matrix:
3333
python-version: ["3.8", "3.13"]
34-
uses: ./.github/workflows/llvm-project-tests.yml
35-
with:
36-
build_target: check-clang-python
37-
projects: clang
38-
# There is an issue running on "windows-2019".
39-
# See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
40-
os_list: '["ubuntu-24.04"]'
41-
python_version: ${{ matrix.python-version }}
34+
steps:
35+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
36+
- name: Setup Python
37+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
38+
with:
39+
python-version: ${{ matrix.python-version }}
40+
- name: Setup ccache
41+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
42+
with:
43+
max-size: 2G
44+
key: spirv-ubuntu-24.04
45+
variant: sccache
46+
- name: Build and Test
47+
run: |
48+
mkdir build
49+
cmake -GNinja \
50+
-S llvm \
51+
-B build \
52+
-DCMAKE_BUILD_TYPE=Release \
53+
-DLLVM_ENABLE_ASSERTIONS=ON \
54+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
55+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
56+
-DLLVM_ENABLE_PROJECTS=clang
57+
ninja -C build check-clang-python

‎.github/workflows/llvm-project-tests.yml‎

Lines changed: 0 additions & 149 deletions
This file was deleted.

‎.github/workflows/llvm-project-workflow-tests.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.github/workflows/mlir-spirv-tests.yml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,28 @@ jobs:
2424
check_spirv:
2525
if: github.repository_owner == 'llvm'
2626
name: Test MLIR SPIR-V
27-
uses: ./.github/workflows/llvm-project-tests.yml
28-
with:
29-
build_target: check-mlir
30-
projects: mlir
31-
extra_cmake_args: '-DLLVM_TARGETS_TO_BUILD="host" -DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON'
32-
os_list: '["ubuntu-24.04"]'
27+
runs-on: ubuntu-24.04
28+
container:
29+
image: ghcr.io/llvm/ci-ubuntu-24.04:latest
30+
steps:
31+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32+
- name: Setup ccache
33+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
34+
with:
35+
max-size: 2G
36+
key: spirv-mlir-ubuntu-24.04
37+
variant: sccache
38+
- name: Build and Test
39+
run: |
40+
mkdir build
41+
cmake -GNinja \
42+
-S llvm \
43+
-B build \
44+
-DCMAKE_BUILD_TYPE=Release \
45+
-DLLVM_ENABLE_ASSERTIONS=ON \
46+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
47+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
48+
-DLLVM_TARGETS_TO_BUILD="host" \
49+
-DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON \
50+
-DLLVM_ENABLE_PROJECTS=mlir
51+
ninja -C build check-mlir

‎.github/workflows/pr-code-format.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ jobs:
7070
- name: Run code formatter
7171
env:
7272
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
73-
START_REV: ${{ github.event.pull_request.base.sha }}
74-
END_REV: ${{ github.event.pull_request.head.sha }}
7573
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
7674
# Create an empty comments file so the pr-write job doesn't fail.
7775
run: |

‎.github/workflows/premerge.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ jobs:
6969
7070
./.ci/monolithic-linux.sh "${projects_to_build}" "${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" "${runtimes_check_targets_needs_reconfig}" "${enable_cir}"
7171
- name: Upload Artifacts
72+
# In some cases, Github will fail to upload the artifact. We want to
73+
# continue anyways as a failed artifact upload is an infra failure, not
74+
# a checks failure.
75+
# https://github.com/actions/upload-artifact/issues/569
76+
continue-on-error: true
7277
if: '!cancelled()'
7378
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
7479
with:
@@ -114,6 +119,11 @@ jobs:
114119
# these environment variables.
115120
bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; sccache --start-server; .ci/monolithic-windows.sh \"${{ steps.vars.outputs.windows-projects }}\" \"${{ steps.vars.outputs.windows-check-targets }}\""
116121
- name: Upload Artifacts
122+
# In some cases, Github will fail to upload the artifact. We want to
123+
# continue anyways as a failed artifact upload is an infra failure, not
124+
# a checks failure.
125+
# https://github.com/actions/upload-artifact/issues/569
126+
continue-on-error: true
117127
if: '!cancelled()'
118128
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
119129
with:

0 commit comments

Comments
 (0)