From nobody Sun May 5 06:30:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606137425; cv=none; d=zohomail.com; s=zohoarc; b=GAmAh/bK7Y25O1i+ShrBcUlFPCdj9xwbDU0OOu9cUtvS9l4e8Wqn3jRrCL4/1p9LlZ3FTNHzZGMEmdPmF5yDpgA5SCm2iS9Dr3VUPsXE2nQF7QID5SqEEqugXthue2sxXOq/6MxTZ4VtdJGNEbS3uNBslNX+JlgwCUz6EP/id8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606137425; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/Tn3sfA3WDPKRJLJfgrsOv7xUbRz6Z3QAMrupOGyLVY=; b=L7sL2Rzz/XPbc+uQkCvEo9KI7732L0qfXLNsUKYWR7SqfyW6Q2e+Qjg4C0x414MRQvaNMcsDgfqOpQicsXw7LXRzlvRfFU92NCfJ5mzlgc/d/GNu4vmZkUC469iqGlPewYt9/6Ql29/zeFDrP1ZAdqFtk3nePPoyvYf+G4nqARY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606137425654725.6664217051933; Mon, 23 Nov 2020 05:17:05 -0800 (PST) Received: from localhost ([::1]:39916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khBiJ-000698-S3 for importer@patchew.org; Mon, 23 Nov 2020 08:17:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khBfx-0005DA-RN for qemu-devel@nongnu.org; Mon, 23 Nov 2020 08:14:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khBfu-0002ip-AE for qemu-devel@nongnu.org; Mon, 23 Nov 2020 08:14:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-143-Vd1VNf5hOtytnmq3925csw-1; Mon, 23 Nov 2020 08:14:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29B295212; Mon, 23 Nov 2020 13:14:27 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D39AD5D6D3; Mon, 23 Nov 2020 13:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606137273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Tn3sfA3WDPKRJLJfgrsOv7xUbRz6Z3QAMrupOGyLVY=; b=LUh15pL6JhEM98Am+Od4PH0EjbW0xsAUV2eW4NVAv646FEXSh3mfUEGm3KjZVvYeRgTqRh R4eoFcqi6CxhoHaTfvyKac6gnaHI5sXGBB7eA+MgiQ77nb+8vYt6h6eb7VtwYKPD/IBlww 5eulovEQNaRO59me/t49nWegWA6WJiA= X-MC-Unique: Vd1VNf5hOtytnmq3925csw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] target/i386: fix operand order for PDEP and PEXT Date: Mon, 23 Nov 2020 08:14:26 -0500 Message-Id: <20201123131426.2725276-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Lenard Szolnoki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" For PDEP and PEXT, the mask is provided in the memory (mod+r/m) operand, and therefore is loaded in s->T0 by gen_ldst_modrm. The source is provided in the second source operand (VEX.vvvv) and therefore is loaded in s->T1. Fix the order in which they are passed to the helpers. Reported-by: Lenard Szolnoki Analyzed-by: Lenard Szolnoki Fixes: https://bugs.launchpad.net/qemu/+bug/1605123 Signed-off-by: Paolo Bonzini --- target/i386/translate.c | 8 +++---- tests/tcg/i386/Makefile.target | 4 ++++ tests/tcg/i386/test-i386-bmi2.c | 40 +++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 tests/tcg/i386/test-i386-bmi2.c diff --git a/target/i386/translate.c b/target/i386/translate.c index 4c57307e42..e8f5f5803a 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -3936,14 +3936,14 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, } ot =3D mo_64_32(s->dflag); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - /* Note that by zero-extending the mask operand, we + /* Note that by zero-extending the source operand, we automatically handle zero-extending the result. */ if (ot =3D=3D MO_64) { tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]); } else { tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]); } - gen_helper_pdep(cpu_regs[reg], s->T0, s->T1); + gen_helper_pdep(cpu_regs[reg], s->T1, s->T0); break; =20 case 0x2f5: /* pext Gy, By, Ey */ @@ -3954,14 +3954,14 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, } ot =3D mo_64_32(s->dflag); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - /* Note that by zero-extending the mask operand, we + /* Note that by zero-extending the source operand, we automatically handle zero-extending the result. */ if (ot =3D=3D MO_64) { tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]); } else { tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]); } - gen_helper_pext(cpu_regs[reg], s->T0, s->T1); + gen_helper_pext(cpu_regs[reg], s->T1, s->T0); break; =20 case 0x1f6: /* adcx Gy, Ey */ diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index a66232a67d..9f6f620944 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -18,6 +18,10 @@ test-i386-pcmpistri: CFLAGS +=3D -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS +=3D -cpu max run-plugin-test-i386-pcmpistri-%: QEMU_OPTS +=3D -cpu max =20 +test-i386-bmi2: CFLAGS +=3D -mbmi2 +run-test-i386-bmi2: QEMU_OPTS +=3D -cpu max +run-plugin-test-i386-bmi2-%: QEMU_OPTS +=3D -cpu max + # # hello-i386 is a barebones app # diff --git a/tests/tcg/i386/test-i386-bmi2.c b/tests/tcg/i386/test-i386-bmi= 2.c new file mode 100644 index 0000000000..e7a93b88b4 --- /dev/null +++ b/tests/tcg/i386/test-i386-bmi2.c @@ -0,0 +1,40 @@ +/* See if various BMI2 instructions give expected results */ +#include +#include + +int main(int argc, char *argv[]) { + char hello[16]; + uint64_t ehlo =3D 0x202020204f4c4845ull; + uint64_t mask =3D 0xa080800302020001ull; + uint64_t result64; + uint32_t result32; + + /* 64 bits */ + asm volatile ("pextq %2, %1, %0" : "=3Dr"(result64) : "r"(ehlo), "m"= (mask)); + assert(result64 =3D=3D 133); + + asm volatile ("pdepq %2, %1, %0" : "=3Dr"(result64) : "r"(result64),= "m"(mask)); + assert(result64 =3D=3D (ehlo & mask)); + + asm volatile ("pextq %2, %1, %0" : "=3Dr"(result64) : "r"(-1ull), "m= "(mask)); + assert(result64 =3D=3D 511); /* mask has 9 bits set */ + + asm volatile ("pdepq %2, %1, %0" : "=3Dr"(result64) : "r"(-1ull), "m= "(mask)); + assert(result64 =3D=3D mask); + + /* 32 bits */ + asm volatile ("pextl %2, %k1, %k0" : "=3Dr"(result32) : "r"(ehlo), "= m"(mask)); + assert(result32 =3D=3D 5); + + asm volatile ("pdepl %2, %k1, %k0" : "=3Dr"(result32) : "r"(result32= ), "m"(mask)); + assert(result32 =3D=3D (uint32_t)(ehlo & mask)); + + asm volatile ("pextl %2, %k1, %k0" : "=3Dr"(result32) : "r"(-1ull), = "m"(mask)); + assert(result32 =3D=3D 7); /* mask has 3 bits set */ + + asm volatile ("pdepl %2, %k1, %k0" : "=3Dr"(result32) : "r"(-1ull), = "m"(mask)); + assert(result32 =3D=3D (uint32_t)mask); + + return 0; +} + --=20 2.26.2