Cleanup switching on/off tests

Author: Meinersbur

cmake/Modules/GetToolchainDirs.cmake

@@ -47,6 +47,9 @@ function (get_toolchain_library_subdir outvar)
 endfunction ()
 
 
+
+
+
 # Corresponds to Flang's ToolChain::getDefaultIntrinsicModuleDir().
 function (get_toolchain_module_subdir outvar)
   set(outval "finclude")

flang/CMakeLists.txt

@@ -273,7 +273,28 @@ set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
     "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')")
 mark_as_advanced(FLANG_TOOLS_INSTALL_DIR)
 
-set(FLANG_INTRINSIC_MODULES_DIR "" CACHE PATH "Additional search path for modules; needed for running all tests if not building flang-rt in a bootstrapping build")
+#set(FLANG_INTRINSIC_MODULES_DIR "" CACHE PATH "Additional search path for modules; needed for running all tests if not building flang-rt in a bootstrapping build")
+#set(FLANG_TEST_FLANG_RT_Fortran_FLAGS "" CACHE STRING "Additional flags that makes Flang find the Flang-RT modules during testing; typically -fintrinsic-modules-path=<path>")
+#set(FLANG_TEST_OPENMP_Fortran_FLAGS "" CACHE STRING "Additional flags that makes Flang find the OpenMP modules during testing; typically -fintrinsic-modules-path=<path>")
+
+set(FLANG_TEST_Fortran_FLAGS "" CACHE STRING "Additional Fortran flags for running tests, such as -fintrinsic-modules-path=<path>")
+
+if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
+  set(FLANG_TEST_ENABLE_INTRINSICS_default ON)
+else ()
+  set(FLANG_TEST_ENABLE_INTRINSICS_default OFF)
+endif ()
+option(FLANG_TEST_ENABLE_INTRINSICS "Enable tests that require intrinsic modules from Flang-RT" "${FLANG_TEST_ENABLE_INTRINSICS_default}")
+
+
+if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES AND FLANG_TEST_ENABLE_INTRINSICS)
+  set(FLANG_TEST_ENABLE_OPENMP_default ON)
+else ()
+  set(FLANG_TEST_ENABLE_OPENMP_default OFF)
+endif ()
+option(FLANG_TEST_ENABLE_OPENMP "Enable tests that require modules from OpenMP" "${FLANG_TEST_ENABLE_OPENMP_default}")
+
+
 set(FLANG_INCLUDE_DIR ${FLANG_BINARY_DIR}/include)
 
 # TODO: Remove when libclangDriver is lifted out of Clang

flang/test/Driver/pp-fixed-form.f90

@@ -8,12 +8,12 @@
 
 !RUN: %flang -save-temps -### -ffree-form %S/Inputs/free-form-test.f90  2>&1 | FileCheck %s --check-prefix=FREE-FLAG
 FREE-FLAG:           "-fc1" {{.*}} "-o" "free-form-test.i" {{.*}} "-x" "f95" "{{.*}}/free-form-test.f90"
-FREE-FLAG-NEXT:      "-fc1" {{.*}} "-emit-llvm-bc" "-ffree-form"
+FREE-FLAG-NEXT:      "-fc1" {{.*}} "-emit-llvm-bc" {{.*}} "-ffree-form"
 FREE-FLAG-NOT:       "-ffixed-form"
 FREE-FLAG-SAME:      "-x" "f95-cpp-input" "free-form-test.i"
 
 !RUN: %flang -save-temps -### -ffixed-form %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FIXED-FLAG
 FIXED-FLAG:          "-fc1" {{.*}} "-o" "fixed-form-test.i" {{.*}} "-x" "f95" "{{.*}}/fixed-form-test.f"
-FIXED-FLAG-NEXT:     "-fc1" {{.*}} "-emit-llvm-bc" "-ffixed-form"
+FIXED-FLAG-NEXT:     "-fc1" {{.*}} "-emit-llvm-bc" {{.*}} "-ffixed-form"
 FIXED-FLAG-NOT:      "-ffixed-form"
 FIXED-FLAG-SAME:     "-x" "f95-cpp-input" "fixed-form-test.i"

flang/test/lit.cfg.py

@@ -145,65 +145,88 @@
     lit_config.fatal(f"Could not identify flang executable")
 
 
-def get_resource_module_intrinsic_dir():
+print(f"{config.flang_test_fortran_flags=}")
+print(f"{config.flang_test_enable_intrinsics=}")
+print(f"{config.flang_test_enable_openmp=}")
+
+def get_resource_module_intrinsic_dir(modfile):
     # Determine the intrinsic module search path that is added by the driver. If
     # skipping the driver using -fc1, we need to append the path manually.
-    for modfile in ["__fortran_builtins.mod", "omp_lib.mod"]:
-      flang_intrinsics_dir = subprocess.check_output([flang_exe, f"-print-file-name={modfile}"], text=True).strip()
-      flang_intrinsics_dir = os.path.dirname(flang_intrinsics_dir)
-      if flang_intrinsics_dir:
-          return flang_intrinsics_dir
-    return None
+    flang_intrinsics_dir = subprocess.check_output([flang_exe, *config.flang_test_fortran_flags, f"-print-file-name={modfile}"], text=True).strip()
+    flang_intrinsics_dir = os.path.dirname(flang_intrinsics_dir)
+    return flang_intrinsics_dir or None
+
+
 
 
 intrinsics_search_args = []
-if flang_intrinsics_dir := get_resource_module_intrinsic_dir():
-    intrinsics_search_args += [f"-fintrinsic-modules-path={flang_intrinsics_dir}"]
-    lit_config.note(f"using default module intrinsics: {flang_intrinsics_dir}")
-
-
-extra_intrinsics_search_args = []
-if config.flang_intrinsic_modules_dir:
-    extra_intrinsics_search_args += [
-        f"-fintrinsic-modules-path={config.flang_intrinsic_modules_dir}"
-    ]
-    lit_config.note(
-        f"using extra module intrinsics: {config.flang_intrinsic_modules_dir}"
-    )
+extra_intrinsics_search_args = config.flang_test_fortran_flags + ["-I", f"{config.flang_obj_root}/../../runtimes/runtimes-bins/openmp/runtime/src"] # FIXME:
+
+intrinsics_mod_path = get_resource_module_intrinsic_dir("__fortran_builtins.mod")
+openmp_mod_path = get_resource_module_intrinsic_dir("omp_lib.mod")
+openmp_inc_path = get_resource_module_intrinsic_dir("omp_lib.h")
+print(f"{intrinsics_mod_path=}")
+print(f"{openmp_mod_path=}")
+print(f"{openmp_inc_path=}")
+if mod_path := intrinsics_mod_path or openmp_mod_path:
+    intrinsics_search_args += [f"-fintrinsic-modules-path={mod_path}"]
+    lit_config.note(f"using flang default module intrinsics: {mod_path}")
+
+
+if extra_intrinsics_search_args:
+    lit_config.note(f"using flang extra arguments: {' '.join(extra_intrinsics_search_args)}")
+
+
+
+#if config.flang_intrinsic_modules_dir:
+#    extra_intrinsics_search_args += [f"-fintrinsic-modules-path={config.flang_intrinsic_modules_dir}"]
+#    lit_config.note(f"using extra module intrinsics: {config.flang_intrinsic_modules_dir}")
+
 
 # If intrinsic modules are not available, disable tests unless they are marked as 'module-independent'.
 config.available_features.add("module-independent")
-if config.have_flangrt_mod or config.flang_intrinsic_modules_dir:
+if config.flang_test_enable_intrinsics:
     config.available_features.add("flangrt-modules")
 else:
-    lit_config.warning(f"Intrinsic modules not available: disabling most tests")
+    lit_config.warning(f"Intrinsic modules not available and not in default path: disabling most tests")
     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 'flangrt-modules' not in config.available_features:
-    # OpenMP modules depend on Flang-RT modules
-    pass
-elif not config.have_openmp_rtl:
-    lit_config.warning(f"OpenMP runtime library not available: OpenMP tests disabled")
-elif not config.openmp_module_dir:
-    lit_config.warning(f"OpenMP modules not available: OpenMP tests disabled")
-else:
-    # For the enabled OpenMP tests, add a substitution that is needed in the tests to find
-    # the omp_lib.{h,mod} files, depending on whether the OpenMP runtime was built as a
-    # project or runtime. If not in the compiler resources module directory like the other intrinsic modules, we must add it to the path.
+if config.flang_test_enable_openmp:
     config.available_features.add("openmp_runtime")
-    extra_intrinsics_search_args += [
-        f"-fintrinsic-modules-path={config.openmp_module_dir}"
-    ]
-    lit_config.note(f"using OpenMP modules: {config.openmp_module_dir}")
+    lit_config.note(f"OpenMP tests enabled")
+else:
+    lit_config.warning(f"OpenMP tests disabled: FLANG_TEST_ENABLE_OPENMP option no set and omp_lib.mod not in resource path")
+
+
+
+#if 'flangrt-modules' not in config.available_features:
+#    # OpenMP modules depend on Flang-RT modules
+#    pass
+#elif not config.have_openmp_rtl:
+#    lit_config.warning(f"OpenMP runtime library not available: OpenMP tests disabled")
+#elif not config.openmp_module_dir:
+#    lit_config.warning(f"OpenMP modules not available: OpenMP tests disabled")
+#elif openmp_mod_path:
+#    # For the enabled OpenMP tests, add a substitution that is needed in the tests to find
+#    # the omp_lib.{h,mod} files, depending on whether the OpenMP runtime was built as a
+#    # project or runtime. If not in the compiler resources module directory like the other intrinsic modules, we must add it to the path.
+#    config.available_features.add("openmp_runtime")
+#    extra_intrinsics_search_args += [
+#        f"-fintrinsic-modules-path={config.openmp_module_dir}"
+#    ]
+#    lit_config.note(f"using OpenMP modules: {config.openmp_module_dir}")
 
 
 
 
 # For each occurrence of a flang tool name, replace it with the full path to
 # the build directory holding that tool.
+flang_tool = FindTool("flang")
+#lit_config.note(f"using flang: {flang_tool.command}")
 tools = [
     ToolSubst(
         "bbc",
@@ -213,13 +236,13 @@ def get_resource_module_intrinsic_dir():
     ),
     ToolSubst(
         "%flang",
-        command=FindTool("flang"),
+        command=flang_tool,
         extra_args=extra_intrinsics_search_args,
         unresolved="fatal",
     ),
     ToolSubst(
         "%flang_fc1",
-        command=FindTool("flang"),
+        command=flang_tool,
         extra_args=["-fc1"] + intrinsics_search_args + extra_intrinsics_search_args,
         unresolved="fatal",
     ),
@@ -231,6 +254,7 @@ def get_resource_module_intrinsic_dir():
     ),
 ]
 
+
 # Flang has several unimplemented features. TODO messages are used to mark
 # and fail if these features are exercised. Some TODOs exit with a non-zero
 # exit code, but others abort the execution in assert builds.

flang/test/lit.site.cfg.py.in

@@ -13,10 +13,12 @@ config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
 config.flang_obj_root = "@FLANG_BINARY_DIR@"
 config.flang_tools_dir = lit_config.substitute("@FLANG_TOOLS_DIR@")
-config.flang_intrinsic_modules_dir = "@FLANG_INTRINSIC_MODULES_DIR@"
 config.flang_headers_dir = "@HEADER_BINARY_DIR@"
 config.flang_llvm_tools_dir = "@CMAKE_BINARY_DIR@/bin"
 config.flang_test_triple = "@FLANG_TEST_TARGET_TRIPLE@"
+config.flang_test_fortran_flags = "@FLANG_TEST_Fortran_FLAGS@".split()
+config.flang_test_enable_intrinsics = lit.util.pythonize_bool("@FLANG_TEST_ENABLE_INTRINSICS@")
+config.flang_test_enable_openmp = lit.util.pythonize_bool("@FLANG_TEST_ENABLE_OPENMP@")
 config.flang_examples = @LLVM_BUILD_EXAMPLES@
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.flang_standalone_build = @FLANG_STANDALONE_BUILD@
@@ -25,12 +27,6 @@ config.linked_bye_extension = @LLVM_BYE_LINK_INTO_TOOLS@
 config.osx_sysroot = path(r"@CMAKE_OSX_SYSROOT@")
 config.targets_to_build = "@TARGETS_TO_BUILD@"
 config.default_sysroot = "@DEFAULT_SYSROOT@"
-config.have_flangrt_mod = ("flang-rt" in "@LLVM_ENABLE_RUNTIMES@".lower().split(";"))
-config.have_openmp_rtl = ("@LLVM_TOOL_OPENMP_BUILD@" == "TRUE") or ("openmp" in "@LLVM_ENABLE_RUNTIMES@".lower().split(";"))
-if "openmp" in "@LLVM_ENABLE_RUNTIMES@".lower().split(";"):
-    config.openmp_module_dir = "@CMAKE_BINARY_DIR@/runtimes/runtimes-bins/openmp/runtime/src"
-else:
-    config.openmp_module_dir = None
 config.flang_runtime_f128_math_lib = "@FLANG_RUNTIME_F128_MATH_LIB@"
 config.have_ldbl_mant_dig_113 = "@HAVE_LDBL_MANT_DIG_113@"
 

llvm/runtimes/CMakeLists.txt

@@ -287,6 +287,7 @@ function(runtime_default_target)
                                                 CUDA CMAKE_CUDA # For runtimes that may look for the CUDA compiler and/or SDK (libc, offload, flang-rt)
                                                 FFI # offload uses libffi
                                                 FLANG_RUNTIME # Shared between Flang and Flang-RT
+                                                LIBOMP
                                                 ${ARG_PREFIXES}
                            EXTRA_TARGETS ${extra_targets}
                                          ${test_targets}

openmp/runtime/src/CMakeLists.txt

@@ -365,6 +365,8 @@ if(WIN32)
   endif()
 endif()
 
+
+
 # Building the Fortran module files
 # One compilation step creates both omp_lib.mod and omp_lib_kinds.mod
 configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var omp_lib.h @ONLY)
@@ -468,7 +470,7 @@ if(LLVM_RUNTIMES_BUILD AND RUNTIMES_FLANG_MODULES_ENABLED)
   if (FORTRAN_MODULE_DEPS)
     add_dependencies(libomp-mod ${FORTRAN_MODULE_DEPS})
   endif ()
-  
+
   set (destination ${LIBOMP_HEADERS_INSTALL_PATH})
   if (NOT ${LIBOMP_MODULES_INSTALL_PATH} STREQUAL "")
     set (destination ${LIBOMP_MODULES_INSTALL_PATH})

openmp/tools/omptest/CMakeLists.txt

@@ -21,6 +21,8 @@ if((NOT ${LIBOMP_OMPT_SUPPORT}) OR (NOT ${LLVM_INCLUDE_TESTS}))
 endif()
 
 include(CMakePackageConfigHelpers)
+find_package(ZLIB)
+message("ZLIB_FOUND: ${ZLIB_FOUND}")
 
 include_directories(${LIBOMP_INCLUDE_DIR})
 

runtimes/CMakeLists.txt

@@ -400,10 +400,10 @@ macro (flang_module_fortran_enable)
 
   include(CheckLanguage)
   check_language(Fortran)
-  
+
   if (CMAKE_Fortran_COMPILER)
     enable_language(Fortran)
-    
+
     if (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang" AND "flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
       # In a bootstrapping build, the intrinsic modules are not built yet.
       # Targets can depend on flang-rt-mod to ensure they are built before.
@@ -412,9 +412,12 @@ macro (flang_module_fortran_enable)
       message(STATUS "${LLVM_SUBPROJECT_TITLE}: Building Fortran modules for Flang bootstrapping itself")
     else ()
       # Check whether building modules works, avoid causing the entire build to fail because of Fortran.
-      # The primary situation we want to support here is Flang or its intrinsic modules were built in a non-bootstrapping build separately.
+      # The primary situation we want to support here is Flang or its intrinsic modules were built separately in a non-bootstrapping build.
       cmake_push_check_state(RESET)
       set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
+      #set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ")
+      message("CMAKE_Fortran_FLAGS: ${CMAKE_Fortran_FLAGS}")
+      message("CMAKE_REQUIRED_FLAGS: ${CMAKE_REQUIRED_FLAGS}")
       check_fortran_source_compiles("
         subroutine testroutine
           use iso_c_binding
@@ -431,9 +434,9 @@ macro (flang_module_fortran_enable)
   else ()
     message(STATUS "Not compiling Flang modules: Fortran not enabled")
   endif ()
-  
+
   option(RUNTIMES_FLANG_MODULES_ENABLED "Build Fortran modules" "${RUNTIMES_FLANG_MODULES_ENABLED_default}")
-  
+
   if (RUNTIMES_FLANG_MODULES_ENABLED)
     if (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
       get_toolchain_module_subdir(toolchain_mod_subdir)