hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gcc package: fix build with +nvptx (#23165)

Browse source 
backport of 383400a6078d upstream to allow for cuda@11:
This commit is contained in:
Andrew W Elble 2021-04-23 17:45:18 -04:00 committed by GitHub
parent 94ef4e9eae
commit 2b2a26022b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
var/spack/repos/builtin/packages/gcc/package.py
View file

@ -131,7 +131,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
depends_on('gnat', when='languages=ada') depends_on('gnat', when='languages=ada')
depends_on('binutils+ld+plugins~libiberty', when='+binutils', type=('build', 'link', 'run')) depends_on('binutils+ld+plugins~libiberty', when='+binutils', type=('build', 'link', 'run'))
depends_on('zip', type='build', when='languages=java') 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 # The server is sometimes a bit slow to respond
timeout = {'timeout': 60} timeout = {'timeout': 60}
@ -148,7 +148,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
# nvptx-tools doesn't have any releases, so grabbing the last commit # nvptx-tools doesn't have any releases, so grabbing the last commit
resource(name='nvptx-tools', resource(name='nvptx-tools',
git='https://github.com/MentorEmbedded/nvptx-tools', git='https://github.com/MentorEmbedded/nvptx-tools',
commit='5f6f343a302d620b0868edab376c00b15741e39e', commit='d0524fbdc86dfca068db5a21cc78ac255b335be5',
when='+nvptx') when='+nvptx')
# TODO: integrate these libraries. # TODO: integrate these libraries.
@ -445,6 +445,19 @@ def patch(self):
'-I{0}'.format(spec['zlib'].prefix.include), '-I{0}'.format(spec['zlib'].prefix.include),
'gcc/Makefile.in') '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 # https://gcc.gnu.org/install/configure.html
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec

1
var/spack/repos/builtin/packages/nvptx-tools/package.py
View file

@ -15,6 +15,7 @@ class NvptxTools(AutotoolsPackage):
homepage = "https://github.com/MentorEmbedded/nvptx-tools" homepage = "https://github.com/MentorEmbedded/nvptx-tools"
git = "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') version('2018-03-01', commit='5f6f343a302d620b0868edab376c00b15741e39e')
depends_on('binutils') depends_on('binutils')