Skip to content

Ci plugin #113290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed
22 changes: 20 additions & 2 deletions .ci/generate-buildkite-pipeline-premerge
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,11 @@ windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq)
if [[ "${linux_projects}" != "" ]]; then
cat <<EOF
- label: ':linux: Linux x64'
key: "test-linux"
artifact_paths:
- 'artifacts/**/*'
- '*_result.json'
- 'build/test-results.xml'
- 'build/test-results-linux*.xml'
agents: ${LINUX_AGENTS}
retry:
automatic:
Expand All @@ -286,16 +287,25 @@ if [[ "${linux_projects}" != "" ]]; then
CXX: 'clang++'
commands:
- './.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"'
- label: ':linux: Report Linux x64 Test Results'
plugins:
- junit-annotate#v2.5.0:
artifacts: build/test-results-linux*.xml
context: "linux-test-results"
depends_on: "test-linux"
allow_dependency_failure: true
agents: ${LINUX_AGENTS}
EOF
fi

if [[ "${windows_projects}" != "" ]]; then
cat <<EOF
- label: ':windows: Windows x64'
key: "test-windows"
artifact_paths:
- 'artifacts/**/*'
- '*_result.json'
- 'build/test-results.xml'
- 'build/test-results-windows*.xml'
agents: ${WINDOWS_AGENTS}
retry:
automatic:
Expand All @@ -311,5 +321,13 @@ if [[ "${windows_projects}" != "" ]]; then
commands:
- 'C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64'
- 'bash .ci/monolithic-windows.sh "$(echo ${windows_projects} | tr ' ' ';')" "$(echo ${windows_check_targets})"'
- label: ':windows: Report Windows x64 Test Results'
plugins:
- junit-annotate#v2.5.0:
artifacts: build\test-results-windows*.xml
context: "windows-test-results"
depends_on: "test-windows"
allow_dependency_failure: true
agents: ${LINUX_AGENTS}
EOF
fi
13 changes: 9 additions & 4 deletions .ci/monolithic-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ trap show-stats EXIT
projects="${1}"
targets="${2}"

lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results-linux.xml --use-unique-output-file-name --timeout=1200 --time-tests"

echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
pip install -q -r "${MONOREPO_ROOT}"/lldb/test/requirements.txt
Expand All @@ -47,7 +49,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
-D LLVM_ENABLE_ASSERTIONS=ON \
-D LLVM_BUILD_EXAMPLES=ON \
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
-D LLVM_LIT_ARGS="${lit_args}" \
-D LLVM_ENABLE_LLD=ON \
-D CMAKE_CXX_FLAGS=-gmlt \
-D LLVM_CCACHE_BUILD=ON \
Expand Down Expand Up @@ -87,7 +89,8 @@ if [[ "${runtimes}" != "" ]]; then
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-D LIBCXX_TEST_PARAMS="std=c++03" \
-D LIBCXXABI_TEST_PARAMS="std=c++03"
-D LIBCXXABI_TEST_PARAMS="std=c++03" \
-D LLVM_LIT_ARGS="${lit_args}"

echo "--- ninja runtimes C++03"

Expand All @@ -104,7 +107,8 @@ if [[ "${runtimes}" != "" ]]; then
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-D LIBCXX_TEST_PARAMS="std=c++26" \
-D LIBCXXABI_TEST_PARAMS="std=c++26"
-D LIBCXXABI_TEST_PARAMS="std=c++26" \
-D LLVM_LIT_ARGS="${lit_args}"

echo "--- ninja runtimes C++26"

Expand All @@ -121,7 +125,8 @@ if [[ "${runtimes}" != "" ]]; then
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang"
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
-D LLVM_LIT_ARGS="${lit_args}"

echo "--- ninja runtimes clang modules"

Expand Down
2 changes: 1 addition & 1 deletion .ci/monolithic-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
-D LLVM_ENABLE_ASSERTIONS=ON \
-D LLVM_BUILD_EXAMPLES=ON \
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
-D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results-windows.xml --use-unique-output-file-name --timeout=1200 --time-tests" \
-D COMPILER_RT_BUILD_ORC=OFF \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
Expand Down
2 changes: 2 additions & 0 deletions clang/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ If you're interested in more (including how to build Clang) it is best to read t
* If you find a bug in Clang, please file it in the LLVM bug tracker:

https://github.com/llvm/llvm-project/issues

Test line.
2 changes: 1 addition & 1 deletion clang/test/Sema/asm.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void f(void) {
asm ("foo\n" : "=a" (i) : "[symbolic_name]" (i)); // expected-error {{invalid input constraint '[symbolic_name]' in asm}}

asm ("foo\n" : : "" (i)); // expected-error {{invalid input constraint '' in asm}}
asm ("foo\n" : "=a" (i) : "" (i)); // expected-error {{invalid input constraint '' in asm}}
asm ("foo\n" : "=a" (i) : "" (i)); // expected-error {{this will fail}}
}

void clobbers(void) {
Expand Down
2 changes: 2 additions & 0 deletions llvm/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ documentation setup.

If you are writing a package for LLVM, see docs/Packaging.rst for our
suggestions.

Test line.
1 change: 1 addition & 0 deletions llvm/test/MC/AArch64/label-arithmetic-diags-elf.s
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ end_across_sec:
// CHECK: :[[@LINE-1]]:{{[0-9]+}}: error: Cannot represent a difference across sections
// CHECK-NEXT: cmp w0, #(sec_y - sec_x)
// CHECK-NEXT: ^
// CHECK-NEXT: this will fail