Skip to content
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.

Sign up for GitHub

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

[Premerge] Add flang-rt #128678

Merged
merged 20 commits into from
Mar 13, 2025
Merged

[Premerge] Add flang-rt #128678

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9ebeeae
[Premerge] Add flang-rt
Meinersbur Feb 25, 2025
afada27
Don't change deps
Meinersbur Feb 28, 2025
8345c19
flang-rt has dependencies
Meinersbur Feb 28, 2025
da2a539
flang-rt is a runtime
Meinersbur Mar 3, 2025
93a7713
Merge branch 'flang_runtime_premerge' into users/meinersbur/flang_run…
Meinersbur Mar 3, 2025
a8a9323
Fix syntax error
Meinersbur Mar 4, 2025
a7b728c
flang_runtime_amdgpu-offload
Meinersbur Mar 4, 2025
b0d0879
Pass Flang as Fortran compiler
Meinersbur Mar 5, 2025
8c41ae6
Merge branch 'main' into users/meinersbur/flang_runtime_premerge
Meinersbur Mar 5, 2025
e8b028a
Minimal changes
Meinersbur Mar 5, 2025
67809ce
Add change in flang/ to trigger pre-merge check
Meinersbur Mar 5, 2025
d2144a0
Undo unrelated change
Meinersbur Mar 5, 2025
26bb93a
Set FLANG_ENABLE_FLANG_RT=OFF
Meinersbur Mar 5, 2025
6e7d7fd
Pass LLVM_BINARY_DIR required for testing
Meinersbur Mar 5, 2025
bed0c3f
Adjust all runtime build configurations
Meinersbur Mar 5, 2025
59ec1ee
Trigger build of Flang when flang-rt is changed
Meinersbur Mar 6, 2025
637f662
Test change in flang-rt to trigger flang compilation
Meinersbur Mar 6, 2025
881b6bf
Consider changes in flang-rt
Meinersbur Mar 6, 2025
3d95f2e
Exclude flang-rt from LLVM_ENABLE_PROJECTS
Meinersbur Mar 6, 2025
b2354ff
Do not add flang-rt to projects-to-test in the first place
Meinersbur Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .ci/compute-projects.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function compute-projects-to-test() {
clang-tools-extra)
echo libc
;;
mlir)
mlir|flang-rt)
# Flang is not stable in Windows CI at the moment
if [[ $isForWindows == 0 ]]; then
echo flang
Expand All @@ -65,6 +65,11 @@ function compute-runtimes-to-test() {
echo $p
done
;;
flang)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a patch touches flang-rt and flang, it seems like we might end up with some duplication given the cyclical dependency here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the case. compute-runtimes-to-test receives the aguments to "LLVM_ENABLE_PROJECTS" and prints the arguments to "LLVM_ENABLE_RUNTIMES". There is no function for the reverse direction.

If you one day rewrite the mechanism, consider giving different names to "top-level directory in the repository", "valid argument to LLVM_ENABLE_PROJECTS", and "valid argument to LLVM_ENABLE_RUNTIMES". They are currently all called "projects" in some form.

for p in flang-rt; do
echo $p
done
;;
*)
# Nothing to do
;;
Expand Down Expand Up @@ -116,6 +121,7 @@ function exclude-linux() {
case ${project} in
cross-project-tests) ;; # tests failing
openmp) ;; # https://github.com/google/llvm-premerge-checks/issues/410
flang-rt) ;; # added to runtimes build, not LLVM_ENABLE_PROJECTS
*)
echo "${project}"
;;
Expand Down
2 changes: 1 addition & 1 deletion .ci/generate-buildkite-pipeline-premerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fi
# needs while letting them run on the infrastructure provided by LLVM.

# Figure out which projects need to be built on each platform
all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang flang-rt libc libclc lld lldb llvm mlir openmp polly pstl"
modified_projects="$(keep-modified-projects ${all_projects})"

linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))
Expand Down
10 changes: 10 additions & 0 deletions .ci/monolithic-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
-D CMAKE_CXX_FLAGS=-gmlt \
-D LLVM_CCACHE_BUILD=ON \
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
-D FLANG_ENABLE_FLANG_RT=OFF \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"

echo "--- ninja"
Expand Down Expand Up @@ -95,6 +96,9 @@ if [[ "${runtimes}" != "" ]]; then
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
-D CMAKE_Fortran_COMPILER_WORKS=ON \
-D LLVM_BINARY_DIR="${BUILD_DIR}" \
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
-D LIBCXX_CXX_ABI=libcxxabi \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
Expand All @@ -113,6 +117,9 @@ if [[ "${runtimes}" != "" ]]; then
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
-D CMAKE_Fortran_COMPILER_WORKS=ON \
-D LLVM_BINARY_DIR="${BUILD_DIR}" \
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
-D LIBCXX_CXX_ABI=libcxxabi \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
Expand All @@ -131,6 +138,9 @@ if [[ "${runtimes}" != "" ]]; then
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
-D CMAKE_Fortran_COMPILER_WORKS=ON \
-D LLVM_BINARY_DIR="${BUILD_DIR}" \
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
-D LIBCXX_CXX_ABI=libcxxabi \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
Expand Down
2 changes: 1 addition & 1 deletion flang-rt/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ $ ninja install

## Configuration Option Reference

Flang-RT has the followign configuration options. This is in
Flang-RT has the following configuration options. This is in
addition to the build options the LLVM_ENABLE_RUNTIMES mechanism and
CMake itself provide.

Expand Down