FLANG_TEST_ENABLE_INTRINSICS -> FLANG_TEST_ENABLE_MODULES

Author: Meinersbur

flang/test/CMakeLists.txt

@@ -5,14 +5,14 @@ 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)
+  set(FLANG_TEST_ENABLE_MODULES_default ON)
 else ()
-  set(FLANG_TEST_ENABLE_INTRINSICS_default OFF)
+  set(FLANG_TEST_ENABLE_MODULES_default OFF)
 endif ()
-option(FLANG_TEST_ENABLE_INTRINSICS "Force-enable tests that require intrinsic modules from Flang-RT" "${FLANG_TEST_ENABLE_INTRINSICS_default}")
+option(FLANG_TEST_ENABLE_MODULES "Force-enable tests that require intrinsic modules from Flang-RT" "${FLANG_TEST_ENABLE_MODULES_default}")
 
 
-if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES AND FLANG_TEST_ENABLE_INTRINSICS AND NOT FLANG_STANDALONE_BUILD)
+if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES AND FLANG_TEST_ENABLE_MODULES AND NOT FLANG_STANDALONE_BUILD)
   set(FLANG_TEST_ENABLE_OPENMP_default ON)
 else ()
   set(FLANG_TEST_ENABLE_OPENMP_default OFF)
@@ -25,7 +25,7 @@ llvm_canonicalize_cmake_booleans(
   LLVM_BUILD_EXAMPLES
   LLVM_BYE_LINK_INTO_TOOLS
   LLVM_ENABLE_PLUGINS
-  FLANG_TEST_ENABLE_INTRINSICS
+  FLANG_TEST_ENABLE_MODULES
   FLANG_TEST_ENABLE_OPENMP
 )
 

flang/test/lit.cfg.py

@@ -169,10 +169,10 @@ def get_resource_module_intrinsic_dir(modfile):
 
 # 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 or intrinsics_mod_path:
+if config.flang_test_enable_modules or intrinsics_mod_path:
     config.available_features.add("flangrt-modules")
 else:
-    lit_config.warning(f"Intrinsic modules not in driver default paths: disabling most tests; Use FLANG_TEST_ENABLE_INTRINSICS=ON to force-enable")
+    lit_config.warning(f"Intrinsic modules not in driver default paths: disabling most tests; Use FLANG_TEST_ENABLE_MODULES=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)
@@ -181,7 +181,7 @@ def get_resource_module_intrinsic_dir(modfile):
 
     # Search path for omp_lib.h with LLVM_ENABLE_RUNTIMES=openmp
     # FIXME: openmp should write this file into the resource directory
-    extra_intrinsics_search_args += ["-I", f"{config.flang_obj_root}/../../runtimes/runtimes-bins/openmp/runtime/src"] 
+    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")
 

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

@@ -17,7 +17,7 @@ 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 = @FLANG_TEST_ENABLE_INTRINSICS@
+config.flang_test_enable_modules = @FLANG_TEST_ENABLE_MODULES@
 config.flang_test_enable_openmp = @FLANG_TEST_ENABLE_OPENMP@
 config.flang_examples = @LLVM_BUILD_EXAMPLES@
 config.python_executable = "@PYTHON_EXECUTABLE@"