Skip to content

use -march=x86-64 -mtune=generic instead of -xSSE2 when using Intel oneAPI compilers #4147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 27, 2022
Merged

use -march=x86-64 -mtune=generic instead of -xSSE2 when using Intel oneAPI compilers #4147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1fa1a1
use -march=x86-64 -mtune=generic instead of -xSSE2 when using Intel o…
boegel Dec 21, 2022
621f207
make test_optarch_generic aware of change in compiler options for one…
boegel Dec 21, 2022
32b7adb
Merge branch 'develop' into oneapi_generic
bartoldeman Dec 22, 2022
848293d
test both with old/recent version of intel-compilers and with/without…
boegel Dec 24, 2022
63099bf
only take into account oneapi_c_cxx/oneapi_fortran toolchain options …
boegel Dec 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions easybuild/toolchains/compiler/intel_compilers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"""
import os

import easybuild.tools.systemtools as systemtools
from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
from easybuild.tools import LooseVersion
from easybuild.tools.toolchain.compiler import Compiler
Expand All @@ -42,7 +43,7 @@ class IntelCompilers(IntelIccIfort):
COMPILER_MODULE_NAME = ['intel-compilers']
COMPILER_UNIQUE_OPTS = dict(IntelIccIfort.COMPILER_UNIQUE_OPTS)
COMPILER_UNIQUE_OPTS.update({
'oneapi': (False, "Use oneAPI compilers icx/icpx/ifx instead of classic compilers"),
'oneapi': (None, "Use oneAPI compilers icx/icpx/ifx instead of classic compilers"),
'oneapi_c_cxx': (None, "Use oneAPI C/C++ compilers icx/icpx instead of classic Intel C/C++ compilers "
"(auto-enabled for Intel compilers version 2022.2.0, or newer)"),
'oneapi_fortran': (False, "Use oneAPI Fortran compiler ifx instead of classic Intel Fortran compiler"),
Expand Down Expand Up @@ -75,7 +76,8 @@ def set_variables(self):
if self.options.get('oneapi_c_cxx', None) is None:
self.options['oneapi_c_cxx'] = True

if self.options.get('oneapi', False):
oneapi_tcopt = self.options.get('oneapi')
if oneapi_tcopt:
oneapi = True
self.COMPILER_CXX = 'icpx'
self.COMPILER_CC = 'icx'
Expand All @@ -84,7 +86,7 @@ def set_variables(self):
self.COMPILER_FC = 'ifx'

# if both 'oneapi' and 'oneapi_*' are set, the latter are ignored
else:
elif oneapi_tcopt is None:
if self.options.get('oneapi_c_cxx', False):
oneapi = True
self.COMPILER_CC = 'icx'
Expand All @@ -108,5 +110,12 @@ def set_variables(self):
# recommended in porting guide
self.options.options_map['openmp'] = ['fiopenmp']

# -xSSE2 is not supported by Intel oneAPI compilers,
# so use -march=x86-64 -mtune=generic when using optarch=GENERIC
self.COMPILER_GENERIC_OPTION = {
(systemtools.X86_64, systemtools.AMD): 'march=x86-64 -mtune=generic',
(systemtools.X86_64, systemtools.INTEL): 'march=x86-64 -mtune=generic',
}

# skip IntelIccIfort.set_variables (no longer relevant for recent versions)
Compiler.set_variables(self)
42 changes: 31 additions & 11 deletions test/framework/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,29 +702,49 @@ def test_override_optarch(self):

def test_optarch_generic(self):
"""Test whether --optarch=GENERIC works as intended."""

intel_generic_flags_classic = "-xSSE2 -ftz -fp-speculation=safe -fp-model source"
intel_generic_flags_oneapi_old = "-march=x86-64 -mtune=generic -fp-speculation=safe -fp-model precise"
intel_generic_flags_oneapi_new = "-march=x86-64 -mtune=generic -ftz -fp-speculation=safe -fp-model precise"

for generic in [False, True]:
if generic:
init_config(build_options={'optarch': 'GENERIC', 'silent': True})
flag_vars = ['CFLAGS', 'CXXFLAGS', 'FCFLAGS', 'FFLAGS', 'F90FLAGS']
tcs = {
'gompi': ('2018a', "-march=x86-64 -mtune=generic"),
'iccifort': ('2018.1.163', "-xSSE2 -ftz -fp-speculation=safe -fp-model source"),
'intel-compilers': ('2021.4.0', "-xSSE2 -fp-speculation=safe -fp-model precise"),
'gompi': ('2018a', "-march=x86-64 -mtune=generic", {}),
'iccifort': ('2018.1.163', "-xSSE2 -ftz -fp-speculation=safe -fp-model source", {}),
# check generic compiler flags for old versions of intel-compilers with/without opting in to oneapi
'intel-compilers@old-default': ('2021.4.0', intel_generic_flags_classic, {}),
'intel-compilers@old-oneapi-false': ('2021.4.0', intel_generic_flags_classic, {'oneapi': False}),
'intel-compilers@old-oneapi-true': ('2021.4.0', intel_generic_flags_oneapi_old, {'oneapi': True}),
# check generic compiler flags for recent versions of intel-compilers with/without opting in to oneapi
'intel-compilers@new-default': ('2022.2.0', intel_generic_flags_oneapi_new, {}),
'intel-compilers@new-oneapi-true': ('2022.2.0', intel_generic_flags_oneapi_new, {'oneapi': True}),
'intel-compilers@new-oneapi-false': ('2022.2.0', intel_generic_flags_classic, {'oneapi': False}),
}
for tcopt_optarch in [False, True]:
for tcname in tcs:
tcversion, generic_flags = tcs[tcname]
for key in tcs:
tcname = key.split('@')[0]
tcversion, generic_flags, custom_tcopts = tcs[key]
tc = self.get_toolchain(tcname, version=tcversion)
if tcname == 'intel-compilers':
tc.set_options({'optarch': tcopt_optarch, 'oneapi': True})
else:
tc.set_options({'optarch': tcopt_optarch})

tcopts = {'optarch': tcopt_optarch}
tcopts.update(custom_tcopts)
tc.set_options(tcopts)

tc.prepare()
for var in flag_vars:
val = tc.get_variable(var)
tup = (key, tcversion, tcopts, generic_flags, val)
if generic:
self.assertTrue(generic_flags in tc.get_variable(var))
error_msg = "(%s, %s, %s) '%s' flags should be found in: '%s'"
self.assertTrue(generic_flags in val, error_msg % tup)
else:
self.assertFalse(generic_flags in tc.get_variable(var))
error_msg = "(%s, %s, %s) '%s' flags should not be found in: '%s'"
self.assertFalse(generic_flags in val, error_msg % tup)

modules.modules_tool().purge()

def test_optarch_aarch64_heuristic(self):
"""Test whether AArch64 pre-GCC-6 optimal architecture flag heuristic works."""
Expand Down