From patchwork Sat May 18 19:14:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164462 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp3714429ili; Sat, 18 May 2019 12:21:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEkf9jVYULYZ+GMntLlmLO6pEzZrlC0nybMD3+bSNZgqWHlXPVJZLaDyEVFKaIpIszJkRb X-Received: by 2002:a50:a535:: with SMTP id y50mr65976242edb.249.1558207285223; Sat, 18 May 2019 12:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558207285; cv=none; d=google.com; s=arc-20160816; b=VObpd/5WjzqT3hWnKccdyIGScGAeRvame/3ZlTn4mo459MY/2t+mD+IbJmlOdKaxDB MmJD/fRdJqi9EGI7RYG9u+C8NO7P1ArpyJeXj7T3Q8RcKe/PfF0FVpjUiuGaCBB/4FXe Fk04LLtqHFKfvYyUdA+rmqYj3MYhO2MPNhR+jCsEVKYi7GxXCyhK6Nl1PAFi4HrPJeyZ 5EdntWWIz5Q9/1NmUI80UrsObmAZyAve8eP0PyA0hoiHc2AQjLQQ98PeXDftKf8O898v 4KPalsYQyJrfZU/wSL/eQMIqBBdL4VHEpx5Kr5xoVNf44UZGwqcURIj30HL9JxB+m7q5 hXHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=/XvYsO2SMXHmlimUy7MwwAYOFOLdPZ1B4fSPHYjvaz0=; b=XlswT1sQebxBxffdgfEVM5C/WdmwTQQgkymLRZkYUWyp5f8oMM3JrzKVzqIuP9sHK0 h2HYZsQ/V6WTYnflhQhBuYZ2c9qwjJurIG7u4RHbu1KFD3DxvPKU+64T561aTVp0qQqg g7QfSNzfP/gvmnOxOL1/iym/HgLe3r9srtqGcxgBQNC5zJFKGtDLe7VlSIhaRbLZJSJi 76bUSdxch9dPHYWC9Utd/cCK/ci/NC702szkepZOd5OkDFDVE5GKcu0uv0MlEoXEsNM1 YckcD1y66gZy2M9z/ruwhScK7s2vtCnQVGug4Y3QOoyapKIJGDecarAlobq3QFCQTe/P tNyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qCLlpwfK; 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=fail (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 l5si7957540ejs.340.2019.05.18.12.21.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 18 May 2019 12:21:25 -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=fail header.i=@linaro.org header.s=google header.b=qCLlpwfK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:37864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hS4tY-0008Rm-4Q for patch@linaro.org; Sat, 18 May 2019 15:21:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hS4n3-0003Ge-NR for qemu-devel@nongnu.org; Sat, 18 May 2019 15:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hS4n2-0002l9-G0 for qemu-devel@nongnu.org; Sat, 18 May 2019 15:14:41 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:34097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hS4n2-0002kR-9u for qemu-devel@nongnu.org; Sat, 18 May 2019 15:14:40 -0400 Received: by mail-pg1-x544.google.com with SMTP id c13so4850640pgt.1 for ; Sat, 18 May 2019 12:14:40 -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; bh=/XvYsO2SMXHmlimUy7MwwAYOFOLdPZ1B4fSPHYjvaz0=; b=qCLlpwfKHSJpgpjBA2qtiiK9mqNyw6GYWneW+yg5spKIxvhl7VtBWeWh1Ctx7ipXkI LhbnoFraiqyOO/bH/2KXbkBPsb46O+4w/u85ioTDF52yGqqg5vop9uBuaMdbYfHLV0Kj 5pq0w77H6FrzC/TeqaWQQvCwbkpGNTRlrP0JODWN03LH9uifd6zD9B3k5ma7xf0ZxoS4 Ke1wYfLPaXGcPOcCnst/F54pAFxGYyWxrAIBnpZdo0SE+wMh1o45EMV90cdPBTq+qYlG htQDqHO+bgShN4GWIYQ9/ck6wNKc7Z55QTZ3JDfPrkR3r5fB7jOGALkqo4nWCPM8+KRK Grmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/XvYsO2SMXHmlimUy7MwwAYOFOLdPZ1B4fSPHYjvaz0=; b=E0wyB4g6L+6rv6DAcCEofYOH8D8R7P9XN81XlYYPzWbVmnbSxxbyVComicUQzvNI1F sGhakIbMG6ft4Ehn4NcLMeL3KaIny6Ay11IDNkpdsOEV0j5wy0d6ECiT1Kz9kMthNMhq PU0X2JezLWdmtTl4VwBslThbA3InYQVyu9MocibdSm1xT1WuPkwu2VaQLoIiVtuCOc3j e+RK4LitJ+GNQ91G4+O/nkFIUI6UWCVE4eIRPCfxApoyC5aOxOmtrOZR8Ve4wY6TagTd W++pqaEF/UiVTKBZJmOVso8NU3lyomas6bkncWxe9hvnUuTdgqHwa7HIDY/ZUesz/u+k Mv+g== X-Gm-Message-State: APjAAAXMBtbOpEyhWsQQrWoGmPG25uigtYF+1u51LWd2taYsVLjwyncX jp/GXVg2ZzgsBXrIbZCVC0Bd9GCW5oE= X-Received: by 2002:a65:640b:: with SMTP id a11mr50182725pgv.219.1558206879108; Sat, 18 May 2019 12:14:39 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id d186sm19206675pfd.183.2019.05.18.12.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 May 2019 12:14:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 18 May 2019 12:14:29 -0700 Message-Id: <20190518191430.21686-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190518191430.21686-1-richard.henderson@linaro.org> References: <20190518191430.21686-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH 1/2] target/ppc: Use vector variable shifts for VSL, VSR, VSRA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The gvec expanders take care of masking the shift amount against the element width. Signed-off-by: Richard Henderson --- target/ppc/helper.h | 12 ---------- target/ppc/int_helper.c | 37 ----------------------------- target/ppc/translate/vmx-impl.inc.c | 24 +++++++++---------- 3 files changed, 12 insertions(+), 61 deletions(-) -- 2.17.1 diff --git a/target/ppc/helper.h b/target/ppc/helper.h index 638a6e99c4..02b67a333e 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -180,18 +180,6 @@ DEF_HELPER_3(vmuloub, void, avr, avr, avr) DEF_HELPER_3(vmulouh, void, avr, avr, avr) DEF_HELPER_3(vmulouw, void, avr, avr, avr) DEF_HELPER_3(vmuluwm, void, avr, avr, avr) -DEF_HELPER_3(vsrab, void, avr, avr, avr) -DEF_HELPER_3(vsrah, void, avr, avr, avr) -DEF_HELPER_3(vsraw, void, avr, avr, avr) -DEF_HELPER_3(vsrad, void, avr, avr, avr) -DEF_HELPER_3(vsrb, void, avr, avr, avr) -DEF_HELPER_3(vsrh, void, avr, avr, avr) -DEF_HELPER_3(vsrw, void, avr, avr, avr) -DEF_HELPER_3(vsrd, void, avr, avr, avr) -DEF_HELPER_3(vslb, void, avr, avr, avr) -DEF_HELPER_3(vslh, void, avr, avr, avr) -DEF_HELPER_3(vslw, void, avr, avr, avr) -DEF_HELPER_3(vsld, void, avr, avr, avr) DEF_HELPER_3(vslo, void, avr, avr, avr) DEF_HELPER_3(vsro, void, avr, avr, avr) DEF_HELPER_3(vsrv, void, avr, avr, avr) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index f6a088ac08..40a7035df0 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -1776,23 +1776,6 @@ VSHIFT(l, 1) VSHIFT(r, 0) #undef VSHIFT -#define VSL(suffix, element, mask) \ - void helper_vsl##suffix(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ - { \ - int i; \ - \ - for (i = 0; i < ARRAY_SIZE(r->element); i++) { \ - unsigned int shift = b->element[i] & mask; \ - \ - r->element[i] = a->element[i] << shift; \ - } \ - } -VSL(b, u8, 0x7) -VSL(h, u16, 0x0F) -VSL(w, u32, 0x1F) -VSL(d, u64, 0x3F) -#undef VSL - void helper_vslv(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) { int i; @@ -1965,26 +1948,6 @@ VNEG(vnegw, s32) VNEG(vnegd, s64) #undef VNEG -#define VSR(suffix, element, mask) \ - void helper_vsr##suffix(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ - { \ - int i; \ - \ - for (i = 0; i < ARRAY_SIZE(r->element); i++) { \ - unsigned int shift = b->element[i] & mask; \ - r->element[i] = a->element[i] >> shift; \ - } \ - } -VSR(ab, s8, 0x7) -VSR(ah, s16, 0xF) -VSR(aw, s32, 0x1F) -VSR(ad, s64, 0x3F) -VSR(b, u8, 0x7) -VSR(h, u16, 0xF) -VSR(w, u32, 0x1F) -VSR(d, u64, 0x3F) -#undef VSR - void helper_vsro(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) { int sh = (b->VsrB(0xf) >> 3) & 0xf; diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.inc.c index 6861f4c5b9..663275b729 100644 --- a/target/ppc/translate/vmx-impl.inc.c +++ b/target/ppc/translate/vmx-impl.inc.c @@ -530,21 +530,21 @@ GEN_VXFORM(vmuleuw, 4, 10); GEN_VXFORM(vmulesb, 4, 12); GEN_VXFORM(vmulesh, 4, 13); GEN_VXFORM(vmulesw, 4, 14); -GEN_VXFORM(vslb, 2, 4); -GEN_VXFORM(vslh, 2, 5); -GEN_VXFORM(vslw, 2, 6); +GEN_VXFORM_V(vslb, MO_8, tcg_gen_gvec_shlv, 2, 4); +GEN_VXFORM_V(vslh, MO_16, tcg_gen_gvec_shlv, 2, 5); +GEN_VXFORM_V(vslw, MO_32, tcg_gen_gvec_shlv, 2, 6); GEN_VXFORM(vrlwnm, 2, 6); GEN_VXFORM_DUAL(vslw, PPC_ALTIVEC, PPC_NONE, \ vrlwnm, PPC_NONE, PPC2_ISA300) -GEN_VXFORM(vsld, 2, 23); -GEN_VXFORM(vsrb, 2, 8); -GEN_VXFORM(vsrh, 2, 9); -GEN_VXFORM(vsrw, 2, 10); -GEN_VXFORM(vsrd, 2, 27); -GEN_VXFORM(vsrab, 2, 12); -GEN_VXFORM(vsrah, 2, 13); -GEN_VXFORM(vsraw, 2, 14); -GEN_VXFORM(vsrad, 2, 15); +GEN_VXFORM_V(vsld, MO_64, tcg_gen_gvec_shlv, 2, 23); +GEN_VXFORM_V(vsrb, MO_8, tcg_gen_gvec_shrv, 2, 8); +GEN_VXFORM_V(vsrh, MO_16, tcg_gen_gvec_shrv, 2, 9); +GEN_VXFORM_V(vsrw, MO_32, tcg_gen_gvec_shrv, 2, 10); +GEN_VXFORM_V(vsrd, MO_64, tcg_gen_gvec_shrv, 2, 27); +GEN_VXFORM_V(vsrab, MO_8, tcg_gen_gvec_sarv, 2, 12); +GEN_VXFORM_V(vsrah, MO_16, tcg_gen_gvec_sarv, 2, 13); +GEN_VXFORM_V(vsraw, MO_32, tcg_gen_gvec_sarv, 2, 14); +GEN_VXFORM_V(vsrad, MO_64, tcg_gen_gvec_sarv, 2, 15); GEN_VXFORM(vsrv, 2, 28); GEN_VXFORM(vslv, 2, 29); GEN_VXFORM(vslo, 6, 16);