{"id":809613,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809613/?format=json","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/1.0/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<87y3puhesd.fsf@linaro.org>","date":"2017-09-04T11:41:22","name":"[7/9] Make targetm.get_mask_mode return an opt_mode","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b5e93a245cc70d0f50edafb8263e92d94c0a066","submitter":{"id":5450,"url":"http://patchwork.ozlabs.org/api/1.0/people/5450/?format=json","name":"Richard Sandiford","email":"richard.sandiford@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/87y3puhesd.fsf@linaro.org/mbox/","series":[{"id":1357,"url":"http://patchwork.ozlabs.org/api/1.0/series/1357/?format=json","date":"2017-09-04T11:24:26","name":"Make more use of opt_mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1357/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809613/checks/","tags":{},"headers":{"Return-Path":"<gcc-patches-return-461410-incoming=patchwork.ozlabs.org@gcc.gnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list gcc-patches@gcc.gnu.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=gcc-patches-return-461410-incoming=patchwork.ozlabs.org@gcc.gnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org\n\theader.b=\"JHYt9T1J\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xm7Gv10Qyz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon,  4 Sep 2017 21:41:42 +1000 (AEST)","(qmail 19813 invoked by alias); 4 Sep 2017 11:41:34 -0000","(qmail 18885 invoked by uid 89); 4 Sep 2017 11:41:34 -0000","from mail-wr0-f173.google.com (HELO mail-wr0-f173.google.com)\n\t(209.85.128.173) by sourceware.org\n\t(qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP;\n\tMon, 04 Sep 2017 11:41:28 +0000","by mail-wr0-f173.google.com with SMTP id 108so769565wra.5 for\n\t<gcc-patches@gcc.gnu.org>; Mon, 04 Sep 2017 04:41:27 -0700 (PDT)","from localhost (94.197.120.41.threembb.co.uk. [94.197.120.41]) by\n\tsmtp.gmail.com with ESMTPSA id\n\tt12sm5384599wra.20.2017.09.04.04.41.24 for\n\t<gcc-patches@gcc.gnu.org> (version=TLS1_2\n\tcipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tMon, 04 Sep 2017 04:41:25 -0700 (PDT)"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender:from\n\t:to:subject:references:date:in-reply-to:message-id:mime-version\n\t:content-type; q=dns; s=default; b=komkfm3tuW6atarL0PHZUBgVxd9al\n\tMnemXqwlBzQxjpvT5HBR+vq4yc1TJbSlEv3wm1V50kZbuFAzBaum7lOrPVxS5ekG\n\tkMLfMMHvZCWQuVNDYD5sNkv0dvLo43uigWU9O0hd/0JFxfh1nYD5Zq8XuJ+tDCLH\n\tcxBeySQVRe9qSQ=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender:from\n\t:to:subject:references:date:in-reply-to:message-id:mime-version\n\t:content-type; s=default; bh=Pjsef8I1ZtdI+mMpRvYnNJqCMc4=; b=JHY\n\tt9T1JcVAErB4ajngntm91RvK+s246/O1ndd8l11AEvi6DsYTeP8qjZwboAzNtF8A\n\t5BxWZT7cmr0h3dK+TkrU+hZ9lzn1LamjInAUvkbgs0FTPwXlDaIgGQk5EMn5UYxO\n\twGQoXpEGSPMpAQtCwwlOP2Le2Y4UGDLJSKSKdYME=","Mailing-List":"contact gcc-patches-help@gcc.gnu.org; run by ezmlm","Precedence":"bulk","List-Id":"<gcc-patches.gcc.gnu.org>","List-Unsubscribe":"<mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>","List-Archive":"<http://gcc.gnu.org/ml/gcc-patches/>","List-Post":"<mailto:gcc-patches@gcc.gnu.org>","List-Help":"<mailto:gcc-patches-help@gcc.gnu.org>","Sender":"gcc-patches-owner@gcc.gnu.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-11.0 required=5.0 tests=AWL, BAYES_00,\n\tGIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS,\n\tRCVD_IN_DNSWL_NONE,\n\tSPF_PASS autolearn=ham version=3.3.2 spammy=U**","X-HELO":"mail-wr0-f173.google.com","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net;\n\ts=20161025;\n\th=x-gm-message-state:from:to:mail-followup-to:subject:references:date\n\t:in-reply-to:message-id:user-agent:mime-version;\n\tbh=qvXOcPiN3Ecm6wEzcxsc9zn28tUaKKqCQKwG5as16C8=;\n\tb=OQs9wi3t7uo/3P6Zrw0i9MaJUEOmk+Lc9HIOSh8AIyUpXC9On+w0gGTCix4RV7kJVF\n\tuOxk75/iNzbm3+qn+lPTAttI2b9ECUBIguOeCsu458Wkg7H56lsnodSUpKitVP1wvga+\n\tMyzDvO2otNYUfETx3EjnXl0MwAgU6e/ez+rSdyYwfqVljsJRebVHJY6Miqfd/T9LbBVp\n\tDCXhvJ6NWuwH1jazFKUn7O23v1Rq0oLIeNWjQN/ZpflqJDoGZvTB9DBYW7/mNT4Slbdu\n\tN9EVYzcm+trvSzWE5n0krEw/PU7Zs8t0WydwkL2p8QSEp2loAw+nQkELQCW35+ECWo99\n\tZaXg==","X-Gm-Message-State":"AHPjjUhQKlOGG0Y08VO8xEfQTgWVawZV1erVIT4uoc+9EXp+JE/7TEwe\t3h7o/LjpFO3CgVszQKI+CA==","X-Google-Smtp-Source":"ADKCNb63tx/k2SZNNea9igyW2reZbE4+8rlTbJEB1fRShg5mCG59FAfR4A2eAlCHZwYw69Fq8DgVGw==","X-Received":"by 10.223.134.174 with SMTP id 43mr105995wrx.173.1504525285989;\n\tMon, 04 Sep 2017 04:41:25 -0700 (PDT)","From":"Richard Sandiford <richard.sandiford@linaro.org>","To":"gcc-patches@gcc.gnu.org","Mail-Followup-To":"gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org","Subject":"[7/9] Make targetm.get_mask_mode return an opt_mode","References":"<87tw0iiu51.fsf@linaro.org>","Date":"Mon, 04 Sep 2017 12:41:22 +0100","In-Reply-To":"<87tw0iiu51.fsf@linaro.org> (Richard Sandiford's message of\n\t\"Mon, 04 Sep 2017 12:24:26 +0100\")","Message-ID":"<87y3puhesd.fsf@linaro.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain"},"content":"...for consistency with mode_for_vector.\n\n2017-09-04  Richard Sandiford  <richard.sandiford@linaro.org>\n\ngcc/\n\t* target.def (get_mask_mode): Change return type to opt_mode.\n\tExpand commentary.\n\t* doc/tm.texi: Regenerate.\n\t* targhooks.h (default_get_mask_mode): Return an opt_mode.\n\t* targhooks.c (default_get_mask_mode): Likewise.\n\t* config/i386/i386.c (ix86_get_mask_mode): Likewise.\n\t* optabs-query.c (can_vec_mask_load_store_p): Update use of\n\ttargetm.get_mask_mode.\n\t* tree.c (build_truth_vector_type): Likewise.","diff":"Index: gcc/target.def\n===================================================================\n--- gcc/target.def\t2017-09-04 11:50:24.568774867 +0100\n+++ gcc/target.def\t2017-09-04 12:18:58.594757220 +0100\n@@ -1877,10 +1877,16 @@ The default is zero which means to not i\n /* Function to get a target mode for a vector mask.  */\n DEFHOOK\n (get_mask_mode,\n- \"This hook returns mode to be used for a mask to be used for a vector\\n\\\n-of specified @var{length} with @var{nunits} elements.  By default an integer\\n\\\n-vector mode of a proper size is returned.\",\n- machine_mode,\n+ \"A vector mask is a value that holds one boolean result for every element\\n\\\n+in a vector.  This hook returns the machine mode that should be used to\\n\\\n+represent such a mask when the vector in question is @var{length} bytes\\n\\\n+long and contains @var{nunits} elements.  The hook returns an empty\\n\\\n+@code{opt_machine_mode} if no such mode exists.\\n\\\n+\\n\\\n+The default implementation returns the mode of an integer vector that\\n\\\n+is @var{length} bytes long and that contains @var{nunits} elements,\\n\\\n+if such a mode exists.\",\n+ opt_machine_mode,\n  (unsigned nunits, unsigned length),\n  default_get_mask_mode)\n \nIndex: gcc/doc/tm.texi\n===================================================================\n--- gcc/doc/tm.texi\t2017-09-04 11:50:24.566073698 +0100\n+++ gcc/doc/tm.texi\t2017-09-04 12:18:58.593753447 +0100\n@@ -5820,10 +5820,16 @@ mode returned by @code{TARGET_VECTORIZE_\n The default is zero which means to not iterate over other vector sizes.\n @end deftypefn\n \n-@deftypefn {Target Hook} machine_mode TARGET_VECTORIZE_GET_MASK_MODE (unsigned @var{nunits}, unsigned @var{length})\n-This hook returns mode to be used for a mask to be used for a vector\n-of specified @var{length} with @var{nunits} elements.  By default an integer\n-vector mode of a proper size is returned.\n+@deftypefn {Target Hook} opt_machine_mode TARGET_VECTORIZE_GET_MASK_MODE (unsigned @var{nunits}, unsigned @var{length})\n+A vector mask is a value that holds one boolean result for every element\n+in a vector.  This hook returns the machine mode that should be used to\n+represent such a mask when the vector in question is @var{length} bytes\n+long and contains @var{nunits} elements.  The hook returns an empty\n+@code{opt_machine_mode} if no such mode exists.\n+\n+The default implementation returns the mode of an integer vector that\n+is @var{length} bytes long and that contains @var{nunits} elements,\n+if such a mode exists.\n @end deftypefn\n \n @deftypefn {Target Hook} {void *} TARGET_VECTORIZE_INIT_COST (struct loop *@var{loop_info})\nIndex: gcc/targhooks.h\n===================================================================\n--- gcc/targhooks.h\t2017-09-04 11:50:24.568774867 +0100\n+++ gcc/targhooks.h\t2017-09-04 12:18:58.594757220 +0100\n@@ -102,7 +102,7 @@ default_builtin_support_vector_misalignm\n \t\t\t\t\t     int, bool);\n extern machine_mode default_preferred_simd_mode (scalar_mode mode);\n extern unsigned int default_autovectorize_vector_sizes (void);\n-extern machine_mode default_get_mask_mode (unsigned, unsigned);\n+extern opt_machine_mode default_get_mask_mode (unsigned, unsigned);\n extern void *default_init_cost (struct loop *);\n extern unsigned default_add_stmt_cost (void *, int, enum vect_cost_for_stmt,\n \t\t\t\t       struct _stmt_vec_info *, int,\nIndex: gcc/targhooks.c\n===================================================================\n--- gcc/targhooks.c\t2017-09-04 12:18:55.825348732 +0100\n+++ gcc/targhooks.c\t2017-09-04 12:18:58.594757220 +0100\n@@ -1200,7 +1200,7 @@ default_autovectorize_vector_sizes (void\n \n /* By defaults a vector of integers is used as a mask.  */\n \n-machine_mode\n+opt_machine_mode\n default_get_mask_mode (unsigned nunits, unsigned vector_size)\n {\n   unsigned elem_size = vector_size / nunits;\n@@ -1210,12 +1210,12 @@ default_get_mask_mode (unsigned nunits,\n \n   gcc_assert (elem_size * nunits == vector_size);\n \n-  if (!mode_for_vector (elem_mode, nunits).exists (&vector_mode)\n-      || !VECTOR_MODE_P (vector_mode)\n-      || !targetm.vector_mode_supported_p (vector_mode))\n-    vector_mode = BLKmode;\n+  if (mode_for_vector (elem_mode, nunits).exists (&vector_mode)\n+      && VECTOR_MODE_P (vector_mode)\n+      && targetm.vector_mode_supported_p (vector_mode))\n+    return vector_mode;\n \n-  return vector_mode;\n+  return opt_machine_mode ();\n }\n \n /* By default, the cost model accumulates three separate costs (prologue,\nIndex: gcc/config/i386/i386.c\n===================================================================\n--- gcc/config/i386/i386.c\t2017-09-04 12:18:55.808284598 +0100\n+++ gcc/config/i386/i386.c\t2017-09-04 12:18:58.592749675 +0100\n@@ -51598,7 +51598,7 @@ ix86_autovectorize_vector_sizes (void)\n \n /* Implemenation of targetm.vectorize.get_mask_mode.  */\n \n-static machine_mode\n+static opt_machine_mode\n ix86_get_mask_mode (unsigned nunits, unsigned vector_size)\n {\n   unsigned elem_size = vector_size / nunits;\n@@ -51616,7 +51616,7 @@ ix86_get_mask_mode (unsigned nunits, uns\n \n   gcc_assert (elem_size * nunits == vector_size);\n \n-  return mode_for_vector (elem_mode, nunits).else_blk ();\n+  return mode_for_vector (elem_mode, nunits);\n }\n \n \f\nIndex: gcc/optabs-query.c\n===================================================================\n--- gcc/optabs-query.c\t2017-09-04 12:18:55.821333642 +0100\n+++ gcc/optabs-query.c\t2017-09-04 12:18:58.593753447 +0100\n@@ -531,12 +531,9 @@ can_vec_mask_load_store_p (machine_mode\n   if (!VECTOR_MODE_P (vmode))\n     return false;\n \n-  mask_mode = targetm.vectorize.get_mask_mode (GET_MODE_NUNITS (vmode),\n-\t\t\t\t\t       GET_MODE_SIZE (vmode));\n-  if (mask_mode == VOIDmode)\n-    return false;\n-\n-  if (convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing)\n+  if ((targetm.vectorize.get_mask_mode\n+       (GET_MODE_NUNITS (vmode), GET_MODE_SIZE (vmode)).exists (&mask_mode))\n+      && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing)\n     return true;\n \n   vector_sizes = targetm.vectorize.autovectorize_vector_sizes ();\n@@ -548,12 +545,10 @@ can_vec_mask_load_store_p (machine_mode\n \tcontinue;\n       unsigned int nunits = cur / GET_MODE_SIZE (smode);\n       if (mode_for_vector (smode, nunits).exists (&vmode)\n-\t  && VECTOR_MODE_P (vmode))\n-\t{\n-\t  mask_mode = targetm.vectorize.get_mask_mode (nunits, cur);\n-\t  if (convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing)\n-\t    return true;\n-\t}\n+\t  && VECTOR_MODE_P (vmode)\n+\t  && targetm.vectorize.get_mask_mode (nunits, cur).exists (&mask_mode)\n+\t  && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing)\n+\treturn true;\n     }\n   return false;\n }\nIndex: gcc/tree.c\n===================================================================\n--- gcc/tree.c\t2017-08-30 12:19:19.721220029 +0100\n+++ gcc/tree.c\t2017-09-04 12:18:58.595760992 +0100\n@@ -10243,10 +10243,8 @@ build_vector_type (tree innertype, int n\n tree\n build_truth_vector_type (unsigned nunits, unsigned vector_size)\n {\n-  machine_mode mask_mode = targetm.vectorize.get_mask_mode (nunits,\n-\t\t\t\t\t\t\t    vector_size);\n-\n-  gcc_assert (mask_mode != VOIDmode);\n+  machine_mode mask_mode\n+    = targetm.vectorize.get_mask_mode (nunits, vector_size).else_blk ();\n \n   unsigned HOST_WIDE_INT vsize;\n   if (mask_mode == BLKmode)\n","prefixes":["7/9"]}