remove diagnostic code and workarounds

Meinersbur · Meinersbur · commit 7133be1c6cfb · 2025-10-30T10:57:53.000+01:00
Leftovers

fixup
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
@@ -6532,6 +6532,7 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
   if (llvm::sys::fs::exists(Twine(P)))
     return std::string(P);
 
+  // With Flang, also look for instrinsic modules
   if (IsFlangMode()) {
     if (std::optional<std::string> IntrPath =
             TC.getDefaultIntrinsicModuleDir()) {
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -1049,7 +1049,8 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA,
 
   // Default intrinsic module dirs must be added after any user-provided
   // -fintrinsic-modules-path to have lower precedence
-  if (auto IntrModPath = TC.getDefaultIntrinsicModuleDir()) {
+  if (std::optional<std::string> IntrModPath =
+          TC.getDefaultIntrinsicModuleDir()) {
     CmdArgs.push_back("-fintrinsic-modules-path");
     CmdArgs.push_back(Args.MakeArgString(*IntrModPath));
   }
diff --git a/cmake/Modules/GetToolchainDirs.cmake b/cmake/Modules/GetToolchainDirs.cmake
@@ -47,9 +47,6 @@ function (get_toolchain_library_subdir outvar)
 endfunction ()
 
 
-
-
-
 # Corresponds to Flang's ToolChain::getDefaultIntrinsicModuleDir().
 function (get_toolchain_module_subdir outvar)
   set(outval "finclude/flang")
diff --git a/flang-rt/CMakeLists.txt b/flang-rt/CMakeLists.txt
@@ -159,7 +159,7 @@ check_cxx_source_compiles(
 # NOTE: Does not work with Flang and CMake < 3.24
 cmake_push_check_state(RESET)
 set(CMAKE_REQUIRED_FLAGS "-ffree-form")
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 check_fortran_source_compiles([[
     subroutine test_quadmath
       real(16) :: var1
@@ -265,4 +265,4 @@ if (FLANG_RT_INCLUDE_TESTS)
   add_subdirectory(unittests)
 else ()
   add_custom_target(check-flang-rt)
-endif()
+endif()
diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
@@ -242,14 +242,20 @@ endif ()
 
 if (NOT WIN32)
   # CMake ignores intrinsic USE dependencies
-  # CMake has an option Fortran_BUILDING_INSTRINSIC_MODULES/Fortran_BUILDING_INTRINSIC_MODULES to disable this behavior, unfortunately it does not work with Ninja (https://gitlab.kitware.com/cmake/cmake/-/issues/26803) 
-  # As a workaround, we build those intrinsic modules first such that the main runtime can depend on it.
+  # CMake has an option Fortran_BUILDING_INSTRINSIC_MODULES/Fortran_BUILDING_INTRINSIC_MODULES
+  # to disable this behavior, unfortunately it does not work with Ninja
+  # (https://gitlab.kitware.com/cmake/cmake/-/issues/26803) 
+  # As a workaround, we build those intrinsic modules first such that the main
+  # runtime can depend on it.
   add_flangrt_library(flang_rt.intrinsics.obj OBJECT
     ${intrinsics_sources}
   )
 
-  # This barrier exists to force all of the intrinsic modules of flang_rt.intrinsics.obj to be built before anything that depends on it.
-  # Without it, CMake/Ninja seem to think that the modules of flang_rt.intrinsics.obj can be built concurrently to those in flang_rt.runtime.
+  # This barrier exists to force all of the intrinsic modules of
+  # flang_rt.intrinsics.obj to be built before anything that depends on it.
+  # Without it, CMake/Ninja seem to think that the modules of
+  # flang_rt.intrinsics.obj can be built concurrently to those in
+  # flang_rt.runtime.
   add_custom_target(flang_rt.intrinsics
     COMMENT "Intrinsic module dependency barrier"
   )
@@ -308,9 +314,8 @@ else()
     endif ()
 
     # Setting an unique Fortran_MODULE_DIRECTORY is required for each variant to
-    # write a different .mod file.
-    # One has to be selected to be the public module that is to be installed.
-    # We select the first.
+    # write a different .mod file. One of them has to be selected to be the
+    # public module that is to be installed. We select the first.
     if (_has_public_intrinsics)
       set(is_public "")
     else ()
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
@@ -273,28 +273,6 @@ 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_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
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
@@ -1540,13 +1540,9 @@ Scope *ModFileReader::Read(SourceName name, std::optional<bool> isIntrinsic,
         sourceFile->path());
     return nullptr;
   } else if (requiredHash && *requiredHash != *checkSum) {
-    std::string s;
-    llvm::raw_string_ostream OS(s);
-    OS << "'"s + name.ToString() + "': "s + sourceFile->path();
-    OS << " Expected: " << llvm::format_hex(*requiredHash, 8)
-       << " Actual: " << llvm::format_hex(*checkSum, 8);
     Say("use", name, ancestorName,
-        "File is not the right module file for %s"_err_en_US, OS.str());
+        "File is not the right module file for %s"_err_en_US,
+        "'"s + name.ToString() + "': "s + sourceFile->path());
     return nullptr;
   }
   llvm::raw_null_ostream NullStream;
diff --git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt
@@ -2,11 +2,31 @@
 # for use by Lit, and delegates to LLVM's lit test handlers.
 add_subdirectory(lib)
 
+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 "Force-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 AND NOT FLANG_STANDALONE_BUILD)
+  set(FLANG_TEST_ENABLE_OPENMP_default ON)
+else ()
+  set(FLANG_TEST_ENABLE_OPENMP_default OFF)
+endif ()
+option(FLANG_TEST_ENABLE_OPENMP "Force-enable tests that require modules from OpenMP" "${FLANG_TEST_ENABLE_OPENMP_default}")
+
+
 llvm_canonicalize_cmake_booleans(
   FLANG_STANDALONE_BUILD
   LLVM_BUILD_EXAMPLES
   LLVM_BYE_LINK_INTO_TOOLS
   LLVM_ENABLE_PLUGINS
+  FLANG_TEST_ENABLE_INTRINSICS
+  FLANG_TEST_ENABLE_OPENMP
 )
 
 set(FLANG_TOOLS_DIR ${FLANG_BINARY_DIR}/bin)
diff --git a/flang/test/Driver/Inputs/ieee_arithmetic.mod b/flang/test/Driver/Inputs/ieee_arithmetic.mod
@@ -1,6 +1,6 @@
 ! DUMMY module
 ! Added for testing purposes. The contents of this file are currently not relevant.
-! Using this file file cause an error because of missing checksum
+! Using this file will cause an error because of missing checksum
 module ieee_arithmetic
 type::ieee_round_type
 integer(1),private::mode=0_1
diff --git a/flang/test/Driver/Inputs/iso_fortran_env.mod b/flang/test/Driver/Inputs/iso_fortran_env.mod
@@ -1,6 +1,6 @@
 ! DUMMY module
 ! Added for testing purposes. The contents of this file are currently not relevant.
-! Using this file file cause an error because of missing checksum
+! Using this file will cause an error because of missing checksum
 module iso_fortran_env
 use __fortran_builtins,only:event_type=>__builtin_event_type
 use __fortran_builtins,only:lock_type=>__builtin_lock_type
diff --git a/flang/test/Driver/pp-fixed-form.f90 b/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"
diff --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
@@ -144,10 +144,12 @@
 if not flang_exe:
     lit_config.fatal(f"Could not identify flang executable")
 
+# Intrinsic paths that are added implicitly by the `flang` driver, but have to be added manually when invoking the frontend `flang -fc1`.
+intrinsics_search_args = []
+
+# Intrinsic paths that are added to `flang` as well as `flang -fc1`.
+extra_intrinsics_search_args = list(config.flang_test_fortran_flags) 
 
-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
@@ -156,77 +158,40 @@ def get_resource_module_intrinsic_dir(modfile):
     flang_intrinsics_dir = os.path.dirname(flang_intrinsics_dir)
     return flang_intrinsics_dir or None
 
-
-
-
-intrinsics_search_args = []
-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 intrinsics_mod_path:
+    intrinsics_search_args += [f"-fintrinsic-modules-path={intrinsics_mod_path}"]
 
-
-#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}")
+openmp_mod_path = get_resource_module_intrinsic_dir("omp_lib.mod")
+if openmp_mod_path and openmp_mod_path != intrinsics_mod_path:
+    intrinsics_search_args += [f"-fintrinsic-modules-path={openmp_mod_path}"]
 
 
 # If intrinsic modules are not available, disable tests unless they are marked as 'module-independent'.
 config.available_features.add("module-independent")
-if config.flang_test_enable_intrinsics:
+if config.flang_test_enable_intrinsics or intrinsics_mod_path:
     config.available_features.add("flangrt-modules")
 else:
-    lit_config.warning(f"Intrinsic modules not available and not in default path: disabling most tests")
+    lit_config.warning(f"Intrinsic modules not in driver default paths: disabling most tests; Use FLANG_TEST_ENABLE_INTRINSICS=ON to force-enable")
     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.flang_test_enable_openmp:
+if config.flang_test_enable_openmp or openmp_mod_path:
     config.available_features.add("openmp_runtime")
-    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}")
 
+    # Search path for omp_lib.h with LLVM_ENABLE_RUNTIMES=openmp
+    # FIXME: Do not hardcode, openmp should write this into the resource directory
+    extra_intrinsics_search_args += ["-I", f"{config.flang_obj_root}/../../runtimes/runtimes-bins/openmp/runtime/src"] 
+else:
+    lit_config.warning(f"OpenMP modules found not in driver default paths: OpenMP tests disabled: Use FLANG_TEST_ENABLE_OPENMP=ON to force-enable")
 
 
+lit_config.note(f"using flang: {flang_exe}")
+lit_config.note(f"using flang implicit search paths: {' '.join(intrinsics_search_args)}")
+lit_config.note(f"using flang extra search paths: {' '.join(extra_intrinsics_search_args)}")
 
 # 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",
@@ -236,25 +201,24 @@ def get_resource_module_intrinsic_dir(modfile):
     ),
     ToolSubst(
         "%flang",
-        command=flang_tool,
+        command=flang_exe,
         extra_args=extra_intrinsics_search_args,
         unresolved="fatal",
     ),
     ToolSubst(
         "%flang_fc1",
-        command=flang_tool,
+        command=flang_exe,
         extra_args=["-fc1"] + intrinsics_search_args + extra_intrinsics_search_args,
         unresolved="fatal",
     ),
-    # Do not implicitly add intrinsic search paths
+    # Variant that does not implicitly add intrinsic search paths
     ToolSubst(
         "%bbc_bare",
         command=FindTool("bbc"),
         unresolved="fatal",
     ),
 ]
 
-
 # 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.
@@ -293,8 +257,7 @@ def get_resource_module_intrinsic_dir(modfile):
 if result:
     config.environment["LIBPGMATH"] = True
 
-
-config.substitutions.append(("%openmp_flags", openmp_flags_substitution))
+config.substitutions.append(("%openmp_flags", "-fopenmp"))
 
 # Add features and substitutions to test F128 math support.
 # %f128-lib substitution may be used to generate check prefixes
diff --git a/flang/test/lit.site.cfg.py.in b/flang/test/lit.site.cfg.py.in
@@ -17,8 +17,8 @@ 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_test_enable_intrinsics = @FLANG_TEST_ENABLE_INTRINSICS@
+config.flang_test_enable_openmp = @FLANG_TEST_ENABLE_OPENMP@
 config.flang_examples = @LLVM_BUILD_EXAMPLES@
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.flang_standalone_build = @FLANG_STANDALONE_BUILD@
diff --git a/flang/tools/bbc/bbc.cpp b/flang/tools/bbc/bbc.cpp
@@ -577,8 +577,9 @@ int main(int argc, char **argv) {
   ProgramName programPrefix;
   programPrefix = argv[0] + ": "s;
 
-  if (includeDirs.size() == 0)
+  if (includeDirs.size() == 0) {
     includeDirs.push_back(".");
+  }
 
   Fortran::parser::Options options;
   options.predefinitions.emplace_back("__flang__"s, "1"s);
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt
diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
diff --git a/openmp/tools/omptest/CMakeLists.txt b/openmp/tools/omptest/CMakeLists.txt
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,8 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA,`
`1049`	`1049`
`1050`	`1050`	`// Default intrinsic module dirs must be added after any user-provided`
`1051`	`1051`	`// -fintrinsic-modules-path to have lower precedence`
`1052`		`- if (auto IntrModPath = TC.getDefaultIntrinsicModuleDir()) {`
	`1052`	`+ if (std::optional<std::string> IntrModPath =`
	`1053`	`+ TC.getDefaultIntrinsicModuleDir()) {`
`1053`	`1054`	`CmdArgs.push_back("-fintrinsic-modules-path");`
`1054`	`1055`	`CmdArgs.push_back(Args.MakeArgString(*IntrModPath));`
`1055`	`1056`	`}`