From patchwork Fri Dec 17 10:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathamesh Kulkarni X-Patchwork-Id: 49047 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1CEB4385801A for ; Fri, 17 Dec 2021 10:08:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CEB4385801A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1639735684; bh=MP5bLlkPjfXMEq120T0AevgN1nHWZwaDqt/OZiCCeEA=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tVf+Hu/NuRgAlPZWQKpyHwW84ONSSOL6StICST053lUTNg7ZhSAeYoM7QIx6SsLZi nu/14FIsvu0jyoH7pHAb2LYoKhPTAc512naq6rJYV2ity2HNPxDOz/1I1WrZWceyfE YlWvpA0kDt7USXK/2qcosiebjOGwYcrFsW43Tv8Y= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 5CA2D385843E for ; Fri, 17 Dec 2021 10:05:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5CA2D385843E Received: by mail-wm1-x334.google.com with SMTP id g191-20020a1c9dc8000000b0032fbf912885so1222998wme.4 for ; Fri, 17 Dec 2021 02:05:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=MP5bLlkPjfXMEq120T0AevgN1nHWZwaDqt/OZiCCeEA=; b=Ru8werhm+f6u68+3GFw9+TH05AZFjR1KPViL1PBXyNtxsObBFozyb+ff3rrWeHlXr1 WJ/p8MZyML/SG2Kf00rpFL2bfrBCa7mu569n56C+ZnhX74YV/O+e7KOqZIHc0CPQbfs/ 75LANBx7dy2wBWgk+5dmf0WI3/4Vou4UVtaPnwxJOBEil+i7go2OKY/vQEyaWt+xqLuw 4S8jxviJzJOOzth21qUu/7RJOdbmAC+EbBXpAj2Q8CGwO9HfK3Jcmq2WRadbO+Jnq3/6 G4JxWAmCrQryj52YH1nXh29XPWEUV2B2JayFq/Llm8XPl/ekx2UdzH2REX7oJIvmqnTK 5r2g== X-Gm-Message-State: AOAM532NVULo+igH8xnzsXunLCtPpR9vV+Xj1ZjkDs+9IwF0YtCqNmqk RbFyQ8/G3BO1zbBgV3NFQcwewLPcO4bjAIdPYOaUfWZhS64= X-Google-Smtp-Source: ABdhPJzPxdPpw1XaVSbA1kTuQOEi/k3LGodjF/mFJat0nga+vzSieXYfHw/gEYIFz3iIwTZjkTlZEcy0j+s49fPu1Fg= X-Received: by 2002:a05:600c:294:: with SMTP id 20mr1912754wmk.7.1639735548451; Fri, 17 Dec 2021 02:05:48 -0800 (PST) MIME-Version: 1.0 Date: Fri, 17 Dec 2021 15:35:12 +0530 Message-ID: Subject: [2/2] PR96463 -- changes to type checking vec_perm_expr in middle end To: gcc Patches , Richard Sandiford , Richard Biener X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Prathamesh Kulkarni via Gcc-patches From: Prathamesh Kulkarni Reply-To: Prathamesh Kulkarni Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, The attached patch rearranges order of type-check for vec_perm_expr and relaxes type checking for lhs = vec_perm_expr when: rhs1 == rhs2, lhs is variable length vector, rhs1 is fixed length vector, TREE_TYPE (lhs) == TREE_TYPE (rhs1) I am not sure tho if this check is correct ? My intent was to capture case when vec_perm_expr is used to "extend" fixed length vector to it's VLA equivalent. Thanks, Prathamesh diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 672e384ef09..9f91878c468 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -4325,10 +4325,11 @@ verify_gimple_assign_ternary (gassign *stmt) break; case VEC_PERM_EXPR: - if (!useless_type_conversion_p (lhs_type, rhs1_type) - || !useless_type_conversion_p (lhs_type, rhs2_type)) + if (TREE_CODE (rhs1_type) != VECTOR_TYPE + || TREE_CODE (rhs2_type) != VECTOR_TYPE + || TREE_CODE (rhs3_type) != VECTOR_TYPE) { - error ("type mismatch in %qs", code_name); + error ("vector types expected in %qs", code_name); debug_generic_expr (lhs_type); debug_generic_expr (rhs1_type); debug_generic_expr (rhs2_type); @@ -4336,11 +4337,14 @@ verify_gimple_assign_ternary (gassign *stmt) return true; } - if (TREE_CODE (rhs1_type) != VECTOR_TYPE - || TREE_CODE (rhs2_type) != VECTOR_TYPE - || TREE_CODE (rhs3_type) != VECTOR_TYPE) + if (TREE_CODE (TREE_TYPE (rhs3_type)) != INTEGER_TYPE + || (TREE_CODE (rhs3) != VECTOR_CST + && (GET_MODE_BITSIZE (SCALAR_INT_TYPE_MODE + (TREE_TYPE (rhs3_type))) + != GET_MODE_BITSIZE (SCALAR_TYPE_MODE + (TREE_TYPE (rhs1_type)))))) { - error ("vector types expected in %qs", code_name); + error ("invalid mask type in %qs", code_name); debug_generic_expr (lhs_type); debug_generic_expr (rhs1_type); debug_generic_expr (rhs2_type); @@ -4348,15 +4352,18 @@ verify_gimple_assign_ternary (gassign *stmt) return true; } - if (maybe_ne (TYPE_VECTOR_SUBPARTS (rhs1_type), - TYPE_VECTOR_SUBPARTS (rhs2_type)) - || maybe_ne (TYPE_VECTOR_SUBPARTS (rhs2_type), - TYPE_VECTOR_SUBPARTS (rhs3_type)) - || maybe_ne (TYPE_VECTOR_SUBPARTS (rhs3_type), - TYPE_VECTOR_SUBPARTS (lhs_type))) + /* Accept lhs = vec_perm_expr if lhs is vector length agnostic, + and has same element type as v. */ + if (!TYPE_VECTOR_SUBPARTS (lhs_type).is_constant () + && operand_equal_p (rhs1, rhs2, 0) + && TYPE_VECTOR_SUBPARTS (rhs1_type).is_constant () + && TREE_TYPE (lhs_type) == TREE_TYPE (rhs1_type)) + return false; + + if (!useless_type_conversion_p (lhs_type, rhs1_type) + || !useless_type_conversion_p (lhs_type, rhs2_type)) { - error ("vectors with different element number found in %qs", - code_name); + error ("type mismatch in %qs", code_name); debug_generic_expr (lhs_type); debug_generic_expr (rhs1_type); debug_generic_expr (rhs2_type); @@ -4364,21 +4371,21 @@ verify_gimple_assign_ternary (gassign *stmt) return true; } - if (TREE_CODE (TREE_TYPE (rhs3_type)) != INTEGER_TYPE - || (TREE_CODE (rhs3) != VECTOR_CST - && (GET_MODE_BITSIZE (SCALAR_INT_TYPE_MODE - (TREE_TYPE (rhs3_type))) - != GET_MODE_BITSIZE (SCALAR_TYPE_MODE - (TREE_TYPE (rhs1_type)))))) + if (maybe_ne (TYPE_VECTOR_SUBPARTS (rhs1_type), + TYPE_VECTOR_SUBPARTS (rhs2_type)) + || maybe_ne (TYPE_VECTOR_SUBPARTS (rhs2_type), + TYPE_VECTOR_SUBPARTS (rhs3_type)) + || maybe_ne (TYPE_VECTOR_SUBPARTS (rhs3_type), + TYPE_VECTOR_SUBPARTS (lhs_type))) { - error ("invalid mask type in %qs", code_name); + error ("vectors with different element number found in %qs", + code_name); debug_generic_expr (lhs_type); debug_generic_expr (rhs1_type); debug_generic_expr (rhs2_type); debug_generic_expr (rhs3_type); return true; } - return false; case SAD_EXPR: