Merge branch 'users/meinersbur/flang_runtime_FortranSupport' into users/meinersbur/flang_runtime_move-files

Meinersbur · Meinersbur · commit 9af78b582063 · 2025-01-09T10:23:08.000+01:00
diff --git a/flang-rt/lib/flang_rt/CMakeLists.txt b/flang-rt/lib/flang_rt/CMakeLists.txt
@@ -113,8 +113,8 @@ add_definitions(-U_LIBCPP_ENABLE_ASSERTIONS)
 add_subdirectory(../FortranFloat128Math Float128Math)
 
 set(sources
-  ${FLANG_SOURCE_DIR}/lib/Common/binary-to-decimal.cpp
-  ${FLANG_SOURCE_DIR}/lib/Common/decimal-to-binary.cpp
+  ${FLANG_SOURCE_DIR}/lib/Decimal/binary-to-decimal.cpp
+  ${FLANG_SOURCE_DIR}/lib/Decimal/decimal-to-binary.cpp
   ISO_Fortran_binding.cpp
   allocator-registry.cpp
   allocatable.cpp
diff --git a/flang-rt/lib/flang_rt/edit-input.h b/flang-rt/lib/flang_rt/edit-input.h
@@ -11,7 +11,7 @@
 
 #include "format.h"
 #include "io-stmt.h"
-#include "flang/Common/decimal.h"
+#include "flang/Decimal/decimal.h"
 
 namespace Fortran::runtime::io {
 
diff --git a/flang-rt/lib/flang_rt/edit-output.h b/flang-rt/lib/flang_rt/edit-output.h
@@ -20,8 +20,8 @@
 
 #include "format.h"
 #include "io-stmt.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/uint128.h"
+#include "flang/Decimal/decimal.h"
 
 namespace Fortran::runtime::io {
 
diff --git a/flang-rt/lib/flang_rt/environment.h b/flang-rt/lib/flang_rt/environment.h
@@ -9,8 +9,8 @@
 #ifndef FLANG_RT_ENVIRONMENT_H_
 #define FLANG_RT_ENVIRONMENT_H_
 
-#include "flang/Common/decimal.h"
 #include "flang/Common/optional.h"
+#include "flang/Decimal/decimal.h"
 
 struct EnvironmentDefaultList;
 
diff --git a/flang-rt/lib/flang_rt/format-implementation.h b/flang-rt/lib/flang_rt/format-implementation.h
@@ -15,8 +15,8 @@
 #include "format.h"
 #include "io-stmt.h"
 #include "memory.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/format.h"
+#include "flang/Decimal/decimal.h"
 #include "flang/Runtime/main.h"
 #include <algorithm>
 #include <cstring>
diff --git a/flang-rt/lib/flang_rt/format.h b/flang-rt/lib/flang_rt/format.h
@@ -14,8 +14,8 @@
 #include "environment.h"
 #include "io-error.h"
 #include "flang/Common/Fortran-consts.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/optional.h"
+#include "flang/Decimal/decimal.h"
 #include "flang/Runtime/freestanding-tools.h"
 #include <cinttypes>
 
diff --git a/flang/include/flang/Decimal/binary-floating-point.h b/flang/include/flang/Decimal/binary-floating-point.h
@@ -1,13 +1,13 @@
-//===-- include/flang/Common/binary-floating-point.h ------------*- C++ -*-===//
+//===-- include/flang/Decimal/binary-floating-point.h -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef FORTRAN_COMMON_BINARY_FLOATING_POINT_H_
-#define FORTRAN_COMMON_BINARY_FLOATING_POINT_H_
+#ifndef FORTRAN_DECIMAL_BINARY_FLOATING_POINT_H_
+#define FORTRAN_DECIMAL_BINARY_FLOATING_POINT_H_
 
 // Access and manipulate the fields of an IEEE-754 binary
 // floating-point value via a generalized template.
@@ -208,4 +208,4 @@ template <int BINARY_PRECISION> class BinaryFloatingPointNumber {
   RawType raw_{0};
 };
 } // namespace Fortran::decimal
-#endif /* FORTRAN_COMMON_BINARY_FLOATING_POINT_H_ */
+#endif
diff --git a/flang/include/flang/Decimal/decimal.h b/flang/include/flang/Decimal/decimal.h
@@ -1,15 +1,16 @@
-/*===-- include/flang/Common/decimal.h ------------------------------*- C -*-===
+/*===-- include/flang/Decimal/decimal.h ---------------------------*- C++ -*-===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
- *===----------------------------------------------------------------------===*/
+ * ===-----------------------------------------------------------------------===
+ */
 
 /* C and C++ API for binary-to/from-decimal conversion package. */
 
-#ifndef FORTRAN_COMMON_DECIMAL_H_
-#define FORTRAN_COMMON_DECIMAL_H_
+#ifndef FORTRAN_DECIMAL_DECIMAL_H_
+#define FORTRAN_DECIMAL_DECIMAL_H_
 
 #include "flang/Common/api-attrs.h"
 #include <stddef.h>
@@ -136,4 +137,4 @@ RT_API_ATTRS enum NS(ConversionResultFlags) ConvertDecimalToLongDouble(
 #ifdef __cplusplus
 } // extern "C"
 #endif
-#endif /* FORTRAN_COMMON_DECIMAL_H_ */
+#endif
diff --git a/flang/lib/CMakeLists.txt b/flang/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_subdirectory(Common)
 add_subdirectory(Support)
 add_subdirectory(Evaluate)
+add_subdirectory(Decimal)
 add_subdirectory(Lower)
 add_subdirectory(Parser)
 add_subdirectory(Semantics)
diff --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt
@@ -1,12 +1,12 @@
-#===-- lib/Common/CMakeLists.txt ------------------------------------===#
+#===-- lib/Decimal/CMakeLists.txt ------------------------------------------===#
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 #===------------------------------------------------------------------------===#
 
-add_flang_library(FortranCommon
+add_flang_library(FortranDecimal
   binary-to-decimal.cpp
   decimal-to-binary.cpp
 )
diff --git a/flang/lib/Decimal/big-radix-floating-point.h b/flang/lib/Decimal/big-radix-floating-point.h
@@ -1,13 +1,13 @@
-//===-- lib/Common/big-radix-floating-point.h -------------------*- C++ -*-===//
+//===-- lib/Decimal/big-radix-floating-point.h ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef FORTRAN_COMMON_BIG_RADIX_FLOATING_POINT_H_
-#define FORTRAN_COMMON_BIG_RADIX_FLOATING_POINT_H_
+#ifndef FORTRAN_DECIMAL_BIG_RADIX_FLOATING_POINT_H_
+#define FORTRAN_DECIMAL_BIG_RADIX_FLOATING_POINT_H_
 
 // This is a helper class for use in floating-point conversions between
 // binary and decimal representations.  It holds a multiple-precision
@@ -21,11 +21,11 @@
 // for conversions between binary and decimal representations; it is not
 // a general-purpose facility.
 
-#include "flang/Common/binary-floating-point.h"
 #include "flang/Common/bit-population-count.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/leading-zero-bit-count.h"
 #include "flang/Common/uint128.h"
+#include "flang/Decimal/binary-floating-point.h"
+#include "flang/Decimal/decimal.h"
 #include <cinttypes>
 #include <limits>
 #include <type_traits>
@@ -393,4 +393,4 @@ template <int PREC, int LOG10RADIX = 16> class BigRadixFloatingPointNumber {
   enum FortranRounding rounding_ { RoundNearest };
 };
 } // namespace Fortran::decimal
-#endif /* FORTRAN_COMMON_BIG_RADIX_FLOATING_POINT_H_ */
+#endif
diff --git a/flang/lib/Decimal/binary-to-decimal.cpp b/flang/lib/Decimal/binary-to-decimal.cpp
@@ -1,4 +1,4 @@
-//===-- lib/Common/binary-to-decimal.cpp ------------------------*- C++ -*-===//
+//===-- lib/Decimal/binary-to-decimal.cpp ---------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "flang/Common/decimal.h"
+#include "flang/Decimal/decimal.h"
 #include <cassert>
 #include <cfloat>
 #include <string>
diff --git a/flang/lib/Decimal/decimal-to-binary.cpp b/flang/lib/Decimal/decimal-to-binary.cpp
@@ -1,4 +1,4 @@
-//===-- lib/Common/decimal-to-binary.cpp ------------------------*- C++ -*-===//
+//===-- lib/Decimal/decimal-to-binary.cpp ---------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "flang/Common/binary-floating-point.h"
 #include "flang/Common/bit-population-count.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/leading-zero-bit-count.h"
+#include "flang/Decimal/binary-floating-point.h"
+#include "flang/Decimal/decimal.h"
 #include "flang/Runtime/freestanding-tools.h"
 #include <cinttypes>
 #include <cstring>
diff --git a/flang/lib/Evaluate/CMakeLists.txt b/flang/lib/Evaluate/CMakeLists.txt
@@ -60,8 +60,8 @@ add_flang_library(FortranEvaluate
   variable.cpp
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
+  FortranDecimal
   FortranParser
   ${LIBPGMATH}
   ${QUADMATHLIB}
diff --git a/flang/lib/Evaluate/real.cpp b/flang/lib/Evaluate/real.cpp
@@ -8,8 +8,8 @@
 
 #include "flang/Evaluate/real.h"
 #include "int-power.h"
-#include "flang/Common/decimal.h"
 #include "flang/Common/idioms.h"
+#include "flang/Decimal/decimal.h"
 #include "flang/Parser/characters.h"
 #include "llvm/Support/raw_ostream.h"
 #include <limits>
diff --git a/flang/lib/Frontend/CMakeLists.txt b/flang/lib/Frontend/CMakeLists.txt
@@ -27,7 +27,6 @@ add_flang_library(flangFrontend
   FortranParser
   FortranSemantics
   FortranEvaluate
-  FortranCommon
   FortranSupport
   FortranLower
   FIRDialect
diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
@@ -56,7 +56,6 @@ add_flang_library(FortranLower
   HLFIRDialect
   ${dialect_libs}
   ${extension_libs}
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/lib/Optimizer/OpenMP/CMakeLists.txt b/flang/lib/Optimizer/OpenMP/CMakeLists.txt
@@ -21,7 +21,6 @@ add_flang_library(FlangOpenMPTransforms
   FIRDialect
   FIRDialectSupport
   FIRSupport
-  FortranCommon
   FortranSupport
   FortranEvaluate
   MLIRFuncDialect
diff --git a/flang/lib/Optimizer/Passes/CMakeLists.txt b/flang/lib/Optimizer/Passes/CMakeLists.txt
@@ -11,7 +11,6 @@ add_flang_library(flangPasses
   FlangOpenMPTransforms
   ${dialect_libs}
   ${extension_libs}
-  FortranCommon
   FortranSupport
   HLFIRTransforms
   MLIRPass
diff --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
@@ -46,7 +46,6 @@ add_flang_library(FIRTransforms
   FIRDialect
   FIRDialectSupport
   FIRSupport
-  FortranCommon
   FortranSupport
   HLFIRDialect
   MLIRAffineUtils
diff --git a/flang/lib/Parser/CMakeLists.txt b/flang/lib/Parser/CMakeLists.txt
@@ -25,7 +25,6 @@ add_flang_library(FortranParser
   user-state.cpp
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
 
   LINK_COMPONENTS
diff --git a/flang/lib/Semantics/CMakeLists.txt b/flang/lib/Semantics/CMakeLists.txt
@@ -53,7 +53,6 @@ add_flang_library(FortranSemantics
   omp_gen
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt
@@ -72,6 +72,7 @@ set(FLANG_TEST_DEPENDS
   llvm-readobj
   split-file
   FortranRuntime
+  FortranDecimal
 )
 if (LLVM_ENABLE_PLUGINS AND NOT WIN32)
   list(APPEND FLANG_TEST_DEPENDS Bye)
diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt
@@ -32,7 +32,6 @@ target_link_libraries(bbc PRIVATE
   ${extension_libs}
   MLIRAffineToStandard
   MLIRSCFToControlFlow
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/tools/f18-parse-demo/CMakeLists.txt b/flang/tools/f18-parse-demo/CMakeLists.txt
@@ -11,7 +11,6 @@ add_flang_tool(f18-parse-demo
 
 target_link_libraries(f18-parse-demo
   PRIVATE
-  FortranCommon
   FortranSupport
   FortranParser
   )
diff --git a/flang/tools/tco/CMakeLists.txt b/flang/tools/tco/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(tco PRIVATE
   HLFIRTransforms
   flangPasses
   FlangOpenMPTransforms
-  FortranCommon
   FortranSupport
   ${dialect_libs}
   ${extension_libs}
diff --git a/flang/unittests/Decimal/CMakeLists.txt b/flang/unittests/Decimal/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 add_flang_nongtest_unittest(quick-sanity-test
-  FortranCommon
+  FortranDecimal
 )
 
 # This test is not run by default as it takes a long time to execute.
 add_flang_nongtest_unittest(thorough-test
   SLOW_TEST
-  FortranCommon
+  FortranDecimal
 )
diff --git a/flang/unittests/Decimal/quick-sanity-test.cpp b/flang/unittests/Decimal/quick-sanity-test.cpp
@@ -1,4 +1,4 @@
-#include "flang/Common/decimal.h"
+#include "flang/Decimal/decimal.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cinttypes>
 #include <cstdio>
diff --git a/flang/unittests/Decimal/thorough-test.cpp b/flang/unittests/Decimal/thorough-test.cpp
@@ -1,4 +1,4 @@
-#include "flang/Common/decimal.h"
+#include "flang/Decimal/decimal.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cinttypes>
 #include <cstdio>
diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt
@@ -26,7 +26,6 @@ add_flang_nongtest_unittest(uint128
 )
 
 add_flang_nongtest_unittest(expression
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
@@ -41,10 +40,10 @@ add_flang_nongtest_unittest(integer
 )
 
 add_flang_nongtest_unittest(intrinsics
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
+  FortranDecimal
   FortranSemantics
   FortranParser
   FortranRuntime
@@ -65,14 +64,12 @@ set(LLVM_REQUIRES_RTTI ON)
 add_flang_nongtest_unittest(real
   FortranEvaluateTesting
   FortranEvaluate
-  FortranCommon
-  FortranSupport
+  FortranDecimal
   FortranSemantics
 )
 llvm_update_compile_flags(real.test)
 
 add_flang_nongtest_unittest(folding
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
diff --git a/flang/unittests/Frontend/CMakeLists.txt b/flang/unittests/Frontend/CMakeLists.txt
@@ -18,7 +18,6 @@ target_link_libraries(FlangFrontendTests
   FortranLower
   FortranParser
   FortranSemantics
-  FortranCommon
   FortranSupport
   FortranEvaluate
   MLIRIR

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-#===-- lib/Common/CMakeLists.txt ------------------------------------===#`
	`1`	`+#===-- lib/Decimal/CMakeLists.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.`
`5`	`5`	`# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception`
`6`	`6`	`#`
`7`	`7`	`#===------------------------------------------------------------------------===#`
`8`	`8`
`9`		`-add_flang_library(FortranCommon`
	`9`	`+add_flang_library(FortranDecimal`
`10`	`10`	`binary-to-decimal.cpp`
`11`	`11`	`decimal-to-binary.cpp`
`12`	`12`	`)`