Port Classic Flang to LLVM 20.1.2

.github/workflows/flang-arm64-tests.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Build and install libpgmath & flang
         run: |
           cd ${{ env.build_path }}/flang
-          ./build-flang.sh -t ${{ matrix.target }} -p ${{ env.install_prefix }} -n $(nproc)
+          ./build-flang.sh -t ${{ matrix.target }} -p ${{ env.install_prefix }} -n $(nproc) -l ${{ env.build_path }}/classic-flang-llvm-project/llvm
 
       - name: Copy llvm-lit
         run: |

.github/workflows/flang-tests.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Build and install libpgmath & flang
         run: |
           cd ../../flang
-          ./build-flang.sh -t ${{ matrix.target }} -p ${{ env.install_prefix }} -n $(nproc) -c -s
+          ./build-flang.sh -t ${{ matrix.target }} -p ${{ env.install_prefix }} -n $(nproc) -c -s -l $(realpath ../classic-flang-llvm-project/classic-flang-llvm-project/llvm)
 
       - name: Copy llvm-lit
         run: |

build-llvm-project.sh

@@ -4,13 +4,14 @@
 TARGET="X86"
 BUILD_TYPE="Release"
 INSTALL_PREFIX="/usr/local"
+CROSS_TARGETS=""
 NPROC=1
 USE_CCACHE="0"
 DO_INSTALL="0"
 USE_SUDO="0"
 C_COMPILER_PATH="/usr/bin/gcc"
 CXX_COMPILER_PATH="/usr/bin/g++"
-LLVM_ENABLE_PROJECTS="clang;openmp"
+LLVM_EXTRA_PROJECTS=""
 EXTRA_CMAKE_OPTS=""
 VERBOSE=""
 
@@ -19,56 +20,50 @@ set -e # Exit script on first error.
 function print_usage {
     echo "Usage: ./build-llvm-project.sh [options]";
     echo "";
-    echo "Build and install classic-flang-llvm-project.";
+    echo "Build and install classic-flang-llvm-project (including clang, lld, and openmp).";
     echo "Run this script in a directory with project sources.";
     echo "Example:";
     echo "  $ git clone https://github.com/flang-compiler/classic-flang-llvm-project";
     echo "  $ cd classic-flang-llvm-project";
-    echo "  $ .github/workflows/build-llvm-project.sh -t X86 -p /install/prefix/ \\";
-    echo "  $ -a /usr/bin/gcc-10 -b /usr/bin/g++-10 -i -s";
+    echo "  $ ./build-llvm-project.sh -t X86 -p /opt/classic-flang/ -i -s";
     echo "";
     echo "Options:";
     echo "  -t  Target to build for (X86, AArch64, PowerPC). Default: X86";
     echo "  -d  Set the CMake build type. Default: Release";
     echo "  -p  Install prefix. Default: /usr/local";
+    echo "  -X  Cross-compile OpenMP for given list of target triples. Default: none";
     echo "  -n  Number of parallel jobs. Default: 1";
     echo "  -c  Use ccache. Default: 0 - do not use ccache";
     echo "  -i  Install the build. Default 0 - just build, do not install";
     echo "  -s  Use sudo to install. Default: 0 - do not use sudo";
     echo "  -a  C compiler path. Default: /usr/bin/gcc";
     echo "  -b  C++ compiler path. Default: /usr/bin/g++";
-    echo "  -e  List of the LLVM sub-projects to build. Default: clang;openmp";
+    echo "  -e  List of additional LLVM sub-projects to build. Default: none";
     echo "  -x  Extra CMake options. Default: ''";
     echo "  -v  Enable verbose output";
 }
 
-while getopts "t:d:p:n:cisa:b:e:x:v?" opt; do
+while getopts "t:d:p:X:n:cisa:b:e:x:v?" opt; do
     case "$opt" in
         t) TARGET=$OPTARG;;
         d) BUILD_TYPE=$OPTARG;;
         p) INSTALL_PREFIX=$OPTARG;;
+        X) CROSS_TARGETS=$OPTARG;;
         n) NPROC=$OPTARG;;
         c) USE_CCACHE="1";;
         i) DO_INSTALL="1";;
         s) USE_SUDO="1";;
         a) C_COMPILER_PATH=$OPTARG;;
         b) CXX_COMPILER_PATH=$OPTARG;;
-        e) LLVM_ENABLE_PROJECTS=$OPTARG;;
+        e) LLVM_EXTRA_PROJECTS=$OPTARG;;
         x) EXTRA_CMAKE_OPTS="$OPTARG";;
         v) VERBOSE="1";;
         ?) print_usage; exit 0;;
     esac
 done
 
 CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-    -DCMAKE_C_COMPILER=$C_COMPILER_PATH \
-    -DCMAKE_CXX_COMPILER=$CXX_COMPILER_PATH \
-    -DLLVM_TARGETS_TO_BUILD=$TARGET \
-    -DLLVM_ENABLE_CLASSIC_FLANG=ON \
-    -DFLANG_BUILD_NEW_DRIVER=OFF"
-# Warning: the -DLLVM_ENABLE_PROJECTS option is specified with cmake
-# to avoid issues with nested quotation marks
+    -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
 
 if [ $USE_CCACHE == "1" ]; then
   echo "Build using ccache"
@@ -77,16 +72,19 @@ if [ $USE_CCACHE == "1" ]; then
       -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
 fi
 
-if [ -n "$EXTRA_CMAKE_OPTS" ]; then
-  CMAKE_OPTIONS="$CMAKE_OPTIONS $EXTRA_CMAKE_OPTS"
-fi
-
-# Build and install
+# Build and install.
 mkdir -p build && cd build
 if [ -n "$VERBOSE" ]; then
   set -x
 fi
-cmake $CMAKE_OPTIONS -DLLVM_ENABLE_PROJECTS=$LLVM_ENABLE_PROJECTS ../llvm
+cmake $CMAKE_OPTIONS \
+    -DCMAKE_C_COMPILER=$C_COMPILER_PATH \
+    -DCMAKE_CXX_COMPILER=$CXX_COMPILER_PATH \
+    -DLLVM_ENABLE_CLASSIC_FLANG=ON \
+    -DLLVM_ENABLE_PROJECTS="clang;lld;openmp;$LLVM_EXTRA_PROJECTS" \
+    -DLLVM_TARGETS_TO_BUILD="$TARGET" \
+    $EXTRA_CMAKE_OPTS \
+    ../llvm
 set +x
 make -j$NPROC VERBOSE=$VERBOSE
 if [ $DO_INSTALL == "1" ]; then
@@ -100,3 +98,44 @@ if [ $DO_INSTALL == "1" ]; then
 fi
 cd ..
 
+# Cross-compile OpenMP libraries if requested.
+IFS=';' read -ra CROSS_TARGET_LIST <<< "$CROSS_TARGETS"
+for T in ${CROSS_TARGET_LIST[@]}; do
+  mkdir -p "build/openmp-$T"
+  pushd "build/openmp-$T"
+  CMAKE_OPTIONS="$CMAKE_OPTIONS \
+      -DCMAKE_AR=$INSTALL_PREFIX/bin/llvm-ar \
+      -DCMAKE_ASM_COMPILER=$INSTALL_PREFIX/bin/clang \
+      -DCMAKE_ASM_COMPILER_TARGET=$T \
+      -DCMAKE_C_COMPILER=$INSTALL_PREFIX/bin/clang \
+      -DCMAKE_C_COMPILER_TARGET=$T \
+      -DCMAKE_CXX_COMPILER=$INSTALL_PREFIX/bin/clang++ \
+      -DCMAKE_CXX_COMPILER_TARGET=$T \
+      -DCMAKE_RANLIB=$INSTALL_PREFIX/bin/llvm-ranlib \
+      -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld"
+  if [ -n "$VERBOSE" ]; then
+    set -x
+  fi
+  cmake $CMAKE_OPTIONS \
+      -DLLVM_DEFAULT_TARGET_TRIPLE=$T \
+      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
+      -DLLVM_ENABLE_RUNTIMES="openmp" \
+      -DLIBOMP_OMPT_SUPPORT=OFF \
+      -DOPENMP_ENABLE_LIBOMPTARGET=OFF \
+      -DOPENMP_ENABLE_OMPT_TOOLS=OFF \
+      -DOPENMP_LLVM_TOOLS_DIR=$PWD/../bin \
+      $EXTRA_CMAKE_OPTS \
+      ../../runtimes
+  set +x
+  make -j$NPROC VERBOSE=$VERBOSE
+  if [ $DO_INSTALL -eq 1 ]; then
+    if [ $USE_SUDO -eq 1 ]; then
+      echo "Install with sudo"
+      sudo make install
+    else
+      echo "Install without sudo"
+      make install
+    fi
+  fi
+  popd
+done

clang/CMakeLists.txt

@@ -413,6 +413,11 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
   endif()
 endif()
 
+option(LLVM_ENABLE_CLASSIC_FLANG "Build support for classic Flang instead of the new built-in Flang" OFF)
+if(LLVM_ENABLE_CLASSIC_FLANG)
+  add_definitions( -DENABLE_CLASSIC_FLANG )
+endif()
+
 option(CLANG_BUILD_TOOLS
   "Build the Clang tools. If OFF, just generate build targets." ON)
 

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -156,6 +156,10 @@ def err_drv_invalid_linker_name : Error<
   "invalid linker name in argument '%0'">;
 def err_drv_invalid_rtlib_name : Error<
   "invalid runtime library name in argument '%0'">;
+def err_drv_invalid_allocatable_mode : Error<
+  "invalid semantic mode for assignments to allocatables in argument '%0'">;
+def err_drv_unsupported_fixed_line_length : Error<
+  "unsupported fixed-format line length in argument '%0'">;
 def err_drv_unsupported_rtlib_for_platform : Error<
   "unsupported runtime library '%0' for platform '%1'">;
 def err_drv_invalid_unwindlib_name : Error<
@@ -384,6 +388,8 @@ def err_drv_small_columns : Error<
 def warn_drv_fraw_string_literals_in_cxx11 : Warning<
   "ignoring '-f%select{no-|}0raw-string-literals', which is only valid for C and C++ standards before C++11">,
   InGroup<UnusedCommandLineArgument>;
+def err_drv_clang_unsupported_minfo_arg : Error<
+  "'%0' option does not support '%1' value">;
 
 def err_drv_invalid_malign_branch_EQ : Error<
   "invalid argument '%0' to -malign-branch=; each element must be one of: %1">;

clang/include/clang/Basic/MacroBuilder.h

@@ -24,12 +24,13 @@ class MacroBuilder {
   raw_ostream &Out;
 public:
   MacroBuilder(raw_ostream &Output) : Out(Output) {}
+  virtual ~MacroBuilder() {}
 
   /// Append a \#define line for macro of the form "\#define Name Value\n".
   /// If DeprecationMsg is provided, also append a pragma to deprecate the
   /// defined macro.
-  void defineMacro(const Twine &Name, const Twine &Value = "1",
-                   Twine DeprecationMsg = "") {
+  virtual void defineMacro(const Twine &Name, const Twine &Value = "1",
+                           Twine DeprecationMsg = "") {
     Out << "#define " << Name << ' ' << Value << '\n';
     if (!DeprecationMsg.isTriviallyEmpty())
       Out << "#pragma clang deprecated(" << Name << ", \"" << DeprecationMsg

clang/include/clang/Basic/Sanitizers.def

@@ -196,6 +196,9 @@ SANITIZER_GROUP("bounds", Bounds, ArrayBounds | LocalBounds)
 // Scudo hardened allocator
 SANITIZER("scudo", Scudo)
 
+// Fortran contiguous pointer checks
+SANITIZER("discontiguous", Discontiguous)
+
 // Magic group, containing all sanitizers. For example, "-fno-sanitize=all"
 // can be used to disable all the sanitizers.
 SANITIZER_GROUP("all", All, ~SanitizerMask())

clang/include/clang/Driver/CMakeLists.txt

@@ -1,3 +1,7 @@
 set(LLVM_TARGET_DEFINITIONS Options.td)
-tablegen(LLVM Options.inc -gen-opt-parser-defs)
+if(LLVM_ENABLE_CLASSIC_FLANG)
+  tablegen(LLVM Options.inc -DENABLE_CLASSIC_FLANG -gen-opt-parser-defs)
+else()
+  tablegen(LLVM Options.inc -gen-opt-parser-defs)
+endif()
 add_public_tablegen_target(ClangDriverOptions)