[mlir] [llvm] [CI] Add check-mlir-python to MLIR pre-merge checks (PR #72847)
Benjamin Maxwell via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 22 05:22:40 PST 2023
https://github.com/MacDue updated https://github.com/llvm/llvm-project/pull/72847
>From 07a4c25b2f7617f55871fd8ba6a45d5578768db4 Mon Sep 17 00:00:00 2001
From: Benjamin Maxwell <benjamin.maxwell at arm.com>
Date: Mon, 20 Nov 2023 10:25:25 +0000
Subject: [PATCH 1/5] [CI] Add check-mlir-python to MLIR pre-merge checks
---
.ci/generate-buildkite-pipeline-premerge | 5 +++++
.ci/monolithic-linux.sh | 4 +++-
.ci/monolithic-windows.sh | 4 +++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index 9c6f5aefd6de005..2a49b6965fe7bd9 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -188,6 +188,11 @@ function check-targets() {
libclc)
echo "check-all"
;;
+ mlir)
+ for t in check-mlir check-mlir-python; do
+ echo $t
+ done
+ ;;
*)
echo "check-${project}"
;;
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 311488b2c2878b1..5e8e8b03a7ea906 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -49,7 +49,9 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
-D LLVM_ENABLE_LLD=ON \
-D CMAKE_CXX_FLAGS=-gmlt \
-D BOLT_CLANG_EXE=/usr/bin/clang \
- -D LLVM_CCACHE_BUILD=ON
+ -D LLVM_CCACHE_BUILD=ON \
+ -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
+ -D Python3_EXECUTABLE="$(which python3)"
echo "--- ninja"
# Targets are not escaped as they are passed as separate arguments.
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 00c3037c4c4fd61..2e37bd326173efe 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -48,7 +48,9 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
-D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml" \
-D COMPILER_RT_BUILD_ORC=OFF \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
- -D CMAKE_CXX_COMPILER_LAUNCHER=sccache
+ -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
+ -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
+ -D Python3_EXECUTABLE="$(which python)"
echo "--- ninja"
# Targets are not escaped as they are passed as separate arguments.
>From 64bc76f0bdf5ca3da10adf83e3e7cf8d298930f5 Mon Sep 17 00:00:00 2001
From: Benjamin Maxwell <benjamin.maxwell at arm.com>
Date: Mon, 20 Nov 2023 10:29:53 +0000
Subject: [PATCH 2/5] Test
---
mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td | 1 +
1 file changed, 1 insertion(+)
diff --git a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
index ba33a2826e6ca4b..37b99f0738adc43 100644
--- a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
+++ b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
@@ -11,6 +11,7 @@
//
//===----------------------------------------------------------------------===//
+// Test
#ifndef ARMSME_OPS
#define ARMSME_OPS
>From 9abffc234f9c7d9911d4969814ffc14baac9f9ea Mon Sep 17 00:00:00 2001
From: Benjamin Maxwell <benjamin.maxwell at arm.com>
Date: Mon, 20 Nov 2023 16:44:37 +0000
Subject: [PATCH 3/5] Revert "Test"
This reverts commit 64bc76f0bdf5ca3da10adf83e3e7cf8d298930f5.
---
mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td | 1 -
1 file changed, 1 deletion(-)
diff --git a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
index 37b99f0738adc43..ba33a2826e6ca4b 100644
--- a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
+++ b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
@@ -11,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
-// Test
#ifndef ARMSME_OPS
#define ARMSME_OPS
>From 22dea0dc7db8f443d9a48eefb01419751e7fb13c Mon Sep 17 00:00:00 2001
From: Benjamin Maxwell <benjamin.maxwell at arm.com>
Date: Wed, 22 Nov 2023 13:18:45 +0000
Subject: [PATCH 4/5] Simplify CI setup
---
.ci/generate-buildkite-pipeline-premerge | 5 -----
.ci/monolithic-linux.sh | 3 +--
.ci/monolithic-windows.sh | 3 +--
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index 2a49b6965fe7bd9..9c6f5aefd6de005 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -188,11 +188,6 @@ function check-targets() {
libclc)
echo "check-all"
;;
- mlir)
- for t in check-mlir check-mlir-python; do
- echo $t
- done
- ;;
*)
echo "check-${project}"
;;
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 5e8e8b03a7ea906..f0577d1069d5dec 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -50,8 +50,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
-D CMAKE_CXX_FLAGS=-gmlt \
-D BOLT_CLANG_EXE=/usr/bin/clang \
-D LLVM_CCACHE_BUILD=ON \
- -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
- -D Python3_EXECUTABLE="$(which python3)"
+ -D MLIR_ENABLE_BINDINGS_PYTHON=ON
echo "--- ninja"
# Targets are not escaped as they are passed as separate arguments.
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 2e37bd326173efe..7ac806a0b399ad5 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -49,8 +49,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
-D COMPILER_RT_BUILD_ORC=OFF \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
- -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
- -D Python3_EXECUTABLE="$(which python)"
+ -D MLIR_ENABLE_BINDINGS_PYTHON=ON
echo "--- ninja"
# Targets are not escaped as they are passed as separate arguments.
>From 68a4b12b6b9e7d9602323f74b90445df9612bc11 Mon Sep 17 00:00:00 2001
From: Benjamin Maxwell <benjamin.maxwell at arm.com>
Date: Mon, 20 Nov 2023 10:29:53 +0000
Subject: [PATCH 5/5] Test
---
mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td | 1 +
1 file changed, 1 insertion(+)
diff --git a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
index ba33a2826e6ca4b..37b99f0738adc43 100644
--- a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
+++ b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
@@ -11,6 +11,7 @@
//
//===----------------------------------------------------------------------===//
+// Test
#ifndef ARMSME_OPS
#define ARMSME_OPS
More information about the llvm-commits
mailing list