From patchwork Tue Feb 25 16:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Bergner X-Patchwork-Id: 1244404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520088-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bergner.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=AQUizz9F; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RlJq50mdz9sP7 for ; Wed, 26 Feb 2020 03:49:29 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=cTGqZhP1SVWN7vzq kvAtWww9kTHOd28RzFH5mW8dUz/cMRnFFObb9R0p1oYiTQpSM2FAiHvYu9ccSNxx GmjARXBbJPq1FTjTOhWp3LkOy93V0AQKD45M//s5fE2V83f3wjI3utDHyj9lrCvt Z93mpdMe0TG/vkfoDsup48Vk0rg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=WQAk3AHy5Mamd91iQUkzAk jsgIs=; b=AQUizz9FO3JQ/MPOQK+VEaA08P8740K3fs2CaLYCYnowiK54R3b/ZV Xpv7KixTGlkAEG3X9mUf60TyN935rIDbIqzwN7RH+65brNrhtGvzKD+G4Sv+ul09 u9G8scvhyBdjD3mbR5oYjLCVKZSEAJenQA2XKliZo6U4sJvt+YNgE= Received: (qmail 60516 invoked by alias); 25 Feb 2020 16:49:22 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 60505 invoked by uid 89); 25 Feb 2020 16:49:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=H*UA:Macintosh, H*u:Macintosh X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Feb 2020 16:49:20 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 71E2F6BB7 for ; Tue, 25 Feb 2020 10:49:18 -0600 (CST) Received: from gator3106.hostgator.com ([50.87.144.141]) by cmsmtp with SMTP id 6dOYj0hIdvBMd6dOYjwhI4; Tue, 25 Feb 2020 10:49:18 -0600 Received: from 68-117-56-32.dhcp.roch.mn.charter.com ([68.117.56.32]:54554 helo=[192.168.86.125]) by gator3106.hostgator.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1j6dOX-000Q1g-Ll; Tue, 25 Feb 2020 10:49:17 -0600 To: GCC Patches Cc: Segher Boessenkool , Bill Seurer From: Peter Bergner Subject: [PATCH] rs6000: Fix broken gcc.target/powerpc/fold-vec-st-*.c test cases [PR93913] Message-ID: <348e0d67-30e6-2da5-5352-3bf109769ab8@bergner.org> Date: Tue, 25 Feb 2020 10:49:16 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 POWER9 added the stxv instruction, which is d-form store. When we compile the FAILing test cases in PR93913 when -mcpu=power9 is the default, then we may sometimes get stxv rather than stvx generated. The fix here is to allow both mnemonics when counting. Ok for trunk and GCC 9, where these are FAILing now? Peter PR target/93913 * gcc.target/powerpc/fold-vec-st-char.c (scan-assembler-times): Allow stxv instruction as well. * gcc.target/powerpc/fold-vec-st-float.c: Likewise. * gcc.target/powerpc/fold-vec-st-int.c: Likewise. * gcc.target/powerpc/fold-vec-st-short.c: Likewise. diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c index 4c4582780c2..61cd9462346 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c @@ -91,4 +91,4 @@ testst_cst7 (vector bool char vbc1, int i1, signed char * vscp) return vec_st(vbc1, 36, vscp); } -/* { dg-final { scan-assembler-times {\mstvx\M} 14 } } */ +/* { dg-final { scan-assembler-times {\mstvx|stxv\M} 14 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c index 5a8fc6670a6..408555b0b62 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c @@ -31,4 +31,4 @@ testst_cst2 (vector float vf1, int i1, float * fp) return vec_st(vf1, 24, fp); } -/* { dg-final { scan-assembler-times {\mstvx\M} 4 } } */ +/* { dg-final { scan-assembler-times {\mstvx|stxv\M} 4 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c index 4db35f0dd94..4bb504d6caf 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c @@ -80,5 +80,5 @@ testst_cst7 (vector bool int vbi1, int i1, signed int * vsip) return vec_st(vbi1, 36, vsip); } -/* { dg-final { scan-assembler-times {\mstvx\M} 14 } } */ +/* { dg-final { scan-assembler-times {\mstvx|stxv\M} 14 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c index ba8397eef26..b1f58d865cf 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c @@ -80,4 +80,4 @@ testst_cst7 (vector bool short vbs1, int i1, signed short * vssp) return vec_st(vbs1, 36, vssp); } -/* { dg-final { scan-assembler-times {\mstvx\M} 14} } */ +/* { dg-final { scan-assembler-times {\mstvx|stxv\M} 14} } */