From patchwork Fri Feb 17 07:06:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1744080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=IRBPQiMI; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PJ2tF5JgMz240c for ; Fri, 17 Feb 2023 18:06:45 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A49663857B93 for ; Fri, 17 Feb 2023 07:06:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A49663857B93 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676617603; bh=zJJ36ZvQtrPyIVAB6IBvckm2t4CtAp2ysDvd/iznrVc=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=IRBPQiMISdmRVsde5lDA8KCTnosJIIJUP73pQdwVhuERnEhVuc/3CLiElJxX+k43T rjb5Ey/5D20rTJHTSSl05bvQ+e93TZyf2m609kBonRzChZGnawA6QMCLp9YsT5G5ol NN7TS4PCiKAF5AGv7OiFjlEnsK6sTBtzdfLzVsXc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id BE7E83858D33 for ; Fri, 17 Feb 2023 07:06:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE7E83858D33 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 92568116B69; Fri, 17 Feb 2023 02:06:23 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id bPi91U4OpV-W; Fri, 17 Feb 2023 02:06:23 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 51E1B116B60; Fri, 17 Feb 2023 02:06:23 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 31H7603w090844 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 04:06:00 -0300 To: gcc-patches@gcc.gnu.org Cc: nickc@redhat.com, richard.earnshaw@arm.com, ramana.gcc@gmail.com, kyrylo.tkachov@arm.com Subject: [PATCH] [arm] disable aes-1742098 mitigation for a72 combine tests Organization: Free thinker, does not speak for AdaCore Date: Fri, 17 Feb 2023 04:06:00 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The expected asm output for aes-fuse-[12].c does not correspond to that which is generated when -mfix-cortex-a57-aes-1742098 is enabled. It was introduced after the test, and enabled by default for the selected processor. Disabling the option restores the circumstance that was tested for. Regstrapped on x86_64-linux-gnu. Tested on arm-vxworks7 (gcc-12) and arm-eabi (trunk). Ok to install? for gcc/testsuite/ChangeLog * gcc.target/arm/aes-fuse-1.c: Add -mno-fix-cortex-a57-aes-1742098. * gcc.target/arm/aes-fuse-2.c: Likewise. --- gcc/testsuite/gcc.target/arm/aes-fuse-1.c | 4 ++++ gcc/testsuite/gcc.target/arm/aes-fuse-2.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gcc/testsuite/gcc.target/arm/aes-fuse-1.c b/gcc/testsuite/gcc.target/arm/aes-fuse-1.c index 27b08aeef7ba7..6ffb4991cca69 100644 --- a/gcc/testsuite/gcc.target/arm/aes-fuse-1.c +++ b/gcc/testsuite/gcc.target/arm/aes-fuse-1.c @@ -2,6 +2,10 @@ /* { dg-require-effective-target arm_crypto_ok } */ /* { dg-add-options arm_crypto } */ /* { dg-additional-options "-mcpu=cortex-a72 -O3 -dp" } */ +/* The mitigation applies to a72 by default, and protects the CRYPTO_AES + inputs, such as the explicit xor ops, from being combined like test used to + expect. */ +/* { dg-additional-options "-mno-fix-cortex-a57-aes-1742098" } */ #include diff --git a/gcc/testsuite/gcc.target/arm/aes-fuse-2.c b/gcc/testsuite/gcc.target/arm/aes-fuse-2.c index 1266a28753169..b72479c0e5726 100644 --- a/gcc/testsuite/gcc.target/arm/aes-fuse-2.c +++ b/gcc/testsuite/gcc.target/arm/aes-fuse-2.c @@ -2,6 +2,10 @@ /* { dg-require-effective-target arm_crypto_ok } */ /* { dg-add-options arm_crypto } */ /* { dg-additional-options "-mcpu=cortex-a72 -O3 -dp" } */ +/* The mitigation applies to a72 by default, and protects the CRYPTO_AES + inputs, such as the explicit xor ops, from being combined like test used to + expect. */ +/* { dg-additional-options "-mno-fix-cortex-a57-aes-1742098" } */ #include