diff options
| author | Andrew W Elble <aweits@rit.edu> | 2021-04-23 17:45:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 14:45:18 -0700 |
| commit | 2b2a26022b9f58f69a2e0c42447b246d3a209886 (patch) | |
| tree | 834fd550b8b11692eefea227c0c204162285cad7 | |
| parent | 94ef4e9eae1da9034bda52f02d1c38495d78e038 (diff) | |
| download | spack-2b2a26022b9f58f69a2e0c42447b246d3a209886.tar.gz spack-2b2a26022b9f58f69a2e0c42447b246d3a209886.tar.bz2 spack-2b2a26022b9f58f69a2e0c42447b246d3a209886.tar.xz spack-2b2a26022b9f58f69a2e0c42447b246d3a209886.zip | |
gcc package: fix build with +nvptx (#23165)
backport of 383400a6078d upstream to allow for cuda@11:
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/package.py | 17 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/nvptx-tools/package.py | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index d584568b8b..1970b1add4 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -131,7 +131,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): depends_on('gnat', when='languages=ada') depends_on('binutils+ld+plugins~libiberty', when='+binutils', type=('build', 'link', 'run')) depends_on('zip', type='build', when='languages=java') - depends_on('cuda@:10', when='+nvptx') + depends_on('cuda', when='+nvptx') # The server is sometimes a bit slow to respond timeout = {'timeout': 60} @@ -148,7 +148,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): # nvptx-tools doesn't have any releases, so grabbing the last commit resource(name='nvptx-tools', git='https://github.com/MentorEmbedded/nvptx-tools', - commit='5f6f343a302d620b0868edab376c00b15741e39e', + commit='d0524fbdc86dfca068db5a21cc78ac255b335be5', when='+nvptx') # TODO: integrate these libraries. @@ -445,6 +445,19 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): '-I{0}'.format(spec['zlib'].prefix.include), 'gcc/Makefile.in') + if spec.satisfies('+nvptx'): + # backport of 383400a6078d upstream to allow support of cuda@11: + filter_file('#define ASM_SPEC "%{misa=*:-m %*}"', + '#define ASM_SPEC "%{misa=*:-m %*; :-m sm_35}"', + 'gcc/config/nvptx/nvptx.h', + string=True) + filter_file('Target RejectNegative ToLower Joined ' + 'Enum(ptx_isa) Var(ptx_isa_option) Init(PTX_ISA_SM30)', + 'Target RejectNegative ToLower Joined ' + 'Enum(ptx_isa) Var(ptx_isa_option) Init(PTX_ISA_SM35)', + 'gcc/config/nvptx/nvptx.opt', + string=True) + # https://gcc.gnu.org/install/configure.html def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/nvptx-tools/package.py b/var/spack/repos/builtin/packages/nvptx-tools/package.py index 42d05cac0a..22c6bb6f08 100644 --- a/var/spack/repos/builtin/packages/nvptx-tools/package.py +++ b/var/spack/repos/builtin/packages/nvptx-tools/package.py @@ -15,6 +15,7 @@ class NvptxTools(AutotoolsPackage): homepage = "https://github.com/MentorEmbedded/nvptx-tools" git = "https://github.com/MentorEmbedded/nvptx-tools" + version('2021-05-21', commit='d0524fbdc86dfca068db5a21cc78ac255b335be5') version('2018-03-01', commit='5f6f343a302d620b0868edab376c00b15741e39e') depends_on('binutils') |