From patchwork Fri Dec 25 20:19:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11990199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F4D8C433E6 for ; Fri, 25 Dec 2020 20:35:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EAEB62222B for ; Fri, 25 Dec 2020 20:35:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAEB62222B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kstns-0001FL-2w for qemu-devel@archiver.kernel.org; Fri, 25 Dec 2020 15:35:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kstZU-0003MF-8a for qemu-devel@nongnu.org; Fri, 25 Dec 2020 15:20:20 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:46245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kstZR-0005HQ-H6 for qemu-devel@nongnu.org; Fri, 25 Dec 2020 15:20:19 -0500 Received: by mail-pl1-x62c.google.com with SMTP id v3so2698055plz.13 for ; Fri, 25 Dec 2020 12:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=abCFmcdljX+t9z34gD3bXt4KVs6SigpcHBBDndfp4Sc=; b=rnnJfibQk+eqdFAThgEifjI2k3/vpK89dWT3/b4dtyawN79+oC8dTNNL8kLqW+NohG VR9fFohKILYKdTfRkuQZKnfWBKA00raAwQOHLrDJ+vhiHHF0b6kZJ/63oLoeDp2OCjHA MNVQ79LJeKz6ZZyYhggHA3HRf/JHAnz25pAR21hEeag9kuSkWmXtX8hvBFA+PJNZXrBF mgZ5qAEOmBCV4+x/vofcPaihQxtw4WwbbUPNCmz8rgJhI/iHkwR6za9b5JRXCGjvYM1i TjcBmQgHTRAOBrWg3+bAV1ygvDTQPcjndAS0+X59eaUvIAGY81qFZk9XnDKOi7GL09aA kbQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=abCFmcdljX+t9z34gD3bXt4KVs6SigpcHBBDndfp4Sc=; b=uhFWQB+xvCr/laZOXI6NEATSNY2BB0g4lRGGaVggN0Asgi55Li47qsv56jJIoavAxh ZTU5dS+hlDuh1l6EcOKSMfXVhc7nRUxJy965FLMmAYD/pusw/489x1OzDWtiINaFiNtx tOO9vMuubqE6DG9xz9hurES8MVCPUCcIgK1FKHybItVrfgIGsCl5rgGZbwSqNPdhwuxS GdGYgymfV10Yz04N888JLgFbkmryZJIRG1kttaYkSa6k/YL2DMr0q089rTonGqHxzKMQ LLK5MH/UW7QQCQ1f1UyVlUXwQQRixt7Buk3jo6WsNeSNt5X57BTqKwGBX8Lnz/S+Bg4O 8E8g== X-Gm-Message-State: AOAM531i2on/AqYdz+OJeXDj+tSMhskA0eFADTDpCAfAR0VuU4EOWgN4 m3rquDFyx02KbHMdQYyuOaf/bTOBTcQycg== X-Google-Smtp-Source: ABdhPJxzWYBmfmN1C3xeNGP/XItUBCLy5b2PS4PdfzErEsfr6HOtfpwZK2JnQxY5SHjxaBDfBhl7Ww== X-Received: by 2002:a17:90a:a10e:: with SMTP id s14mr9615418pjp.133.1608927615924; Fri, 25 Dec 2020 12:20:15 -0800 (PST) Received: from localhost.localdomain (174-21-150-71.tukw.qwest.net. [174.21.150.71]) by smtp.gmail.com with ESMTPSA id l8sm5816497pjt.32.2020.12.25.12.20.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Dec 2020 12:20:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 16/16] tcg/s390x: Implement TCG_TARGET_HAS_cmpsel_vec Date: Fri, 25 Dec 2020 12:19:56 -0800 Message-Id: <20201225201956.692861-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201225201956.692861-1-richard.henderson@linaro.org> References: <20201225201956.692861-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is via expansion; don't actually set TCG_TARGET_HAS_cmpsel_vec. Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.c.inc | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 251287dd29..a345775e60 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -2830,6 +2830,7 @@ int tcg_can_emit_vec_op(TCGOpcode opc, TCGType type, unsigned vece) case INDEX_op_xor_vec: return 1; case INDEX_op_cmp_vec: + case INDEX_op_cmpsel_vec: case INDEX_op_rotrv_vec: return -1; case INDEX_op_mul_vec: @@ -2892,6 +2893,21 @@ static void expand_vec_cmp(TCGType type, unsigned vece, TCGv_vec v0, } } +static void expand_vec_cmpsel(TCGType type, unsigned vece, TCGv_vec v0, + TCGv_vec c1, TCGv_vec c2, + TCGv_vec v3, TCGv_vec v4, TCGCond cond) +{ + TCGv_vec t = tcg_temp_new_vec(type); + + if (expand_vec_cmp_noinv(type, vece, t, c1, c2, cond)) { + /* Invert the sense of the compare by swapping arguments. */ + tcg_gen_bitsel_vec(vece, v0, t, v4, v3); + } else { + tcg_gen_bitsel_vec(vece, v0, t, v3, v4); + } + tcg_temp_free_vec(t); +} + static void expand_vec_sat(TCGType type, unsigned vece, TCGv_vec v0, TCGv_vec v1, TCGv_vec v2, TCGOpcode add_sub_opc) { @@ -2933,7 +2949,7 @@ void tcg_expand_vec_op(TCGOpcode opc, TCGType type, unsigned vece, TCGArg a0, ...) { va_list va; - TCGv_vec v0, v1, v2, t0; + TCGv_vec v0, v1, v2, v3, v4, t0; va_start(va, a0); v0 = temp_tcgv_vec(arg_temp(a0)); @@ -2945,6 +2961,12 @@ void tcg_expand_vec_op(TCGOpcode opc, TCGType type, unsigned vece, expand_vec_cmp(type, vece, v0, v1, v2, va_arg(va, TCGArg)); break; + case INDEX_op_cmpsel_vec: + v3 = temp_tcgv_vec(arg_temp(va_arg(va, TCGArg))); + v4 = temp_tcgv_vec(arg_temp(va_arg(va, TCGArg))); + expand_vec_cmpsel(type, vece, v0, v1, v2, v3, v4, va_arg(va, TCGArg)); + break; + case INDEX_op_rotrv_vec: t0 = tcg_temp_new_vec(type); tcg_gen_neg_vec(vece, t0, v2);