Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5323 from scivision/pgiflang

Browse Source 
Windows compiler fixes: PGI, Intel
pull/5327/head
Jussi Pakkanen 6 years ago committed by GitHub
parent 60969d99d3 50f2381565
commit 9cd89f55fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 82 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      mesonbuild/compilers/__init__.py
  2. 10
      mesonbuild/compilers/c.py
  3. 15
      mesonbuild/compilers/compilers.py
  4. 13
      mesonbuild/compilers/cpp.py
  5. 4
      mesonbuild/compilers/fortran.py
  6. 62
      mesonbuild/environment.py

4
mesonbuild/compilers/__init__.py
Unescape View File

@ -69,6 +69,8 @@ __all__ = [
'IntelCCompiler', 'IntelCCompiler',
'IntelCPPCompiler', 'IntelCPPCompiler',
'IntelFortranCompiler', 'IntelFortranCompiler',
'IntelClCCompiler',
'IntelClCPPCompiler',
'JavaCompiler', 'JavaCompiler',
'LLVMDCompiler', 'LLVMDCompiler',
'MonoCompiler', 'MonoCompiler',
@ -130,6 +132,7 @@ from .c import (
GnuCCompiler, GnuCCompiler,
ElbrusCCompiler, ElbrusCCompiler,
IntelCCompiler, IntelCCompiler,
IntelClCCompiler,
PGICCompiler, PGICCompiler,
CcrxCCompiler, CcrxCCompiler,
VisualStudioCCompiler, VisualStudioCCompiler,
@ -143,6 +146,7 @@ from .cpp import (
GnuCPPCompiler, GnuCPPCompiler,
ElbrusCPPCompiler, ElbrusCPPCompiler,
IntelCPPCompiler, IntelCPPCompiler,
IntelClCPPCompiler,
PGICPPCompiler, PGICPPCompiler,
CcrxCPPCompiler, CcrxCPPCompiler,
VisualStudioCPPCompiler, VisualStudioCPPCompiler,

10
mesonbuild/compilers/c.py
Unescape View File

@ -1324,9 +1324,9 @@ class GnuCCompiler(GnuCompiler, CCompiler):
class PGICCompiler(PGICompiler, CCompiler): class PGICCompiler(PGICompiler, CCompiler):
def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs) CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
PGICompiler.__init__(self, CompilerType.PGI_STANDARD) PGICompiler.__init__(self, compiler_type)
class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler): class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
@ -1722,6 +1722,12 @@ class ClangClCCompiler(VisualStudioCCompiler):
self.id = 'clang-cl' self.id = 'clang-cl'
class IntelClCCompiler(VisualStudioCCompiler):
def __init__(self, exelist, version, is_cross, exe_wrap, target):
super().__init__(exelist, version, is_cross, exe_wrap, target)
self.id = 'intel'
class ArmCCompiler(ArmCompiler, CCompiler): class ArmCCompiler(ArmCompiler, CCompiler):
def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs) CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)

15
mesonbuild/compilers/compilers.py
Unescape View File

@ -1397,18 +1397,20 @@ class CompilerType(enum.Enum):
CCRX_WIN = 40 CCRX_WIN = 40
PGI_STANDARD = 50 PGI_STANDARD = 50
PGI_OSX = 51
PGI_WIN = 52
@property @property
def is_standard_compiler(self): def is_standard_compiler(self):
return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD') return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD', 'PGI_STANDARD')
@property @property
def is_osx_compiler(self): def is_osx_compiler(self):
return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX') return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX', 'PGI_OSX')
@property @property
def is_windows_compiler(self): def is_windows_compiler(self):
return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN') return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN', 'PGI_WIN')
def get_macos_dylib_install_name(prefix, shlib_name, suffix, soversion): def get_macos_dylib_install_name(prefix, shlib_name, suffix, soversion):
@ -1690,7 +1692,7 @@ class GnuCompiler(GnuLikeCompiler):
class PGICompiler: class PGICompiler:
def __init__(self, compiler_type=None): def __init__(self, compiler_type):
self.id = 'pgi' self.id = 'pgi'
self.compiler_type = compiler_type self.compiler_type = compiler_type
@ -1706,6 +1708,11 @@ class PGICompiler:
def get_no_warn_args(self) -> List[str]: def get_no_warn_args(self) -> List[str]:
return ['-silent'] return ['-silent']
def get_pic_args(self) -> List[str]:
if self.compiler_type.is_osx_compiler or self.compiler_type.is_windows_compiler:
return [] # PGI -fPIC is Linux only.
return ['-fPIC']
def openmp_flags(self) -> List[str]: def openmp_flags(self) -> List[str]:
return ['-mp'] return ['-mp']

13
mesonbuild/compilers/cpp.py
Unescape View File

@ -19,7 +19,7 @@ from .. import coredata
from .. import mlog from .. import mlog
from ..mesonlib import MesonException, version_compare from ..mesonlib import MesonException, version_compare
from .c import CCompiler, VisualStudioCCompiler, ClangClCCompiler from .c import CCompiler, VisualStudioCCompiler, ClangClCCompiler, IntelClCCompiler
from .compilers import ( from .compilers import (
gnu_winlibs, gnu_winlibs,
msvc_winlibs, msvc_winlibs,
@ -238,9 +238,9 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
class PGICPPCompiler(PGICompiler, CPPCompiler): class PGICPPCompiler(PGICompiler, CPPCompiler):
def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs) CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
PGICompiler.__init__(self, CompilerType.PGI_STANDARD) PGICompiler.__init__(self, compiler_type)
class ElbrusCPPCompiler(GnuCPPCompiler, ElbrusCompiler): class ElbrusCPPCompiler(GnuCPPCompiler, ElbrusCompiler):
@ -406,6 +406,13 @@ class ClangClCPPCompiler(VisualStudioCPPCompiler, ClangClCCompiler):
VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target) VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target)
self.id = 'clang-cl' self.id = 'clang-cl'
class IntelClCPPCompiler(VisualStudioCPPCompiler, IntelClCCompiler):
def __init__(self, exelist, version, is_cross, exe_wrap, target):
VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target)
self.id = 'intel'
class ArmCPPCompiler(ArmCompiler, CPPCompiler): class ArmCPPCompiler(ArmCompiler, CPPCompiler):
def __init__(self, exelist, version, compiler_type, is_cross, exe_wrap=None, **kwargs): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrap=None, **kwargs):
CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs) CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)

4
mesonbuild/compilers/fortran.py
Unescape View File

@ -423,9 +423,9 @@ class PathScaleFortranCompiler(FortranCompiler):
class PGIFortranCompiler(PGICompiler, FortranCompiler): class PGIFortranCompiler(PGICompiler, FortranCompiler):
def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwags):
FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags) FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags)
PGICompiler.__init__(self, CompilerType.PGI_STANDARD) PGICompiler.__init__(self, compiler_type)
class FlangFortranCompiler(ClangCompiler, FortranCompiler): class FlangFortranCompiler(ClangCompiler, FortranCompiler):

62
mesonbuild/environment.py
Unescape View File

@ -12,14 +12,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import configparser, os, platform, re, sys, shlex, shutil, subprocess import os, platform, re, sys, shlex, shutil, subprocess
import typing
from . import coredata from . import coredata
from .linkers import ArLinker, ArmarLinker, VisualStudioLinker, DLinker, CcrxLinker from .linkers import ArLinker, ArmarLinker, VisualStudioLinker, DLinker, CcrxLinker
from . import mesonlib from . import mesonlib
from .mesonlib import ( from .mesonlib import (
MesonException, EnvironmentException, MachineChoice, PerMachine, Popen_safe, MesonException, EnvironmentException, MachineChoice, Popen_safe,
) )
from . import mlog from . import mlog
@ -38,7 +37,6 @@ from .compilers import (
is_source, is_source,
) )
from .compilers import ( from .compilers import (
Compiler,
ArmCCompiler, ArmCCompiler,
ArmCPPCompiler, ArmCPPCompiler,
ArmclangCCompiler, ArmclangCCompiler,
@ -62,6 +60,8 @@ from .compilers import (
IntelCCompiler, IntelCCompiler,
IntelCPPCompiler, IntelCPPCompiler,
IntelFortranCompiler, IntelFortranCompiler,
IntelClCCompiler,
IntelClCPPCompiler,
JavaCompiler, JavaCompiler,
MonoCompiler, MonoCompiler,
CudaCompiler, CudaCompiler,
@ -455,11 +455,13 @@ class Environment:
# List of potential compilers. # List of potential compilers.
if mesonlib.is_windows(): if mesonlib.is_windows():
self.default_c = ['cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc'] # Intel C and C++ compiler is icl on Windows, but icc and icpc elsewhere.
self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl', 'pgc++'] self.default_c = ['cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc', 'icl']
# There is currently no pgc++ for Windows, only for Mac and Linux.
self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl', 'icl']
else: else:
self.default_c = ['cc', 'gcc', 'clang', 'pgcc'] self.default_c = ['cc', 'gcc', 'clang', 'pgcc', 'icc']
self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++'] self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++', 'icpc']
if mesonlib.is_windows(): if mesonlib.is_windows():
self.default_cs = ['csc', 'mcs'] self.default_cs = ['csc', 'mcs']
else: else:
@ -467,7 +469,7 @@ class Environment:
self.default_objc = ['cc'] self.default_objc = ['cc']
self.default_objcpp = ['c++'] self.default_objcpp = ['c++']
self.default_d = ['ldc2', 'ldc', 'gdc', 'dmd'] self.default_d = ['ldc2', 'ldc', 'gdc', 'dmd']
self.default_fortran = ['gfortran', 'g95', 'f95', 'f90', 'f77', 'ifort', 'pgfortran'] self.default_fortran = ['gfortran', 'flang', 'pgfortran', 'ifort', 'g95']
self.default_java = ['javac'] self.default_java = ['javac']
self.default_cuda = ['nvcc'] self.default_cuda = ['nvcc']
self.default_rust = ['rustc'] self.default_rust = ['rustc']
@ -676,6 +678,7 @@ class Environment:
arg = '-v' arg = '-v'
else: else:
arg = '--version' arg = '--version'
try: try:
p, out, err = Popen_safe(compiler + [arg]) p, out, err = Popen_safe(compiler + [arg])
except OSError as e: except OSError as e:
@ -684,6 +687,11 @@ class Environment:
if 'ccrx' in compiler[0]: if 'ccrx' in compiler[0]:
out = err out = err
if 'icl' in compiler[0]:
# https://software.intel.com/en-us/cpp-compiler-developer-guide-and-reference-alphabetical-list-of-compiler-options
# https://software.intel.com/en-us/fortran-compiler-developer-guide-and-reference-logo
# most consistent way for ICL is to just let compiler error and tell version
out = err
full_version = out.split('\n', 1)[0] full_version = out.split('\n', 1)[0]
version = search_version(out) version = search_version(out)
@ -769,19 +777,29 @@ class Environment:
target = 'x86' target = 'x86'
cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler
return cls(compiler, version, is_cross, exe_wrap, target) return cls(compiler, version, is_cross, exe_wrap, target)
if 'PGI Compilers' in out: if 'PGI Compilers' in out:
if mesonlib.for_darwin(is_cross, self):
compiler_type = CompilerType.PGI_OSX
elif mesonlib.for_windows(is_cross, self):
compiler_type = CompilerType.PGI_WIN
else:
compiler_type = CompilerType.PGI_STANDARD
cls = PGICCompiler if lang == 'c' else PGICPPCompiler cls = PGICCompiler if lang == 'c' else PGICPPCompiler
return cls(ccache + compiler, version, is_cross, exe_wrap) return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap)
if '(ICC)' in out: if '(ICC)' in out:
if mesonlib.for_darwin(want_cross, self): if mesonlib.for_darwin(want_cross, self):
compiler_type = CompilerType.ICC_OSX compiler_type = CompilerType.ICC_OSX
elif mesonlib.for_windows(want_cross, self): elif mesonlib.for_windows(want_cross, self):
# TODO: fix ICC on Windows raise EnvironmentException('At the time of authoring, there was no ICC for Windows')
compiler_type = CompilerType.ICC_WIN
else: else:
compiler_type = CompilerType.ICC_STANDARD compiler_type = CompilerType.ICC_STANDARD
cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler
return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version)
if out.startswith('Intel(R) C++') and mesonlib.for_windows(want_cross, self):
cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler
target = 'x64' if 'Intel(R) 64 Compiler' in out else 'x86'
return cls(compiler, version, is_cross, exe_wrap, target)
if 'ARM' in out: if 'ARM' in out:
compiler_type = CompilerType.ARM_WIN compiler_type = CompilerType.ARM_WIN
cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler
@ -846,6 +864,13 @@ class Environment:
popen_exceptions[' '.join(compiler + [arg])] = e popen_exceptions[' '.join(compiler + [arg])] = e
continue continue
if mesonlib.for_windows(is_cross, self):
if 'ifort' in compiler[0]:
# https://software.intel.com/en-us/cpp-compiler-developer-guide-and-reference-alphabetical-list-of-compiler-options
# https://software.intel.com/en-us/fortran-compiler-developer-guide-and-reference-logo
# most consistent way for ICL is to just let compiler error and tell version
out = err
version = search_version(out) version = search_version(out)
full_version = out.split('\n', 1)[0] full_version = out.split('\n', 1)[0]
@ -876,14 +901,20 @@ class Environment:
version = search_version(err) version = search_version(err)
return SunFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) return SunFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'ifort (IFORT)' in out: if 'ifort (IFORT)' in out or out.startswith('Intel(R) Visual Fortran'):
return IntelFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) return IntelFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'PathScale EKOPath(tm)' in err: if 'PathScale EKOPath(tm)' in err:
return PathScaleFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) return PathScaleFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'PGI Compilers' in out: if 'PGI Compilers' in out:
return PGIFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) if mesonlib.for_darwin(is_cross, self):
compiler_type = CompilerType.PGI_OSX
elif mesonlib.for_windows(is_cross, self):
compiler_type = CompilerType.PGI_WIN
else:
compiler_type = CompilerType.PGI_STANDARD
return PGIFortranCompiler(compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version)
if 'flang' in out or 'clang' in out: if 'flang' in out or 'clang' in out:
return FlangFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) return FlangFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
@ -1039,7 +1070,8 @@ class Environment:
# up to date language version at time (2016). # up to date language version at time (2016).
if exelist is not None: if exelist is not None:
if os.path.basename(exelist[-1]).startswith(('ldmd', 'gdmd')): if os.path.basename(exelist[-1]).startswith(('ldmd', 'gdmd')):
raise EnvironmentException('Meson doesn\'t support %s as it\'s only a DMD frontend for another compiler. Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.' % exelist[-1]) raise EnvironmentException('Meson does not support {} as it is only a DMD frontend for another compiler.'
'Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.'.format(exelist[-1]))
else: else:
for d in self.default_d: for d in self.default_d:
if shutil.which(d): if shutil.which(d):

Write Preview
Loading…
Cancel
Save