From patchwork Fri May 27 18:17:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 576576 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8607:0:0:0:0 with SMTP id bb7csp904047mab; Fri, 27 May 2022 12:05:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDnMsEUa3DYu5ZiOYrL5B18HdQMOAMgrjqQL58dK/TzwtucAXbXY3RT4SN8Tt9y5EfvLsI X-Received: by 2002:a37:5347:0:b0:69f:842f:bfed with SMTP id h68-20020a375347000000b0069f842fbfedmr29528835qkb.303.1653678319578; Fri, 27 May 2022 12:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653678319; cv=none; d=google.com; s=arc-20160816; b=QuNBd6cLIkCrEsBjuETxzlY2UEOodIUZj08DnHibfvkexm5PMv4rrA3gi+QgTMlKCc Y7MIw76jmVRi/Uy9UVCVwA+PAoyPfXTlzZ6hKgWtmcxEKXyP59v1RZ68rXc4WqANukvt jy15yEmqj++vXUaRxGrbRoXMjrGclzrNlrEVzcjh19qxoJVGcEpLSNrO0c8fOuLJtBjr OuIzonWKIIm1eJSETi+fi1js8HGOeptyJLi6bcuO5Jo1S6Sir2kVZyCNyJN0zPOu7BWd GrKZK6PqCHEGyeVvlwjVd0WwA9/jchviuupGPEpMM8CS7BG4iMGYfatYuIkbWNFFYZsV lipw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fA/+mmRPrAiRguQNj9lWkmnOAt/Mp49u7yd687It8sE=; b=grYI4iJbsSmN46dPhJPe+QxIG4wVaOozk09zdI3pZk7vHCSMe/9Ogcnc5g/waJ9RyI tHGhFIHUxvwgkOGSNZ+RN2RAyKIvwEdYRdpPoSmVqJHKruz07jhGCX4KOh0L3MYR+Xec InxvNT5bxCCUVTAOe67XAW+uIJEA0iLqR6RYp4HRA1tRQIIguL+Uv3fxVO6BWb3+wDTO ZAZ+gujY0Vu1hzQ2oBTx2zSbr5/fLwa7GdSSR3sRsAeaNehmkcArSHvCu5q7MuOMk9kJ pqqhePqpKo4KGqXwnfm8XWbpKYQZ/im22f4hPMGg/0PDfl/XWkPKOmkfO+CF0FIuYEKm vA9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=viEbjAgh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 14-20020a05621420ee00b00446413d5b4dsi3025698qvk.95.2022.05.27.12.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 May 2022 12:05:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=viEbjAgh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nufGx-00064u-4t for patch@linaro.org; Fri, 27 May 2022 15:05:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nueYi-0007Kq-EO for qemu-devel@nongnu.org; Fri, 27 May 2022 14:19:36 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:53869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nueYe-0003d0-2k for qemu-devel@nongnu.org; Fri, 27 May 2022 14:19:35 -0400 Received: by mail-pj1-x1029.google.com with SMTP id z11so5270213pjc.3 for ; Fri, 27 May 2022 11:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fA/+mmRPrAiRguQNj9lWkmnOAt/Mp49u7yd687It8sE=; b=viEbjAghYlNYezMSh6ANiXkvRQQ6IGPlKSHxiWozTXBrbuJGTEOAhM+K0QU2SqSq2X ORBRZ/cgG9p1REhRBN5f+Um7Ej1C59IbGOTVXzECztxbnBwyF3WPCsFUcVAioONGrd4h 9RwIN+PDnfmQFdeXEuPSxzwnWS9iLLreyz7NPMvafWOBXAyLSHYQ7FlOGv7v6RVBPyjE t26HFA0Y1o8Srp5nNpfQbil63ggE7MCQPKsfA8UKcTWd3MfhjA9q1LxaUueX8fz1VsIH 5lBQjs6Qc3ZtWP2N48kty6r6ev4hTSw1ePY8CLXNFqv+K8reV1M+sQBiVwfszDrbZFFz esjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fA/+mmRPrAiRguQNj9lWkmnOAt/Mp49u7yd687It8sE=; b=j1j0ueeFtxQDojvZtAKdLpgi7VX5OPjvqdOFnC+dMrKrN3nuwkDYzd8dTpaucudJY4 c77rHzhbY88312v31tS409Rwq5KCGpONfRfOIHaRBrNpAGJMjjUzGgrsQiAR/dDPFseW vDzcjaMyqobGGmWnVA0EyEMiQgQCoF4/m5D+g3bQnTRgKSZAVBR/8IYG5bPmQGQABfYC ej5HHHaEtdjf6RAk3N7EplUqAc0648TpJ9i8mPcRkNJmnI2vgQ+bUwC3zQxoAXEqfG1Q X4aX+OgJ3tsk4CJxar5YFdRQsfolHHkqI5By/94bpeGlpQRf1+ARoshbxmF2YLJXUiK4 AVUg== X-Gm-Message-State: AOAM533rvk4R5JhD+Ufgmb0qhdRTOpw+SqWEH1/3yrXEym86Isj2ae2h ADpUY+XhvoEdfk7UiaVgXpHJOuEp1TZkJg== X-Received: by 2002:a17:90a:5515:b0:1dc:c1f1:59bd with SMTP id b21-20020a17090a551500b001dcc1f159bdmr9702248pji.81.1653675570514; Fri, 27 May 2022 11:19:30 -0700 (PDT) Received: from stoup.. (174-21-71-225.tukw.qwest.net. [174.21.71.225]) by smtp.gmail.com with ESMTPSA id t5-20020a17090ae50500b001deb3cbd8f1sm1911612pjy.27.2022.05.27.11.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 11:19:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 023/114] target/arm: Rename do_zpzi_ool to gen_gvec_ool_arg_zpzi Date: Fri, 27 May 2022 11:17:36 -0700 Message-Id: <20220527181907.189259-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220527181907.189259-1-richard.henderson@linaro.org> References: <20220527181907.189259-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename the function to match gen_gvec_ool_arg_zpz, and move to be adjacent. Signed-off-by: Richard Henderson --- target/arm/translate-sve.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index fe11cfed6b..86e87a2078 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -228,6 +228,11 @@ static bool gen_gvec_ool_arg_zpz(DisasContext *s, gen_helper_gvec_3 *fn, return gen_gvec_ool_zzp(s, fn, a->rd, a->rn, a->pg, data); } +static bool gen_gvec_ool_arg_zpzi(DisasContext *s, gen_helper_gvec_3 *fn, + arg_rpri_esz *a) +{ + return gen_gvec_ool_zzp(s, fn, a->rd, a->rn, a->pg, a->imm); +} /* Invoke an out-of-line helper on 3 Zregs and a predicate. */ static void gen_gvec_ool_zzzp(DisasContext *s, gen_helper_gvec_4 *fn, @@ -952,12 +957,6 @@ static bool do_movz_zpz(DisasContext *s, int rd, int rn, int pg, return gen_gvec_ool_zzp(s, fns[esz], rd, rn, pg, invert); } -static bool do_zpzi_ool(DisasContext *s, arg_rpri_esz *a, - gen_helper_gvec_3 *fn) -{ - return gen_gvec_ool_zzp(s, fn, a->rd, a->rn, a->pg, a->imm); -} - static bool trans_ASR_zpzi(DisasContext *s, arg_rpri_esz *a) { static gen_helper_gvec_3 * const fns[4] = { @@ -971,7 +970,7 @@ static bool trans_ASR_zpzi(DisasContext *s, arg_rpri_esz *a) /* Shift by element size is architecturally valid. For arithmetic right-shift, it's the same as by one less. */ a->imm = MIN(a->imm, (8 << a->esz) - 1); - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } static bool trans_LSR_zpzi(DisasContext *s, arg_rpri_esz *a) @@ -988,7 +987,7 @@ static bool trans_LSR_zpzi(DisasContext *s, arg_rpri_esz *a) if (a->imm >= (8 << a->esz)) { return do_movz_zpz(s, a->rd, a->rd, a->pg, a->esz, true); } else { - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } } @@ -1006,7 +1005,7 @@ static bool trans_LSL_zpzi(DisasContext *s, arg_rpri_esz *a) if (a->imm >= (8 << a->esz)) { return do_movz_zpz(s, a->rd, a->rd, a->pg, a->esz, true); } else { - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } } @@ -1024,7 +1023,7 @@ static bool trans_ASRD(DisasContext *s, arg_rpri_esz *a) if (a->imm >= (8 << a->esz)) { return do_movz_zpz(s, a->rd, a->rd, a->pg, a->esz, true); } else { - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } } @@ -1037,7 +1036,7 @@ static bool trans_SQSHL_zpzi(DisasContext *s, arg_rpri_esz *a) if (a->esz < 0 || !dc_isar_feature(aa64_sve2, s)) { return false; } - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } static bool trans_UQSHL_zpzi(DisasContext *s, arg_rpri_esz *a) @@ -1049,7 +1048,7 @@ static bool trans_UQSHL_zpzi(DisasContext *s, arg_rpri_esz *a) if (a->esz < 0 || !dc_isar_feature(aa64_sve2, s)) { return false; } - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } static bool trans_SRSHR(DisasContext *s, arg_rpri_esz *a) @@ -1061,7 +1060,7 @@ static bool trans_SRSHR(DisasContext *s, arg_rpri_esz *a) if (a->esz < 0 || !dc_isar_feature(aa64_sve2, s)) { return false; } - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } static bool trans_URSHR(DisasContext *s, arg_rpri_esz *a) @@ -1073,7 +1072,7 @@ static bool trans_URSHR(DisasContext *s, arg_rpri_esz *a) if (a->esz < 0 || !dc_isar_feature(aa64_sve2, s)) { return false; } - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } static bool trans_SQSHLU(DisasContext *s, arg_rpri_esz *a) @@ -1085,7 +1084,7 @@ static bool trans_SQSHLU(DisasContext *s, arg_rpri_esz *a) if (a->esz < 0 || !dc_isar_feature(aa64_sve2, s)) { return false; } - return do_zpzi_ool(s, a, fns[a->esz]); + return gen_gvec_ool_arg_zpzi(s, fns[a->esz], a); } /*