From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id E7DBD385843D; Mon, 26 Sep 2022 14:21:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7DBD385843D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664202063; bh=WrcGfS1fV9UnZ8hY1GxmhRpvFQZorpTHW5BgKVobrmQ=; h=From:To:Subject:Date:From; b=evNi8b21/6DuxB9qBC31ayzRot4goPBHRAr2U+XHZgnpDnaq+hNl25XehinN/kt4I c2BsY5zB22NcpLnk9ANJn6Qer5zUakPBMPQ3IWHljxj1n4gu++JpK3w/1IpyB/8WnS UDTbcODnMdrHRSaxbWK3pDp6K5rEIl95ZCZpGIm8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] nvptx: Introduce dummy multilib option for default '-misa=sm_30' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 38a225f9d39f494f5dba718befef39631eb5768c X-Git-Newrev: 74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb Message-Id: <20220926142103.E7DBD385843D@sourceware.org> Date: Mon, 26 Sep 2022 14:21:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb commit 74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb Author: Thomas Schwinge Date: Sat Jun 11 12:28:36 2022 +0200 nvptx: Introduce dummy multilib option for default '-misa=sm_30' ... primarily in preparation for later changes. gcc/ * config.gcc (TM_MULTILIB_CONFIG) [nvptx]: Set to '$with_arch'. * config/nvptx/t-nvptx (MULTILIB_OPTIONS, MULTILIB_MATCHES) (MULTILIB_EXCEPTIONS): Handle it. (cherry picked from commit 4d94582e0dcbf5fed9d61213715bfff877bf5ecf) Diff: --- gcc/ChangeLog.omp | 9 +++++++++ gcc/config.gcc | 1 + gcc/config/nvptx/t-nvptx | 20 +++++++++++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 7f5f932b9d6..43fa05159b6 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,12 @@ +2022-09-26 Thomas Schwinge + + Backported from master: + 2022-09-26 Thomas Schwinge + + * config.gcc (TM_MULTILIB_CONFIG) [nvptx]: Set to '$with_arch'. + * config/nvptx/t-nvptx (MULTILIB_OPTIONS, MULTILIB_MATCHES) + (MULTILIB_EXCEPTIONS): Handle it. + 2022-09-26 Thomas Schwinge Backported from master: diff --git a/gcc/config.gcc b/gcc/config.gcc index 3b1bde78391..d492b7769fe 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5441,6 +5441,7 @@ case "${target}" in nvptx-*) supported_defaults=arch + TM_MULTILIB_CONFIG=$with_arch case $with_arch in sm_30 ) # OK; default. diff --git a/gcc/config/nvptx/t-nvptx b/gcc/config/nvptx/t-nvptx index 2b68149ed7e..c797d57690f 100644 --- a/gcc/config/nvptx/t-nvptx +++ b/gcc/config/nvptx/t-nvptx @@ -31,4 +31,22 @@ s-nvptx-gen-opt: $(srcdir)/config/nvptx/nvptx-sm.def \ tmp-nvptx-gen.opt $(srcdir)/config/nvptx/nvptx-gen.opt $(STAMP) s-nvptx-gen-opt -MULTILIB_OPTIONS = mgomp mptx=3.1 + +# Multilib setup. + +MULTILIB_OPTIONS = +MULTILIB_MATCHES = +MULTILIB_EXCEPTIONS = + +MULTILIB_OPTIONS += mgomp + +multilib_options_isa_list := $(TM_MULTILIB_CONFIG) +multilib_options_isa_default := $(word 1,$(multilib_options_isa_list)) +# Add the default '-misa' as a multilib option: +MULTILIB_OPTIONS += misa=$(multilib_options_isa_default) +# ..., but don't handle it specially (remap to default): +MULTILIB_MATCHES += .=misa?$(multilib_options_isa_default) +# ..., and don't actually build it: +MULTILIB_EXCEPTIONS += *misa=$(multilib_options_isa_default)* + +MULTILIB_OPTIONS += mptx=3.1