From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 A596CC43331 for ; Wed, 1 Apr 2020 22:54:57 +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 794B0206E9 for ; Wed, 1 Apr 2020 22:54:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 794B0206E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJmG8-0000wt-Kj for qemu-devel@archiver.kernel.org; Wed, 01 Apr 2020 18:54:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47501) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJmFa-0000Wm-Ef for qemu-devel@nongnu.org; Wed, 01 Apr 2020 18:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJmFZ-0001Im-0W for qemu-devel@nongnu.org; Wed, 01 Apr 2020 18:54:22 -0400 Received: from soltyk.jannau.net ([5.9.120.237]:58604) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJmFY-0001DS-QJ for qemu-devel@nongnu.org; Wed, 01 Apr 2020 18:54:20 -0400 Received: from coburn.home.jannau.net (p579AD68C.dip0.t-ipconnect.de [87.154.214.140]) by soltyk.jannau.net (Postfix) with ESMTPSA id DBF023E00B9; Thu, 2 Apr 2020 00:54:17 +0200 (CEST) From: Janne Grunau To: qemu-devel@nongnu.org Subject: [PATCH 1/1] target/i386: fix phadd* with identical destination and source register Date: Thu, 2 Apr 2020 00:52:53 +0200 Message-Id: <20200401225253.30745-1-j@jannau.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 5.9.120.237 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: Paolo Bonzini , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Detected by asm test suite failures in dav1d (https://code.videolan.org/videolan/dav1d). Can be reproduced by `qemu-x86_64 -cpu core2duo ./tests/checkasm --test=3Dmc_8bpc 1659890620`. Signed-off-by: Janne Grunau --- target/i386/ops_sse.h | 53 +++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index ec1ec745d0..2f41511aef 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -1435,34 +1435,47 @@ void glue(helper_pshufb, SUFFIX)(CPUX86State *env= , Reg *d, Reg *s) =20 void glue(helper_phaddw, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) { - d->W(0) =3D (int16_t)d->W(0) + (int16_t)d->W(1); - d->W(1) =3D (int16_t)d->W(2) + (int16_t)d->W(3); - XMM_ONLY(d->W(2) =3D (int16_t)d->W(4) + (int16_t)d->W(5)); - XMM_ONLY(d->W(3) =3D (int16_t)d->W(6) + (int16_t)d->W(7)); - d->W((2 << SHIFT) + 0) =3D (int16_t)s->W(0) + (int16_t)s->W(1); - d->W((2 << SHIFT) + 1) =3D (int16_t)s->W(2) + (int16_t)s->W(3); - XMM_ONLY(d->W(6) =3D (int16_t)s->W(4) + (int16_t)s->W(5)); - XMM_ONLY(d->W(7) =3D (int16_t)s->W(6) + (int16_t)s->W(7)); + + Reg r; + + r.W(0) =3D (int16_t)d->W(0) + (int16_t)d->W(1); + r.W(1) =3D (int16_t)d->W(2) + (int16_t)d->W(3); + XMM_ONLY(r.W(2) =3D (int16_t)d->W(4) + (int16_t)d->W(5)); + XMM_ONLY(r.W(3) =3D (int16_t)d->W(6) + (int16_t)d->W(7)); + r.W((2 << SHIFT) + 0) =3D (int16_t)s->W(0) + (int16_t)s->W(1); + r.W((2 << SHIFT) + 1) =3D (int16_t)s->W(2) + (int16_t)s->W(3); + XMM_ONLY(r.W(6) =3D (int16_t)s->W(4) + (int16_t)s->W(5)); + XMM_ONLY(r.W(7) =3D (int16_t)s->W(6) + (int16_t)s->W(7)); + + *d =3D r; } =20 void glue(helper_phaddd, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) { - d->L(0) =3D (int32_t)d->L(0) + (int32_t)d->L(1); - XMM_ONLY(d->L(1) =3D (int32_t)d->L(2) + (int32_t)d->L(3)); - d->L((1 << SHIFT) + 0) =3D (int32_t)s->L(0) + (int32_t)s->L(1); - XMM_ONLY(d->L(3) =3D (int32_t)s->L(2) + (int32_t)s->L(3)); + Reg r; + + r.L(0) =3D (int32_t)d->L(0) + (int32_t)d->L(1); + XMM_ONLY(r.L(1) =3D (int32_t)d->L(2) + (int32_t)d->L(3)); + r.L((1 << SHIFT) + 0) =3D (int32_t)s->L(0) + (int32_t)s->L(1); + XMM_ONLY(r.L(3) =3D (int32_t)s->L(2) + (int32_t)s->L(3)); + + *d =3D r; } =20 void glue(helper_phaddsw, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) { - d->W(0) =3D satsw((int16_t)d->W(0) + (int16_t)d->W(1)); - d->W(1) =3D satsw((int16_t)d->W(2) + (int16_t)d->W(3)); - XMM_ONLY(d->W(2) =3D satsw((int16_t)d->W(4) + (int16_t)d->W(5))); - XMM_ONLY(d->W(3) =3D satsw((int16_t)d->W(6) + (int16_t)d->W(7))); - d->W((2 << SHIFT) + 0) =3D satsw((int16_t)s->W(0) + (int16_t)s->W(1)= ); - d->W((2 << SHIFT) + 1) =3D satsw((int16_t)s->W(2) + (int16_t)s->W(3)= ); - XMM_ONLY(d->W(6) =3D satsw((int16_t)s->W(4) + (int16_t)s->W(5))); - XMM_ONLY(d->W(7) =3D satsw((int16_t)s->W(6) + (int16_t)s->W(7))); + Reg r; + + r.W(0) =3D satsw((int16_t)d->W(0) + (int16_t)d->W(1)); + r.W(1) =3D satsw((int16_t)d->W(2) + (int16_t)d->W(3)); + XMM_ONLY(r.W(2) =3D satsw((int16_t)d->W(4) + (int16_t)d->W(5))); + XMM_ONLY(r.W(3) =3D satsw((int16_t)d->W(6) + (int16_t)d->W(7))); + r.W((2 << SHIFT) + 0) =3D satsw((int16_t)s->W(0) + (int16_t)s->W(1))= ; + r.W((2 << SHIFT) + 1) =3D satsw((int16_t)s->W(2) + (int16_t)s->W(3))= ; + XMM_ONLY(r.W(6) =3D satsw((int16_t)s->W(4) + (int16_t)s->W(5))); + XMM_ONLY(r.W(7) =3D satsw((int16_t)s->W(6) + (int16_t)s->W(7))); + + *d =3D r; } =20 void glue(helper_pmaddubsw, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) --=20 2.25.1