Module serach paths

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -360,7 +360,6 @@ function (add_flangrt_library name)
     endif ()
 
     if (ARG_TARGET_PROPERTIES)
-message("Setting target properties of ${tgtname}: ${ARG_TARGET_PROPERTIES}" )
       set_target_properties(${tgtname} PROPERTIES ${ARG_TARGET_PROPERTIES})
     endif ()
 

flang-rt/lib/runtime/CMakeLists.txt

@@ -26,7 +26,6 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 check_fortran_source_compiles([[
     subroutine test_quadmath
       real(16) :: var1
-      print *, 'Hello'
     end
   ]]
   FORTRAN_SUPPORTS_REAL16
@@ -246,7 +245,7 @@ set(gpu_sources
 
 add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:-mmlir> $<$<COMPILE_LANGUAGE:Fortran>:-ignore-missing-type-desc>)
 
-# Flang bug: Reformatting of cooked token buffer causes identifier to be split between lines
+# Flang bug: Reformating of cooked token buffer causes identifier to be split between lines
 add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:-Xflang> $<$<COMPILE_LANGUAGE:Fortran>:-fno-reformat>)
 
 #add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:-mllvm=-flang-intrinsics-mode>)
@@ -355,7 +354,7 @@ else()
 
   function (add_win_flangrt_runtime libtype suffix msvc_lib)
     set(name "flang_rt.runtime.${suffix}")
-    message("${name}.intrinsics")
+
     add_flangrt_library(${name}.intrinsics OBJECT
       ${intrinsics_sources}
     )
@@ -397,7 +396,7 @@ else()
     # Except for one selected one (the first)
     if (_has_main_intrinsics)
         set_property(TARGET ${name} ${name}.intrinsics
-          PROPERTY   Fortran_MODULE_DIRECTORY "module.${suffix}"
+          PROPERTY Fortran_MODULE_DIRECTORY "module.${suffix}"
         )
    else ()
         set(_has_main_intrinsics "YES" PARENT_SCOPE)

flang/test/CMakeLists.txt

@@ -107,15 +107,13 @@ endif ()
 add_custom_target(flang-test-depends DEPENDS ${FLANG_TEST_DEPENDS})
 set_target_properties(flang-test-depends PROPERTIES FOLDER "Flang/Meta")
 
-
 add_lit_testsuite(check-flang "Running the Flang regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   PARAMS ${FLANG_TEST_PARAMS}
   DEPENDS ${FLANG_TEST_DEPENDS}
 )
 set_target_properties(check-flang PROPERTIES FOLDER "Flang/Meta")
 
-#if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES AND NOT FLANG_STANDALONE_BUILD)
 # In case of standalone builds.
 if (FLANG_STANDALONE_BUILD)
   add_lit_testsuites(FLANG ${CMAKE_CURRENT_BINARY_DIR}
@@ -126,7 +124,6 @@ else()
     PARAMS ${FLANG_TEST_PARAMS}
     DEPENDS ${FLANG_TEST_DEPENDS})
 endif()
-#endif ()
 
 # To modify the default target triple for flang tests.
 if (DEFINED FLANG_TEST_TARGET_TRIPLE)

flang/test/Semantics/test_modfile.py

@@ -18,8 +18,6 @@
 from pathlib import Path
 from difflib import unified_diff
 
-print(sys.argv)
-
 cm.check_args_long(sys.argv)
 srcdir = Path(sys.argv[1])
 sources = list(glob.iglob(str(srcdir)))
@@ -43,7 +41,6 @@
 
         prev_files = set(os.listdir(tmpdir))
         cmd = [flang_fc1, *flang_fc_args, flang_fc1_options, str(src)]
-        print(' '.join(cmd))
         proc = subprocess.check_output(
             cmd, stderr=subprocess.PIPE, universal_newlines=True, cwd=tmpdir
         )

flang/test/lit.cfg.py

@@ -184,7 +184,6 @@
 else:
    config.limit_to_features.add("module-independent")
 
-
 # Determine if OpenMP runtime was built (enable OpenMP tests via REQUIRES in test file)
 openmp_flags_substitution = "-fopenmp"
 if config.have_openmp_rtl:

flang/tools/bbc/bbc.cpp

@@ -568,7 +568,6 @@ int main(int argc, char **argv) {
   ProgramName programPrefix;
   programPrefix = argv[0] + ": "s;
 
-  
   if (includeDirs.size() == 0) {
     includeDirs.push_back(".");
     // Default Fortran modules should be installed in finclude/<target-triple> of the resource directory
@@ -577,7 +576,7 @@ int main(int argc, char **argv) {
   if (triple.empty())
     triple = llvm::sys::getDefaultTargetTriple();
 
-    //  Driver::GetResourcesPath(StringRef BinaryPath)
+
   // FIXME: Do not modify intrinsicIncludeDirs directly, should be treated as immutable just like argv.
   // TODO: Normlize triple directory as clang does; best refactor with ToolChain::getDefaultIntrinsicModulePaths() used by the flang driver.
     std::string mainExe = llvm::sys::fs::getMainExecutable(argv[0], nullptr);
@@ -587,15 +586,6 @@ int main(int argc, char **argv) {
     llvm::sys::path::append(resourceDir,  "finclude", triple);
     llvm::errs() << resourceDir << "\n";
   intrinsicIncludeDirs.push_back(resourceDir.str().str());
-  
-  #if 0
-    intrinsicIncludeDirs.push_back(
-        llvm::sys::path::parent_path(
-            llvm::sys::path::parent_path(
-                llvm::sys::fs::getMainExecutable(argv[0], nullptr)))
-            .str() +
-        "/include/flang");
-    #endif 
   }
 
   Fortran::parser::Options options;
@@ -664,9 +654,6 @@ int main(int argc, char **argv) {
   Fortran::parser::AllCookedSources allCookedSources(allSources);
   Fortran::semantics::SemanticsContext semanticsContext{
       defaultKinds, options.features, langOpts, allCookedSources};
-//std::vector < std::string> intrinsicsSearchPaths;
-// intrinsicsSearchPaths.emplace_back("s");
-//llvm::append_range(intrinsicsSearchPaths, intrinsicIncludeDirs);
   semanticsContext.set_moduleDirectory(moduleDir)
       .set_moduleFileSuffix(moduleSuffix)
       .set_searchDirectories(includeDirs)

llvm/include/llvm/ADT/SmallVector.h

@@ -1160,7 +1160,7 @@ template <typename T> struct CalculateSmallVectorDefaultInlinedElements {
   // happens on a 32-bit host and then fails due to sizeof(T) *increasing* on a
   // 64-bit host, is expected to be very rare.
   static_assert(
-      sizeof(T) <= 512,
+      sizeof(T) <= 256,
       "You are trying to use a default number of inlined elements for "
       "`SmallVector<T>` but `sizeof(T)` is really big! Please use an "
       "explicit number of inlined elements with `SmallVector<T, N>` to make "

llvm/runtimes/CMakeLists.txt

@@ -525,10 +525,9 @@ if(build_runtimes)
     endforeach()
   endif()
 
-  # TODO: We need to consider passing it as '-DRUNTIMES_x86_64_LLVM_ENABLE_RUNTIMES'.
+  # TODO: Also enable Fortran for per-target runtimes
   if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES AND "flang" IN_LIST LLVM_ENABLE_PROJECTS)
-      #set(LIBOMP_MODULES_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}/flang")
-      list(APPEND extra_args ENABLE_FORTRAN)
+    list(APPEND extra_args ENABLE_FORTRAN)
   endif()
   if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES OR "offload" IN_LIST LLVM_ENABLE_RUNTIMES)
     foreach(dep opt llvm-link llvm-extract clang clang-offload-packager clang-nvlink-wrapper)

openmp/runtime/src/CMakeLists.txt

@@ -464,9 +464,9 @@ flang_module_fortran_enable()
 if (LLVM_TOOL_OPENMP_BUILD AND "flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
   # flang-rt-mod will be created by runtimes
 else ()
-  if (NOT TARGET flang-rt-mod)
-    add_custom_target(flang-rt-mod)
-  endif ()
+  #if (NOT TARGET flang-rt-mod)
+  #  add_custom_target(flang-rt-mod)
+  #endif ()
 endif ()
 
 
@@ -477,9 +477,10 @@ endif ()
     omp_lib.F90
   )
   flang_module_target(libomp-mod)
+   add_dependencies(libomp-mod flang-rt-mod)
 
   libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
-  target_compile_options(libomp-mod PRIVATE   ${LIBOMP_CONFIGURED_FFLAGS})
+  target_compile_options(libomp-mod PRIVATE ${LIBOMP_CONFIGURED_FFLAGS})
 
 
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")

runtimes/CMakeLists.txt

@@ -64,14 +64,6 @@ endfunction()
 
 
 
-# Determine whether we are in the runtimes/runtimes-bins directory of a
-# bootstrapping build.
-set(LLVM_TREE_AVAILABLE OFF)
-if (LLVM_LIBRARY_OUTPUT_INTDIR AND LLVM_RUNTIME_OUTPUT_INTDIR AND PACKAGE_VERSION)
-  set(LLVM_TREE_AVAILABLE ON)
-endif()
-
-
 
 
 find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
@@ -106,12 +98,25 @@ include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(ExtendPath)
 
+
+# Determine whether we are in the runtimes/runtimes-bins directory of a
+# bootstrapping build.
+set(LLVM_TREE_AVAILABLE OFF)
+if (LLVM_LIBRARY_OUTPUT_INTDIR AND LLVM_RUNTIME_OUTPUT_INTDIR AND PACKAGE_VERSION)
+  set(LLVM_TREE_AVAILABLE ON)
+endif()
+message("LLVM_TREE_AVAILABLE=${LLVM_TREE_AVAILABLE} LLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_OUTPUT_INTDIR} LLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_RUNTIME_OUTPUT_INTDIR} PACKAGE_VERSION=${PACKAGE_VERSION}")
+
+
+
+
 # CMake omits default compiler include paths, but in runtimes build, we use
 # -nostdinc and -nostdinc++ and control include paths manually so this behavior
 # is undesirable. Filtering CMAKE_{LANG}_IMPLICIT_INCLUDE_DIRECTORIES to remove
 # paths that are inside the build directory disables this behavior.
 #
 # See https://gitlab.kitware.com/cmake/cmake/-/issues/19227 for further details.
+# FIXME: This assumes compiling libc++, but creates problems for every library that uses the C++ standard library
 
 function(filter_prefixed list prefix outvar)
   foreach(str ${list})
@@ -342,7 +347,7 @@ macro(flang_module_fortran_enable)
       get_clang_resource_dir(RUNTIMES_OUTPUT_RESOURCE_DIR PREFIX "${LLVM_LIBRARY_OUTPUT_INTDIR}/..")
       get_clang_resource_dir(RUNTIMES_INSTALL_RESOURCE_PATH_DEFAULT)
 
-      extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${LIBOMP_OUTPUT_RESOURCE_DIR}" "${toolchain_mod_subdir}")
+      extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${RUNTIMES_OUTPUT_RESOURCE_DIR}" "${toolchain_mod_subdir}")
     else ()
       # In a standalone runtimes build, do not write into LLVM_BINARY_DIR. It may be
       # read-only and/or shared by multiple runtimes with different build
@@ -354,7 +359,7 @@ macro(flang_module_fortran_enable)
       set(RUNTIMES_OUTPUT_RESOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
       set(RUNTIMES_INSTALL_RESOURCE_PATH_DEFAULT "lib${LLVM_LIBDIR_SUFFIX}/clang/${LLVM_VERSION_MAJOR}")
 
-      extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${LIBOMP_OUTPUT_RESOURCE_DIR}" "finclude")
+      extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${RUNTIMES_OUTPUT_RESOURCE_DIR}" "finclude")
     endif ()
     extend_path(RUNTIMES_INSTALL_RESOURCE_MOD_PATH "${RUNTIMES_INSTALL_RESOURCE_PATH}" "${toolchain_mod_subdir}")
   else ()
@@ -379,6 +384,7 @@ endmacro ()
 
 
 function(flang_module_target tgtname)
+message("flang_module_target(${tgtname})")
   if (NOT RUNTIMES_FLANG_MODULES_ENABLED)
     return ()
   endif ()
@@ -388,6 +394,20 @@ function(flang_module_target tgtname)
       Fortran_MODULE_DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}"
   )
 
+message("RUNTIMES_OUTPUT_RESOURCE_MOD_DIR: ${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}")
+  target_compile_options(${tgtname} PRIVATE
+      "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>"
+      "$<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>"
+  )
+
+      set_target_properties(${tgtname}
+        PROPERTIES
+          Fortran_MODULE_DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}"
+          #ARCHIVE_OUTPUT_DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_LIB_DIR}"
+          #LIBRARY_OUTPUT_DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_LIB_DIR}"
+        )
+
+
   # TOOD: Install location
 endfunction ()