Cleanup

Meinersbur · Meinersbur · commit 949c03015e92 · 2024-12-05T23:19:54.000+01:00
diff --git a/flang-rt/cmake/modules/AddFlangRT.cmake b/flang-rt/cmake/modules/AddFlangRT.cmake
@@ -1,4 +1,4 @@
-#===-- cmake/modules/AddFlangRT.cmake -------------------------------===#
+#===-- cmake/modules/AddFlangRT.cmake --------------------------------------===#
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
@@ -58,11 +58,11 @@ function (add_flangrt_library name)
   add_library(${name} ${extra_args} ${ARG_ADDITIONAL_HEADERS} ${ARG_UNPARSED_ARGUMENTS})
 
   if (ARG_INSTALL_WITH_TOOLCHAIN)
-    set_target_properties(${name} PROPERTIES FOLDER "Fortran Runtime/Toolchain Libraries")
+    set_target_properties(${name} PROPERTIES FOLDER "Flang-RT/Toolchain Libraries")
   elseif (ARG_OBJECT)
-    set_target_properties(${name} PROPERTIES FOLDER "Fortran Runtime/Object Libraries")
+    set_target_properties(${name} PROPERTIES FOLDER "Flang-RT/Object Libraries")
   else ()
-    set_target_properties(${name} PROPERTIES FOLDER "Fortran Runtime/Libraries")
+    set_target_properties(${name} PROPERTIES FOLDER "Flang-RT/Libraries")
   endif ()
 
   # Minimum required C++ version for Flang-RT, even if CMAKE_CXX_STANDARD is defined to something else.
diff --git a/flang-rt/cmake/modules/AddFlangRTOffload.cmake b/flang-rt/cmake/modules/AddFlangRTOffload.cmake
@@ -1,4 +1,4 @@
-#===-- cmake/modules/AddFortranOffloadRuntime.txt --------------------------===#
+#===-- cmake/modules/AddFortranRTOffload.txt -------------------------------===#
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang-rt/lib/CMakeLists.txt b/flang-rt/lib/CMakeLists.txt
@@ -8,6 +8,7 @@
 
 add_subdirectory(FortranFloat128Math)
 add_subdirectory(flang_rt)
+
 if (FLANG_RT_ENABLE_CUF)
   add_subdirectory(CufRuntime)
 endif()
diff --git a/flang-rt/lib/CufRuntime/CMakeLists.txt b/flang-rt/lib/CufRuntime/CMakeLists.txt
@@ -12,11 +12,10 @@
 set(CUFRT_LIBNAME CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR})
 
 add_flangrt_library(${CUFRT_LIBNAME}
-  allocator.cpp
   allocatable.cpp
+  allocator.cpp
   descriptor.cpp
   kernel.cpp
-  memmove-function.cpp
   memory.cpp
   registration.cpp
 )
diff --git a/flang-rt/lib/CufRuntime/allocatable.cpp b/flang-rt/lib/CufRuntime/allocatable.cpp
@@ -8,7 +8,7 @@
 
 #include "flang/Runtime/CUDA/allocatable.h"
 #include "flang-rt/descriptor.h"
-#include "../assign-impl.h"
+#include "../flang_rt/assign-impl.h"
 #include "../flang_rt/stat.h"
 #include "../flang_rt/terminator.h"
 #include "flang/Runtime/CUDA/common.h"
diff --git a/flang-rt/lib/CufRuntime/memory.cpp b/flang-rt/lib/CufRuntime/memory.cpp
@@ -7,9 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/memory.h"
+#include "../flang_rt/assign-impl.h"
 #include "../flang_rt/terminator.h"
-#include "../assign-impl.h"
-#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/CUDA/memmove-function.h"
diff --git a/flang-rt/lib/FortranFloat128Math/CMakeLists.txt b/flang-rt/lib/FortranFloat128Math/CMakeLists.txt
@@ -118,7 +118,7 @@ elseif (HAVE_LDBL_MANT_DIG_113)
       )
     target_sources(FortranFloat128MathILib INTERFACE ${sources})
   else()
-    message(FATAL_ERROR "flang-rt cannot build without libm")
+    message(FATAL_ERROR "Flang-RT cannot build without libm")
   endif()
 else()
   # We can use '__float128' version from libc, if it has them.
diff --git a/flang-rt/lib/flang_rt/CMakeLists.txt b/flang-rt/lib/flang_rt/CMakeLists.txt
@@ -84,13 +84,13 @@ set(host_sources
 )
 
 file(GLOB_RECURSE public_headers
-  "${FLANG_RT_SOURCE_DIR}/include/flang/Runtime/*.h"
-  "${FLANG_RT_SOURCE_DIR}/include/flang/Common/*.h"
+  "${FLANG_RT_SOURCE_DIR}/include/flang_rt/*.h"
+  "${FLANG_SOURCE_DIR}/include/flang/Common/*.h"
   )
 
 file(GLOB_RECURSE private_headers
-  "${FLANG_RT_SOURCE_DIR}/lib/Runtime/*.h"
-  "${FLANG_RT_SOURCE_DIR}/lib/Common/*.h"
+  "${FLANG_RT_SOURCE_DIR}/lib/flang_rt/*.h"
+  "${FLANG_SOURCE_DIR}/lib/Common/*.h"
   )
 
 
@@ -139,7 +139,7 @@ if (NOT WIN32)
 else()
   # Target for building all versions of the runtime
   add_custom_target(flang_rt)
-  set_target_properties(flang_rt PROPERTIES FOLDER "Fortran Runtime/Meta")
+  set_target_properties(flang_rt PROPERTIES FOLDER "Flang-RT/Meta")
 
   function (add_win_flangrt_library libtype suffix msvc_lib)
     set(name "flang_rt.${suffix}")
@@ -173,14 +173,14 @@ else()
   # roadblocks:
   #
   #  * Flang emits /DEFAULTLIB:flang_rt.dynamic.lib into
-  #    iso_fortran_env_impl.f90.obj. Since that file is itself part of
+  #    iso_fortran_env_impl.f90.obj. Because that file is itself part of
   #    flang_rt.dynamic, this results in a recursive dependency when invoking
   #    the linker.
   #
   #  * The externally-visible functions must either be annotated with
-  #    __declspec(dllexport), or listed in a exports file. A possible workaround
+  #    __declspec(dllexport), or listed in an exports file. A possible workaround
   #    is CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS which would also export the internal
-  #    C++ symbols and still requires global data symbols by be annotated
+  #    C++ symbols and still requires global data symbols to be annotated
   #    manually.
   #
   #add_win_flangrt_library(SHARED dynamic     MultiThreadedDLL)
diff --git a/flang-rt/lib/flang_rt/io-api-minimal.cpp b/flang-rt/lib/flang_rt/io-api-minimal.cpp
@@ -150,7 +150,7 @@ bool IODEF(OutputLogical)(Cookie cookie, bool truth) {
 // Provide own definition for `std::__libcpp_verbose_abort` to avoid dependency
 // on the version provided by libc++.
 
-void std::__libcpp_verbose_abort(char const *format, ...) {
+void std::__libcpp_verbose_abort(char const *format, ...) noexcept {
   va_list list;
   va_start(list, format);
   std::vfprintf(stderr, format, list);
diff --git a/flang-rt/test/CMakeLists.txt b/flang-rt/test/CMakeLists.txt
@@ -39,22 +39,20 @@ if (TARGET FlangRTUnitTests)
   )
 endif ()
 
-set(FLANG_RT_TEST_DEPENDS
+
+add_custom_target(flang-rt-test-depends)
+set_target_properties(flang-rt-test-depends PROPERTIES FOLDER "Flang-RT/Meta")
+add_dependencies(flang-rt-test-depends
     FlangRTUnitTests
     flang_rt.unittest
     flang_rt.static
   )
 
-add_custom_target(flang-rt-test-depends)
-set_target_properties(flang-rt-test-depends PROPERTIES FOLDER "Fortran Runtime/Meta")
-add_dependencies(flang-rt-test-depends ${FLANG_RT_TEST_DEPENDS})
-
-add_lit_testsuite(check-flang-rt "Running the flang-rt regression tests"
+add_lit_testsuite(check-flang-rt "Running the Flang-RT regression tests"
     ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS flang-rt-test-depends
   )
-set_target_properties(check-flang-rt PROPERTIES FOLDER "Fortran Runtime/Meta")
-
+set_target_properties(check-flang-rt PROPERTIES FOLDER "Flang-RT/Meta")
 
 add_lit_testsuites(flang-rt ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS flang-rt-test-depends
diff --git a/flang-rt/test/Driver/exec.f90 b/flang-rt/test/Driver/exec.f90
@@ -2,7 +2,6 @@
 
 ! RUN: %flang -L"%libdir" %s %deplibs -o %t
 ! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t | FileCheck %s
-! RUN: rm -f %t
 
 ! CHECK: Hello, World!
 program hello
diff --git a/flang-rt/unittests/CMakeLists.txt b/flang-rt/unittests/CMakeLists.txt
@@ -16,8 +16,8 @@ if (NOT TARGET llvm_gtest)
   build_gtest()
 endif ()
 
-# LLVM's modified GTest depends on LLVM, but not all runtime projects using
-# GTest also add the include search path.
+# LLVM's modified GTest depends on LLVM, but not all sibling runtime projects
+# creating a llvm_gtest target also use target_include_directories.
 target_include_directories(llvm_gtest PUBLIC "${LLVM_INCLUDE_DIR}" "${LLVM_MAIN_INCLUDE_DIR}")
 
 # Required because LLVMSupport is compiled with this option (by default).
@@ -30,7 +30,7 @@ endif()
 
 # Target that depends on all unittests
 add_custom_target(FlangRTUnitTests)
-set_target_properties(FlangRTUnitTests PROPERTIES FOLDER "Fortran Runtime/Meta")
+set_target_properties(FlangRTUnitTests PROPERTIES FOLDER "Flang-RT/Meta")
 
 
 function(add_flangrt_unittest_offload_properties target)
@@ -84,7 +84,7 @@ function(add_flangrt_nongtest_unittest test_name)
   endif()
 
   add_executable(${test_name}${suffix} ${ARG_UNPARSED_ARGUMENTS})
-  set_target_properties(${test_name}${suffix} PROPERTIES FOLDER "Fortran Runtime/Tests/Unit")
+  set_target_properties(${test_name}${suffix} PROPERTIES FOLDER "Flang-RT/Tests/Unit")
 
   target_include_directories(${test_name}${suffix} PRIVATE "${FLANG_RT_SOURCE_DIR}/include")
   target_include_directories(${test_name}${suffix} PRIVATE "${FLANG_SOURCE_DIR}/include")
diff --git a/flang-rt/unittests/Evaluate/CMakeLists.txt b/flang-rt/unittests/Evaluate/CMakeLists.txt
@@ -8,12 +8,14 @@
 
 add_flangrt_nongtest_unittest(reshape
   reshape.cpp
-LINK_LIBS
-  flang_rt.unittest
+
+  LINK_LIBS
+    flang_rt.unittest
 )
 
 add_flangrt_nongtest_unittest(ISO-Fortran-binding
   ISO-Fortran-binding.cpp
-LINK_LIBS
-  flang_rt.unittest
+
+  LINK_LIBS
+    flang_rt.unittest
 )
diff --git a/flang-rt/unittests/Runtime/CMakeLists.txt b/flang-rt/unittests/Runtime/CMakeLists.txt
@@ -38,10 +38,9 @@ add_flangrt_unittest(RuntimeTests
   TemporaryStack.cpp
   Transformational.cpp
 
-LINK_LIBS
-  flang_rt.unittest
+  LINK_LIBS
+    flang_rt.unittest
 )
-message("${LLVM_TOOLS_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}")
 target_compile_definitions(RuntimeTests PRIVATE NOT_EXE="${LLVM_TOOLS_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}")
 
 if (FLANG_RT_ENABLE_CUF)
diff --git a/flang/lib/CMakeLists.txt b/flang/lib/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_subdirectory(Common)
+add_subdirectory(Support)
 add_subdirectory(Evaluate)
 add_subdirectory(Lower)
 add_subdirectory(Parser)
 add_subdirectory(Semantics)
-add_subdirectory(Support)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 
diff --git a/flang/lib/Common/CMakeLists.txt b/flang/lib/Common/CMakeLists.txt
@@ -9,7 +9,4 @@
 add_flang_library(FortranCommon
   binary-to-decimal.cpp
   decimal-to-binary.cpp
-
-  LINK_LIBS
-  MLIRIR
 )
diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
@@ -751,7 +751,7 @@ prettyPrintIntrinsicName(fir::FirOpBuilder &builder, mlir::Location loc,
 // Generate a call to the Fortran runtime library providing
 // support for 128-bit float math.
 // On 'HAS_LDBL128' targets the implementation
-// is provided by flang-rt, otherwise, it is done via
+// is provided by flang_rt, otherwise, it is done via
 // FortranFloat128Math library. In the latter case the compiler
 // has to be built with FLANG_RUNTIME_F128_MATH_LIB to guarantee
 // proper linking actions in the driver.
diff --git a/flang/lib/Support/CMakeLists.txt b/flang/lib/Support/CMakeLists.txt
@@ -54,5 +54,8 @@ add_flang_library(FortranSupport
   ${version_inc}
 
   LINK_COMPONENTS
-  Support
+    Support
+
+  LINK_LIBS
+    MLIRIR
 )
diff --git a/flang/lib/Testing/README.md b/flang/lib/Testing/README.md
@@ -1,27 +1,27 @@
-Files in this directory are used by Flang (the compiler) and flang-rt
-(the runtime library for Flang-compiled programs). They must be compatible by
-both. For definitions used only by Flang, consider
-`flang/{lib,include/flang}/Support` instead. For definitions used only by
-the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`.
-
-The requirements for common code include:
-
- * No dependence to LLVM, including LLVMSupport.
-
- * No link-dependence to the C++ runtime. This means that e.g. `std::string`
-   cannot be used.
-
- * No use of `std::optional<T>`; `fortran::common::optional<T>` can be used
-   instead.
-
- * Preprocessor macros from `config.h` and CMake
-   `(target/add)_compile_definitions` must be defined by both build scripts.
-   See `flang/cmake/modules/FlangCommon.cmake`.
-
- * Some header files are included from `.c` files.
-   `#include <flang/Common/c-or-cpp.h>` can help to support C++ and C.
-
- * Global declarations may need to be annotated using definitions from
-   `api-attrs.h`.
-
- * The `Runtime` component is header-only.
+Files in this directory are used by Flang (the compiler) and flang-rt
+(the runtime library for Flang-compiled programs). They must be compatible by
+both. For definitions used only by Flang, consider
+`flang/{lib,include/flang}/Support` instead. For definitions used only by
+the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`.
+
+The requirements for common code include:
+
+ * No dependence to LLVM, including LLVMSupport.
+
+ * No link-dependence to the C++ runtime. This means that e.g. `std::string`
+   cannot be used.
+
+ * No use of `std::optional<T>`; `fortran::common::optional<T>` can be used
+   instead.
+
+ * Preprocessor macros from `config.h` and CMake
+   `(target/add)_compile_definitions` must be defined by both build scripts.
+   See `flang/cmake/modules/FlangCommon.cmake`.
+
+ * Some header files are included from `.c` files.
+   `#include <flang/Common/c-or-cpp.h>` can help to support C++ and C.
+
+ * Global declarations may need to be annotated using definitions from
+   `api-attrs.h`.
+
+ * The `Runtime` component is header-only.
diff --git a/flang/module/iso_fortran_env_impl.f90 b/flang/module/iso_fortran_env_impl.f90
@@ -8,7 +8,7 @@
 
 ! This MODULE implements part of the ISO_FORTRAN_ENV module file, which
 ! partially requires linkable symbols for some entities defined
-! (e.g., real_kinds). Hence, this file is also used by Flang-RT.
+! (e.g., real_kinds). This file is also used by Flang-RT.
 
 module iso_fortran_env_impl
   implicit none
diff --git a/flang/test/lit.site.cfg.py.in b/flang/test/lit.site.cfg.py.in
@@ -10,11 +10,9 @@ config.llvm_target_triple_env = "@LLVM_TARGET_TRIPLE_ENV@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
 config.flang_obj_root = "@FLANG_BINARY_DIR@"
-config.flang_src_dir = "@FLANG_SOURCE_DIR@"
 config.flang_tools_dir = lit_config.substitute("@FLANG_TOOLS_DIR@")
 config.flang_intrinsic_modules_dir = "@FLANG_INTRINSIC_MODULES_DIR@"
 config.flang_llvm_tools_dir = "@CMAKE_BINARY_DIR@/bin"
-config.flang_lib_dir = "@CMAKE_BINARY_DIR@/lib"
 config.flang_test_triple = "@FLANG_TEST_TARGET_TRIPLE@"
 config.flang_examples = @LLVM_BUILD_EXAMPLES@
 config.python_executable = "@PYTHON_EXECUTABLE@"
diff --git a/flang/unittests/Common/CMakeLists.txt b/flang/unittests/Common/CMakeLists.txt
diff --git a/flang/unittests/Common/FastIntSetTest.cpp b/flang/unittests/Common/FastIntSetTest.cpp
diff --git a/flang/unittests/Decimal/CMakeLists.txt b/flang/unittests/Decimal/CMakeLists.txt
diff --git a/flang/unittests/Decimal/quick-sanity-test.cpp b/flang/unittests/Decimal/quick-sanity-test.cpp
diff --git a/flang/unittests/Decimal/thorough-test.cpp b/flang/unittests/Decimal/thorough-test.cpp
diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#===-- cmake/modules/AddFortranOffloadRuntime.txt --------------------------===#`
	`1`	`+#===-- cmake/modules/AddFortranRTOffload.txt -------------------------------===#`
`2`	`2`	`#`
`3`	`3`	`# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.`
`4`	`4`	`# See https://llvm.org/LICENSE.txt for license information.`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ elseif (HAVE_LDBL_MANT_DIG_113)`
`118`	`118`	`)`
`119`	`119`	`target_sources(FortranFloat128MathILib INTERFACE ${sources})`
`120`	`120`	`else()`
`121`		`- message(FATAL_ERROR "flang-rt cannot build without libm")`
	`121`	`+ message(FATAL_ERROR "Flang-RT cannot build without libm")`
`122`	`122`	`endif()`
`123`	`123`	`else()`
`124`	`124`	`# We can use '__float128' version from libc, if it has them.`