Fix issue where SIR17 could have incorrect fortran version.

If build_tools were installed before speccpu.py (e.g. by installing pip for preprovisioned_data), speccpu.py would override gfortran with --fortran_version (or OS default) instead of the intended --gcc_version.

PiperOrigin-RevId: 936945296

Author: pmkc

perfkitbenchmarker/linux_packages/fortran.py

@@ -15,6 +15,7 @@
 
 import logging
 from absl import flags
+from perfkitbenchmarker import errors
 
 VERSION = flags.DEFINE_integer(
     'fortran_version', None, 'Version of gfortran to install'
@@ -33,7 +34,7 @@ def YumInstall(vm):
     _YumInstallVersion(vm, VERSION.value)
   else:
     vm.InstallPackages('gcc-gfortran libgfortran')
-  _LogFortranVersion(vm)
+  logging.info('Version of fortran: %s', GetFortranVersion(vm))
 
 
 def AptInstall(vm):
@@ -42,7 +43,7 @@ def AptInstall(vm):
     _AptInstallVersion(vm, VERSION.value)
   else:
     vm.InstallPackages('gfortran')
-  _LogFortranVersion(vm)
+  logging.info('Version of fortran: %s', GetFortranVersion(vm))
 
 
 def _YumInstallVersion(vm, version):
@@ -73,7 +74,18 @@ def _AptInstallVersion(vm, version):
   )
 
 
-def _LogFortranVersion(vm):
-  """Logs the version of gfortran."""
-  txt, _ = vm.RemoteCommand('gfortran -dumpversion')
-  logging.info('Version of fortran: %s', txt.strip())
+def GetFortranVersion(vm, required_version_prefix: str | None = None) -> str:
+  """Returns the full version of gfortran e.g. 11.5.0."""
+  txt, _ = vm.RemoteCommand('gfortran -dumpfullversion')
+  version = txt.strip()
+  if not required_version_prefix and VERSION.value:
+    required_version_prefix = str(VERSION.value)
+
+  if required_version_prefix and not version.startswith(
+      required_version_prefix
+  ):
+    raise errors.Benchmarks.PrepareException(
+        f'gfortran version {version} does not match expected version'
+        f' {required_version_prefix}'
+    )
+  return version

perfkitbenchmarker/linux_packages/speccpu.py

@@ -26,6 +26,7 @@
 from perfkitbenchmarker import sample
 from perfkitbenchmarker import stages
 from perfkitbenchmarker.linux_packages import build_tools
+from perfkitbenchmarker.linux_packages import fortran
 
 BASE_MODE = 'base'
 PEAK_MODE = 'peak'
@@ -290,9 +291,10 @@ def InstallSPECCPU(vm, speccpu_vm_state):
 def Install(vm):
   """Installs SPECCPU dependencies."""
   vm.Install('wget')
-  vm.Install('fortran')
   # Install gcc, g++, fortran according to --gcc_version
   vm.Install('build_tools')
+  # Verify fortran is installed correctly
+  fortran.GetFortranVersion(vm, required_version_prefix=FLAGS.gcc_version)
 
   # Install libxcrypt-compat is needed on RHEL 9 based OSes, but not available
   # on RHEL 8 based OSes.
@@ -505,6 +507,7 @@ def _ExtractScore(stdout, vm, keep_partial_results, runspec_metric):
       'spec17_fdo': FLAGS.spec17_fdo,
       'spec17_subset': FLAGS.spec17_subset,
       'gcc_version': build_tools.GetVersion(vm, 'gcc'),
+      'gfortran_version': fortran.GetFortranVersion(vm),
   }
   if cpu_version:
     major, minor = cpu_version

tests/linux_packages/speccpu_test.py

@@ -24,6 +24,7 @@
 from perfkitbenchmarker import test_util
 # from perfkitbenchmarker.linux_benchmarks import speccpu2017_benchmark  # noqa
 from perfkitbenchmarker.linux_packages import build_tools
+from perfkitbenchmarker.linux_packages import fortran
 from perfkitbenchmarker.linux_packages import speccpu
 
 FLAGS = flags.FLAGS
@@ -59,6 +60,7 @@
     'spec17_threads': None,
     'spec17_subset': ['intrate'],
     'gcc_version': '7',
+    'gfortran_version': '7',
 }
 
 EXPECTED_RESULT_SPECINT = [
@@ -603,6 +605,7 @@ class Speccpu2006BenchmarkTestCase(
   def setUp(self):
     super().setUp()
     mock.patch.object(build_tools, 'GetVersion').start().return_value = '7'
+    mock.patch.object(fortran, 'GetFortranVersion').start().return_value = '7'
     mock.patch.object(speccpu, '_GenerateMd5sum').start().return_value = 'abcd'
     self.addCleanup(mock.patch.stopall)