From patchwork Wed Oct 12 08:23:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp2494177wrs; Wed, 12 Oct 2022 01:24:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6om2TmNUhlvA6y3IenKqHKmQTl4isDDHrGLEPQMEX9sNbTYO+bT1XB3DehidR+ur2EKNKU X-Received: by 2002:a05:6402:e9d:b0:443:7833:3d7b with SMTP id h29-20020a0564020e9d00b0044378333d7bmr26469863eda.151.1665563098085; Wed, 12 Oct 2022 01:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665563098; cv=none; d=google.com; s=arc-20160816; b=pglao3Km9HqO6QPhA0nM0GjVC03UfC434gbXr79RJQu3I7HWVms8gZkLCgqOiLF+gP Mt5ony906MIyjwww8e+wPJ/EdR77eJe55ywTNdpEt4rcKVXxF/ZHBvUdSxLfm/yeyG1F pku4cDt5Q0QhKjyNtF45sCI3/XlhkOJsxU/dgkAkvuSNVf1kpamO00Ij3PNiC+PbEiLj w9GlnR/Rh35IoGNqNe3a8rimS/ZK67qBguo5j0wkfND7TLR4YV7fCneVS1VoKU28HNxb 7C1aWKID+oHXYJgWQ0qAiXElJGz4bnlvmY4VqKpvwPj7j5FqgVJPoCBt5fOZVQU9FUOT OMgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-disposition:in-reply-to:mime-version:references:message-id :subject:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=zg/P9ui6p0yEKlLm4ecxvEyuTAGa7E5bgCEWjT6DJOk=; b=YKfsJZtyphtnLLoq19YEdAtFCfz26qCp+GZRO6FKliD8ziBcQHSt1TyexpoWYAGxjq vMGzfj3PiD/8xTDH1pmBNraK4UTswOixMpRFhOks8sOS6FwziRixfhQyIF2ZTWCBRnD0 bw5bC09cSWOF7hDbqaF9Jr9W84ODl52C+fD+tTA/LcwpDw2Sx6kMT4STcOJdb6BmcCIW apOOyN2a2FbUPpf08oZNK46WJ4N/MNsvUhTlmErRy6VH0E15lhQZNuvchREVaFAQemDr 1aplp3snj6Gc2HAlve2rQeDgYlapZ0qCzbI0cZIDyeh/snbcKCQ8Z/79bDatHXXrIlB2 PTxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WdUtmA+R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j10-20020a05640211ca00b00458ce1a20dfsi18275359edw.271.2022.10.12.01.24.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 01:24:58 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WdUtmA+R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BED513860757 for ; Wed, 12 Oct 2022 08:24:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BED513860757 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665563096; bh=zg/P9ui6p0yEKlLm4ecxvEyuTAGa7E5bgCEWjT6DJOk=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WdUtmA+RoDoETM5N/uSsMAId6JCfPPfJBXmfhdAU7VUvu1ZW0CAeLYGFAhj/ZNACT VsrGAfXC9KL9OKTKxSa6qwOqbEe/ziE3FQkwSHnKhHFD1A/oIuaMDBce4ncroBIFGF 7ox/W2Vjn2lzMhg+e/grNbTCKsOjuWoubx1WCe1k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C088C38515E4 for ; Wed, 12 Oct 2022 08:24:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C088C38515E4 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-442-msJ1ArBCMgKo8AysdlXOCg-1; Wed, 12 Oct 2022 04:23:56 -0400 X-MC-Unique: msJ1ArBCMgKo8AysdlXOCg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 21BC5101A5B3; Wed, 12 Oct 2022 08:23:56 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DDFC414A809; Wed, 12 Oct 2022 08:23:55 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 29C8NqYx848189 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 12 Oct 2022 10:23:52 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 29C8NoIV848188; Wed, 12 Oct 2022 10:23:50 +0200 Date: Wed, 12 Oct 2022 10:23:50 +0200 To: Jason Merrill , Richard Biener , Jeff Law , Eric Botcazou , Richard Sandiford Subject: [PATCH] machmode: Introduce GET_MODE_NEXT_MODE with previous GET_MODE_WIDER_MODE meaning, add new GET_MODE_WIDER_MODE Message-ID: References: <37522634-319a-b471-aa35-87e711b0479e@redhat.com> <55062a15-79a1-f8cf-ed20-25ca8ff42abe@redhat.com> <95f2abba-afb4-bb73-a9f0-b1578b28713a@redhat.com> MIME-Version: 1.0 In-Reply-To: <95f2abba-afb4-bb73-a9f0-b1578b28713a@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746469490914775032?= X-GMAIL-MSGID: =?utf-8?q?1746469490914775032?= On Wed, Oct 05, 2022 at 04:02:25PM -0400, Jason Merrill wrote: > > > > @@ -5716,7 +5716,13 @@ emit_store_flag_1 (rtx target, enum rtx_ > > > > { > > > > machine_mode optab_mode = mclass == MODE_CC ? CCmode : compare_mode; > > > > icode = optab_handler (cstore_optab, optab_mode); > > > > - if (icode != CODE_FOR_nothing) > > > > + if (icode != CODE_FOR_nothing > > > > + /* Don't consider [BH]Fmode as usable wider mode, as neither is > > > > + a subset or superset of the other. */ > > > > + && (compare_mode == mode > > > > + || !SCALAR_FLOAT_MODE_P (compare_mode) > > > > + || maybe_ne (GET_MODE_PRECISION (compare_mode), > > > > + GET_MODE_PRECISION (mode)))) > > > > > > Why do you need to do this here (and in prepare_cmp_insn, and similarly in > > > can_compare_p)? Shouldn't get_wider skip over modes that are not actually > > > wider? > > > > I'm afraid too many places rely on all modes of a certain class to be > > visible when walking from "narrowest" to "widest" mode, say > > FOR_EACH_MODE_IN_CLASS/FOR_EACH_MODE/FOR_EACH_MODE_UNTIL/FOR_EACH_WIDER_MODE > > etc. wouldn't work at all if GET_MODE_WIDER_MODE (BFmode) == SFmode > > && GET_MODE_WIDER_MODE (HFmode) == SFmode. > > Yes, it seems they need to change now that their assumptions have been > violated. I suppose FOR_EACH_MODE_IN_CLASS would need to change to not use > get_wider, and users of FOR_EACH_MODE/FOR_EACH_MODE_UNTIL need to decide > whether they want an iteration that uses get_wider (likely with a new name) > or not. Here is a patch which does that. Passes bootstrap/regtest on x86_64-linux and i686-linux. Though I admit I didn't go carefully through all 24 GET_MODE_WIDER_MODE uses, 54 FOR_EACH_MODE_IN_CLASS uses, 3 FOR_EACH_MODE uses, 24 FOR_EACH_MODE_FROM, 6 FOR_EACH_MODE_UNTIL and 15 FOR_EACH_WIDER_MODE uses. It is more important to go through the GET_MODE_WIDER_MODE and FOR_EACH_WIDER_MODE uses because the patch changes behavior for those, the rest keep their previous meaning and so can be changed incrementally if the other meaning is desirable to them (I've of course changed the 3 spots I had to change in the previous BFmode patch and whatever triggered during the bootstraps). Thoughts on this? 2022-10-12 Jakub Jelinek * genmodes.cc (emit_mode_wider): Emit previous content of mode_wider array into mode_next array and for mode_wider emit always VOIDmode for !CLASS_HAS_WIDER_MODES_P classes, otherwise skip through modes with the same precision. * machmode.h (mode_next): Declare. (GET_MODE_NEXT_MODE): New inline function. (mode_iterator::get_next, mode_iterator::get_known_next): New function templates. (FOR_EACH_MODE_IN_CLASS): Use get_next instead of get_wider. (FOR_EACH_MODE): Use get_known_next instead of get_known_wider. (FOR_EACH_MODE_FROM): Use get_next instead of get_wider. (FOR_EACH_WIDER_MODE_FROM): Define. (FOR_EACH_NEXT_MODE): Define. * expmed.cc (emit_store_flag_1): Use FOR_EACH_WIDER_MODE_FROM instead of FOR_EACH_MODE_FROM. * optabs.cc (prepare_cmp_insn): Likewise. Remove redundant !CLASS_HAS_WIDER_MODES_P check. (prepare_float_lib_cmp): Use FOR_EACH_WIDER_MODE_FROM instead of FOR_EACH_MODE_FROM. * config/i386/i386-expand.cc (get_mode_wider_vector): Use GET_MODE_NEXT_MODE instead of GET_MODE_WIDER_MODE. Jakub --- gcc/genmodes.cc.jj 2022-05-23 21:44:48.080857253 +0200 +++ gcc/genmodes.cc 2022-10-11 22:35:39.680286764 +0200 @@ -1527,7 +1527,7 @@ emit_mode_wider (void) int c; struct mode_data *m; - print_decl ("unsigned char", "mode_wider", "NUM_MACHINE_MODES"); + print_decl ("unsigned char", "mode_next", "NUM_MACHINE_MODES"); for_all_modes (c, m) tagged_printf ("E_%smode", @@ -1535,6 +1535,37 @@ emit_mode_wider (void) m->name); print_closer (); + print_decl ("unsigned char", "mode_wider", "NUM_MACHINE_MODES"); + + for_all_modes (c, m) + { + struct mode_data *m2 = 0; + + if (m->cl == MODE_INT + || m->cl == MODE_PARTIAL_INT + || m->cl == MODE_FLOAT + || m->cl == MODE_DECIMAL_FLOAT + || m->cl == MODE_COMPLEX_FLOAT + || m->cl == MODE_FRACT + || m->cl == MODE_UFRACT + || m->cl == MODE_ACCUM + || m->cl == MODE_UACCUM) + for (m2 = m->wider; m2 && m2 != void_mode; m2 = m2->wider) + { + if (m2->bytesize == m->bytesize + && m2->precision == m->precision) + continue; + break; + } + + if (m2 == void_mode) + m2 = 0; + tagged_printf ("E_%smode", + m2 ? m2->name : void_mode->name, + m->name); + } + + print_closer (); print_decl ("unsigned char", "mode_2xwider", "NUM_MACHINE_MODES"); for_all_modes (c, m) --- gcc/machmode.h.jj 2022-01-18 00:18:02.823743394 +0100 +++ gcc/machmode.h 2022-10-11 22:35:39.680286764 +0200 @@ -28,6 +28,7 @@ extern const unsigned char mode_inner[NU extern CONST_MODE_NUNITS poly_uint16_pod mode_nunits[NUM_MACHINE_MODES]; extern CONST_MODE_UNIT_SIZE unsigned char mode_unit_size[NUM_MACHINE_MODES]; extern const unsigned short mode_unit_precision[NUM_MACHINE_MODES]; +extern const unsigned char mode_next[NUM_MACHINE_MODES]; extern const unsigned char mode_wider[NUM_MACHINE_MODES]; extern const unsigned char mode_2xwider[NUM_MACHINE_MODES]; @@ -760,7 +761,21 @@ GET_MODE_NUNITS (const T &mode) } #endif -/* Get the next wider natural mode (eg, QI -> HI -> SI -> DI -> TI). */ +/* Get the next natural mode (not narrower, eg, QI -> HI -> SI -> DI -> TI). */ + +template +ALWAYS_INLINE opt_mode +GET_MODE_NEXT_MODE (const T &m) +{ + return typename opt_mode::from_int (mode_next[m]); +} + +/* Get the next wider mode (eg, QI -> HI -> SI -> DI -> TI). + This is similar to GET_MODE_NEXT_MODE, but while GET_MODE_NEXT_MODE + can include mode that have the same precision (e.g. + GET_MODE_NEXT_MODE (HFmode) can be BFmode even when both have the same + precision), this one will skip those. And always VOIDmode for + modes whose class is !CLASS_HAS_WIDER_MODES_P. */ template ALWAYS_INLINE opt_mode @@ -1098,7 +1113,33 @@ namespace mode_iterator return *iter != E_VOIDmode; } - /* Set mode iterator *ITER to the next widest mode in the same class, + /* Set mode iterator *ITER to the next mode in the same class, + if any. */ + + template + inline void + get_next (opt_mode *iter) + { + *iter = GET_MODE_NEXT_MODE (iter->require ()); + } + + inline void + get_next (machine_mode *iter) + { + *iter = GET_MODE_NEXT_MODE (*iter).else_void (); + } + + /* Set mode iterator *ITER to the next wider mode in the same class. + Such a mode is known to exist. */ + + template + inline void + get_known_next (T *iter) + { + *iter = GET_MODE_NEXT_MODE (*iter).require (); + } + + /* Set mode iterator *ITER to the next wider mode in the same class, if any. */ template @@ -1114,7 +1155,7 @@ namespace mode_iterator *iter = GET_MODE_WIDER_MODE (*iter).else_void (); } - /* Set mode iterator *ITER to the next widest mode in the same class. + /* Set mode iterator *ITER to the next wider mode in the same class. Such a mode is known to exist. */ template @@ -1146,20 +1187,27 @@ namespace mode_iterator #define FOR_EACH_MODE_IN_CLASS(ITERATOR, CLASS) \ for (mode_iterator::start (&(ITERATOR), CLASS); \ mode_iterator::iterate_p (&(ITERATOR)); \ - mode_iterator::get_wider (&(ITERATOR))) + mode_iterator::get_next (&(ITERATOR))) /* Make ITERATOR iterate over all the modes in the range [START, END), in order of increasing width. */ #define FOR_EACH_MODE(ITERATOR, START, END) \ for ((ITERATOR) = (START); \ (ITERATOR) != (END); \ - mode_iterator::get_known_wider (&(ITERATOR))) + mode_iterator::get_known_next (&(ITERATOR))) -/* Make ITERATOR iterate over START and all wider modes in the same +/* Make ITERATOR iterate over START and all non-narrower modes in the same class, in order of increasing width. */ #define FOR_EACH_MODE_FROM(ITERATOR, START) \ for ((ITERATOR) = (START); \ mode_iterator::iterate_p (&(ITERATOR)); \ + mode_iterator::get_next (&(ITERATOR))) + +/* Make ITERATOR iterate over START and all wider modes in the same + class, in order of strictly increasing width. */ +#define FOR_EACH_WIDER_MODE_FROM(ITERATOR, START) \ + for ((ITERATOR) = (START); \ + mode_iterator::iterate_p (&(ITERATOR)); \ mode_iterator::get_wider (&(ITERATOR))) /* Make ITERATOR iterate over modes in the range [NARROWEST, END) @@ -1170,6 +1218,14 @@ namespace mode_iterator /* Make ITERATOR iterate over modes in the same class as MODE, in order of increasing width. Start at the first mode wider than START, + or don't iterate at all if there is no wider mode. */ +#define FOR_EACH_NEXT_MODE(ITERATOR, START) \ + for ((ITERATOR) = (START), mode_iterator::get_next (&(ITERATOR)); \ + mode_iterator::iterate_p (&(ITERATOR)); \ + mode_iterator::get_next (&(ITERATOR))) + +/* Make ITERATOR iterate over modes in the same class as MODE, in order + of increasing width. Start at the first mode wider than START, or don't iterate at all if there is no wider mode. */ #define FOR_EACH_WIDER_MODE(ITERATOR, START) \ for ((ITERATOR) = (START), mode_iterator::get_wider (&(ITERATOR)); \ --- gcc/expmed.cc.jj 2022-10-05 21:22:56.191918383 +0200 +++ gcc/expmed.cc 2022-10-11 22:35:39.682286736 +0200 @@ -5712,7 +5712,7 @@ emit_store_flag_1 (rtx target, enum rtx_ /* Next try expanding this via the backend's cstore4. */ mclass = GET_MODE_CLASS (mode); - FOR_EACH_MODE_FROM (compare_mode, mode) + FOR_EACH_WIDER_MODE_FROM (compare_mode, mode) { machine_mode optab_mode = mclass == MODE_CC ? CCmode : compare_mode; icode = optab_handler (cstore_optab, optab_mode); --- gcc/optabs.cc.jj 2022-10-05 21:22:56.217918032 +0200 +++ gcc/optabs.cc 2022-10-11 23:20:08.216037640 +0200 @@ -4384,7 +4384,6 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx machine_mode mode = *pmode; rtx libfunc, test; machine_mode cmp_mode; - enum mode_class mclass; /* The other methods are not needed. */ gcc_assert (methods == OPTAB_DIRECT || methods == OPTAB_WIDEN @@ -4490,9 +4489,8 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx return; } - mclass = GET_MODE_CLASS (mode); test = gen_rtx_fmt_ee (comparison, VOIDmode, x, y); - FOR_EACH_MODE_FROM (cmp_mode, mode) + FOR_EACH_WIDER_MODE_FROM (cmp_mode, mode) { enum insn_code icode; icode = optab_handler (cbranch_optab, cmp_mode); @@ -4515,7 +4513,7 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx delete_insns_since (last); } - if (methods == OPTAB_DIRECT || !CLASS_HAS_WIDER_MODES_P (mclass)) + if (methods == OPTAB_DIRECT) break; } @@ -4711,7 +4709,7 @@ prepare_float_lib_cmp (rtx x, rtx y, enu bool reversed_p = false; scalar_int_mode cmp_mode = targetm.libgcc_cmp_return_mode (); - FOR_EACH_MODE_FROM (mode, orig_mode) + FOR_EACH_WIDER_MODE_FROM (mode, orig_mode) { if (code_to_optab (comparison) && (libfunc = optab_libfunc (code_to_optab (comparison), mode))) --- gcc/config/i386/i386-expand.cc.jj 2022-09-26 22:29:41.407322933 +0200 +++ gcc/config/i386/i386-expand.cc 2022-10-11 23:22:55.579761522 +0200 @@ -14941,7 +14941,7 @@ static machine_mode get_mode_wider_vector (machine_mode o) { /* ??? Rely on the ordering that genmodes.cc gives to vectors. */ - machine_mode n = GET_MODE_WIDER_MODE (o).require (); + machine_mode n = GET_MODE_NEXT_MODE (o).require (); gcc_assert (GET_MODE_NUNITS (o) == GET_MODE_NUNITS (n) * 2); gcc_assert (GET_MODE_SIZE (o) == GET_MODE_SIZE (n)); return n;