Skip to content

Commit 62f8e61

Browse files
authored
Merge branch 'main' into log_lowering_nocontract
2 parents 91d5897 + a059afa commit 62f8e61

File tree

3,994 files changed

+218627
-304156
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,994 files changed

+218627
-304156
lines changed

.ci/premerge_advisor_explain.py

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ def main(
7979
pr_number: The number of the PR associated with this run.
8080
return_code: The numerical return code of ninja/CMake.
8181
"""
82-
if return_code == 0:
83-
with open("comment", "w") as comment_file_handle:
84-
comment = get_comment(
85-
github_token,
86-
pr_number,
87-
":white_check_mark: With the latest revision this PR passed "
88-
"the premerge checks.",
89-
)
90-
if "id" in comment:
91-
json.dump([comment], comment_file_handle)
9282
junit_objects, ninja_logs = generate_test_report_lib.load_info_from_files(
9383
build_log_files
9484
)
@@ -105,34 +95,42 @@ def main(
10595
explanation_request["failures"].append(
10696
{"name": name, "message": failure_messsage}
10797
)
108-
else:
98+
elif return_code != 0:
10999
ninja_failures = generate_test_report_lib.find_failure_in_ninja_logs(ninja_logs)
110100
for name, failure_message in ninja_failures:
111101
explanation_request["failures"].append(
112102
{"name": name, "message": failure_message}
113103
)
114-
advisor_response = requests.get(
115-
PREMERGE_ADVISOR_URL, json=explanation_request, timeout=5
104+
comments = []
105+
advisor_explanations = []
106+
if return_code != 0:
107+
advisor_response = requests.get(
108+
PREMERGE_ADVISOR_URL, json=explanation_request, timeout=5
109+
)
110+
if advisor_response.status_code == 200:
111+
print(advisor_response.json())
112+
advisor_explanations = advisor_response.json()
113+
else:
114+
print(advisor_response.reason)
115+
comments.append(
116+
get_comment(
117+
github_token,
118+
pr_number,
119+
generate_test_report_lib.generate_report(
120+
generate_test_report_lib.compute_platform_title(),
121+
return_code,
122+
junit_objects,
123+
ninja_logs,
124+
failure_explanations_list=advisor_explanations,
125+
),
126+
)
116127
)
117-
if advisor_response.status_code == 200:
118-
print(advisor_response.json())
119-
comments = [
120-
get_comment(
121-
github_token,
122-
pr_number,
123-
generate_test_report_lib.generate_report(
124-
generate_test_report_lib.compute_platform_title(),
125-
return_code,
126-
junit_objects,
127-
ninja_logs,
128-
failure_explanations_list=advisor_response.json(),
129-
),
130-
)
131-
]
132-
with open("comments", "w") as comment_file_handle:
133-
json.dump(comments, comment_file_handle)
134-
else:
135-
print(advisor_response.reason)
128+
if return_code == 0 and "id" not in comments[0]:
129+
# If the job succeeds and there is not an existing comment, we
130+
# should not write one to reduce noise.
131+
comments = []
132+
with open("comments", "w") as comment_file_handle:
133+
json.dump(comments, comment_file_handle)
136134

137135

138136
if __name__ == "__main__":

.git-blame-ignore-revs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,12 @@ a3a007ad5fa20abc90ead4e1030b481bf109b4cf
143143
b7e332d3f59f567b1999fbcc660d7837cba8e406
144144
6056f942abe83b05406df8b04e95ec37a3d160b5
145145
906295b8a31c8dac5aa845864c0bca9f02f86184
146+
147+
# [clang-tidy][NFC] Remove trailing whitespaces in documentation
148+
8f2b167de4a1268160c06512d08863a9e8f43290
149+
150+
# [clang-tidy][NFC] Enforce 80 characters limit in docs
151+
5edf70c41c5d69f3751b4199f642f4585599dade
152+
c73870dbe89a8219130e21a0b3f13df76d299352
153+
74c40293c309dbd142bf1f0ebfbfde6be8d30655
154+
a7ba8dcad76476478100c228a31d9c48391b1e03

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
clang/bindings/python/.git_archival.txt export-subst
2+
13
libcxx/src/**/*.cpp merge=libcxx-reformat
24
libcxx/include/**/*.h merge=libcxx-reformat
35

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,19 @@
6060
/mlir/lib/Conversion/*ToROCDL @krzysz00 @kuhar
6161
/mlir/include/mlir/Dialect/LLVMIR/ROCDL* @krzysz00 @kuhar
6262

63+
# Arith dialect in MLIR.
64+
/mlir/include/mlir/Dialect/Arith @kuhar
65+
/mlir/lib/Dialect/Arith @kuhar
66+
/mlir/lib/Conversion/ArithTo* @kuhar
67+
6368
# XeGPU and XeVM dialects in MLIR.
6469
/mlir/include/mlir/Dialect/XeGPU @charithaintc @Jianhui-Li
6570
/mlir/lib/Dialect/XeGPU @charithaintc @Jianhui-Li
6671
/mlir/lib/Conversion/*XeGPU* @charithaintc @Jianhui-Li
6772
/mlir/include/mlir/Dialect/XeGPU/Transforms @charithaintc @Jianhui-Li
6873
/mlir/lib/Dialect/XeGPU/Transforms @charithaintc @Jianhui-Li
74+
/mlir/include/mlir/Dialect/XeGPU/TransformOps @charithaintc @Jianhui-Li @tkarna
75+
/mlir/lib/Dialect/XeGPU/TransformOps @charithaintc @Jianhui-Li @tkarna
6976
/mlir/include/mlir/Dialect/LLVMIR/XeVM* @silee2
7077
/mlir/lib/Dialect/LLVMIR/IR/XeVM @silee2
7178
/mlir/lib/Conversion/*XeVM* @silee2

.github/workflows/bazel-checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
if: github.repository == 'llvm/llvm-project'
2323
steps:
2424
- name: Fetch LLVM sources
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2626
- name: Setup Buildifier
2727
run: |
28-
sudo curl -L https://github.com/bazelbuild/buildtools/releases/download/v8.2.1/buildifier-linux-amd64 -o /usr/bin/buildifier
28+
sudo curl -L https://github.com/bazelbuild/buildtools/releases/download/v8.2.1/buildifier-linux-amd64 -o /usr/bin/buildifier --fail
2929
sudo chmod +x /usr/bin/buildifier
3030
- name: Run Buildifier
3131
run: |
@@ -41,15 +41,15 @@ jobs:
4141
if: github.repository == 'llvm/llvm-project'
4242
steps:
4343
- name: Fetch LLVM sources
44-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
44+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4545
# TODO(boomanaiden154): We should use a purpose built container for this. Move
4646
# over when we have fixed the issues with using custom containers with Github
4747
# ARC in GKE.
4848
- name: Setup System Dependencies
4949
run: |
5050
sudo apt-get update
5151
sudo apt-get install -y libmpfr-dev libpfm4-dev m4 libedit-dev
52-
sudo curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-amd64.deb > /tmp/bazelisk.deb
52+
sudo curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-amd64.deb --fail > /tmp/bazelisk.deb
5353
sudo apt-get install -y /tmp/bazelisk.deb
5454
rm /tmp/bazelisk.deb
5555
- name: Build/Test

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
44+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4545
with:
4646
sparse-checkout: |
4747
.github/workflows/containers/github-action-ci-tooling/
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-24.04
6868
steps:
6969
- name: Checkout LLVM
70-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
70+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7171
with:
7272
sparse-checkout: |
7373
.github/actions/push-container

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

Lines changed: 1 addition & 1 deletion
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2929
with:
3030
sparse-checkout: .github/workflows/containers/github-action-ci-windows
3131
- name: Write Variables

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4040
with:
4141
sparse-checkout: |
4242
.github/workflows/containers/github-action-ci/
@@ -62,7 +62,7 @@ jobs:
6262
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6363
steps:
6464
- name: Checkout LLVM
65-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
6666
with:
6767
sparse-checkout: |
6868
.github/actions/push-container

.github/workflows/build-metrics-container.yml

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,19 @@ jobs:
2121
build-metrics-container:
2222
if: github.repository_owner == 'llvm'
2323
runs-on: ubuntu-24.04
24-
outputs:
25-
container-name: ${{ steps.vars.outputs.container-name }}
26-
container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
27-
container-filename: ${{ steps.vars.outputs.container-filename }}
2824
steps:
2925
- name: Checkout LLVM
30-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3127
with:
32-
sparse-checkout: .ci/metrics/
33-
- name: Write Variables
34-
id: vars
35-
run: |
36-
tag=`date +%s`
37-
container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/metrics"
38-
echo "container-name=$container_name" >> $GITHUB_OUTPUT
39-
echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
40-
echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
28+
sparse-checkout: |
29+
.ci/metrics/
30+
.github/actions/build-container
4131
- name: Build Container
42-
working-directory: ./.ci/metrics
43-
run: |
44-
podman build -t ${{ steps.vars.outputs.container-name-tag }} -f Dockerfile .
45-
# Save the container so we have it in case the push fails. This also
46-
# allows us to separate the push step into a different job so we can
47-
# maintain minimal permissions while building the container.
48-
- name: Save Container Image
49-
run: |
50-
podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
51-
- name: Upload Container Image
52-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
32+
uses: ./.github/actions/build-container
5333
with:
54-
name: container
55-
path: ${{ steps.vars.outputs.container-filename }}
56-
retention-days: 14
34+
container-name: metrics
35+
context: .ci/metrics
36+
dockerfile: .ci/metrics/Dockerfile
5737

5838
push-metrics-container:
5939
if: github.event_name == 'push'
@@ -65,14 +45,12 @@ jobs:
6545
env:
6646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6747
steps:
68-
- name: Download Container
69-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
48+
- name: Checkout LLVM
49+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
50+
with:
51+
sparse-checkout: |
52+
.github/actions/push-container
53+
54+
- uses: ./.github/actions/push-container
7055
with:
71-
name: container
72-
- name: Push Container
73-
run: |
74-
podman load -i ${{ needs.build-metrics-container.outputs.container-filename }}
75-
podman tag ${{ needs.build-metrics-container.outputs.container-name-tag }} ${{ needs.build-metrics-container.outputs.container-name }}:latest
76-
podman login -u ${{ github.actor }} -p $GITHUB_TOKEN ghcr.io
77-
podman push ${{ needs.build-metrics-container.outputs.container-name-tag }}
78-
podman push ${{ needs.build-metrics-container.outputs.container-name }}:latest
56+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-ci.yml

Lines changed: 1 addition & 1 deletion
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2626
with:
2727
sparse-checkout: .ci
2828
- name: Setup Python

0 commit comments

Comments
 (0)