Merge pull request #107 from t-kalinowski/tune-gfortran-vectorizer-cost-model

Relax default gfortran vectorizer cost model for quickr builds

Author: t-kalinowski

R/compiler.R

@@ -171,14 +171,36 @@ quickr_prefer_flang <- function(
   FALSE
 }
 
+quickr_default_fortran_makevars_lines <- function(
+  config_value = quickr_r_cmd_config_value
+) {
+  fc <- trimws(config_value("FC"))
+  if (!nzchar(fc)) {
+    return(character())
+  }
+
+  compiler <- strsplit(fc, "\\s+")[[1L]][[1L]]
+  compiler <- basename(compiler)
+  if (!grepl("^gfortran(?:-[0-9]+)?(?:\\.exe)?$", compiler)) {
+    return(character())
+  }
+
+  # GCC 12+ uses a very-cheap vectorizer cost model at -O2. That keeps the
+  # default build conservative for loops like quickr's generated array kernels.
+  # Relaxing the cost model restores the vectorized code path without changing
+  # the compiler or generated Fortran source.
+  "PKG_FFLAGS += -fvect-cost-model=cheap"
+}
+
 quickr_fcompiler_env <- function(
   build_dir,
   which = Sys.which,
   system2 = base::system2,
   write_lines = writeLines,
   sysname = Sys.info()[["sysname"]],
   use_openmp = FALSE,
-  link_flags = character()
+  link_flags = character(),
+  config_value = quickr_r_cmd_config_value
 ) {
   stopifnot(is.character(build_dir), length(build_dir) == 1L, nzchar(build_dir))
 
@@ -234,7 +256,13 @@ quickr_fcompiler_env <- function(
     }
   }
 
-  if (!use_flang && !use_openmp) {
+  default_makevars_lines <- if (use_flang) {
+    character()
+  } else {
+    quickr_default_fortran_makevars_lines(config_value = config_value)
+  }
+
+  if (!use_flang && !use_openmp && !length(default_makevars_lines)) {
     return(character())
   }
 
@@ -249,6 +277,7 @@ quickr_fcompiler_env <- function(
         }
       )
     },
+    default_makevars_lines,
     if (use_openmp) openmp_makevars_lines(),
     if (length(link_flags)) {
       paste("PKG_LIBS +=", paste(link_flags, collapse = " "))

tests/testthat/test-compiler.R

@@ -81,6 +81,35 @@ test_that("quickr_prefer_flang respects quickr.fortran_compiler", {
   expect_false(quickr:::quickr_prefer_flang(sysname = "Darwin"))
 })
 
+test_that("quickr_default_fortran_makevars_lines relaxes gfortran cost model", {
+  expect_equal(
+    quickr:::quickr_default_fortran_makevars_lines(
+      config_value = function(name) {
+        if (identical(name, "FC")) "gfortran -m64" else ""
+      }
+    ),
+    "PKG_FFLAGS += -fvect-cost-model=cheap"
+  )
+
+  expect_equal(
+    quickr:::quickr_default_fortran_makevars_lines(
+      config_value = function(name) {
+        if (identical(name, "FC")) "/usr/bin/gfortran-13" else ""
+      }
+    ),
+    "PKG_FFLAGS += -fvect-cost-model=cheap"
+  )
+
+  expect_identical(
+    quickr:::quickr_default_fortran_makevars_lines(
+      config_value = function(name) {
+        if (identical(name, "FC")) "flang-new" else ""
+      }
+    ),
+    character()
+  )
+})
+
 test_that("quickr_fortran_compiler_option validates values", {
   withr::local_options(quickr.fortran_compiler = "auto")
   expect_null(quickr:::quickr_fortran_compiler_option())
@@ -130,6 +159,28 @@ test_that("quickr_fcompiler_env writes Makevars when flang is usable", {
   expect_true(file.exists(sub("R_MAKEVARS_USER=", "", env, fixed = TRUE)))
 })
 
+test_that("quickr_fcompiler_env writes Makevars for default gfortran flags", {
+  build_dir <- withr::local_tempdir()
+
+  withr::local_options(quickr.fortran_compiler = "gfortran")
+  env <- quickr:::quickr_fcompiler_env(
+    build_dir = build_dir,
+    which = function(cmd) "",
+    system2 = function(...) "",
+    sysname = "Linux",
+    config_value = function(name) {
+      if (identical(name, "FC")) "gfortran -m64" else ""
+    }
+  )
+
+  expect_true(startsWith(env, "R_MAKEVARS_USER="))
+  makevars_path <- sub("^R_MAKEVARS_USER=", "", env)
+  expect_equal(
+    readLines(makevars_path),
+    "PKG_FFLAGS += -fvect-cost-model=cheap"
+  )
+})
+
 test_that("quickr_fcompiler_env errors when flang is explicitly requested but unavailable", {
   build_dir <- withr::local_tempdir()
 
@@ -286,7 +337,8 @@ test_that("quickr_fcompiler_env handles flang unavailable for non-explicit reque
     build_dir = build_dir,
     which = function(x) "",
     system2 = function(...) "",
-    sysname = "Darwin"
+    sysname = "Darwin",
+    config_value = function(name) if (identical(name, "FC")) "clang" else ""
   )
   expect_identical(result, character())
 })
@@ -341,7 +393,8 @@ test_that("quickr_fcompiler_env falls back when flang runtime not found non-expl
     build_dir = build_dir,
     which = function(x) if (x == "flang-new") flang else "",
     system2 = function(...) "",
-    sysname = "Darwin"
+    sysname = "Darwin",
+    config_value = function(name) if (identical(name, "FC")) "clang" else ""
   )
   # Should fall back to character() since runtime not found and not explicit
   expect_identical(result, character())

tests/testthat/test-flang-preference.R

@@ -63,7 +63,8 @@ test_that("quickr_fcompiler_env returns empty when disabled or unavailable", {
   expect_equal(
     quickr:::quickr_fcompiler_env(
       build_dir,
-      which = which
+      which = which,
+      config_value = function(name) if (identical(name, "FC")) "clang" else ""
     ),
     character()
   )
@@ -72,7 +73,8 @@ test_that("quickr_fcompiler_env returns empty when disabled or unavailable", {
   expect_equal(
     quickr:::quickr_fcompiler_env(
       build_dir,
-      which = which
+      which = which,
+      config_value = function(name) if (identical(name, "FC")) "clang" else ""
     ),
     character()
   )