From patchwork Sat Mar 24 02:47:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Hua X-Patchwork-Id: 890388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-475406-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="j3tyhhwy"; 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 407PwS2wYqz9ryk for ; Sat, 24 Mar 2018 13:48:06 +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 :mime-version:from:date:message-id:subject:to:cc:content-type; q=dns; s=default; b=G3tPCY7pojn+147AWQpDp08b4g/+lsbZ5aWkwm43oWB 8SgDHpS59KMxaQUPJB0mt/ky1DqXc8uq3Awhp3M0Yb0ZYRSS8EjadSLAMy1BB3eg SKQdkK1nHiTNKHiHf2zYaXa9um9COZHRqn8EziHfiDWAhG3qgPQLeYHDzVjPqMQc = 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 :mime-version:from:date:message-id:subject:to:cc:content-type; s=default; bh=A78fSibauD8Ybv4P3fdvkXEmNo4=; b=j3tyhhwyKaiKsccEO SEzaUgOcq3ybJNyJxBsL6MY1T/uCNqFB9yADroGUC7iv5OCgWlNv/50LSRK0+kee FkvwDDq1oU2zsR1gwME0R0qXjhDlXUuSl5OvzpJ7gITXP01tV8yvoYJpC9LQP2ae vSnoZUwuKVwX/V7bvJs+SqH9sc= Received: (qmail 72253 invoked by alias); 24 Mar 2018 02:47:58 -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 72168 invoked by uid 89); 24 Mar 2018 02:47:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=64, 45, 44 X-HELO: mail-ot0-f194.google.com Received: from mail-ot0-f194.google.com (HELO mail-ot0-f194.google.com) (74.125.82.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 24 Mar 2018 02:47:49 +0000 Received: by mail-ot0-f194.google.com with SMTP id x6-v6so13855418otg.11 for ; Fri, 23 Mar 2018 19:47:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=uuImzZbxwgtuycOv8cwgqDZDC3C73y5EIYhpfvbAhXY=; b=swn+j/Sh4lJsqU1BOJ8IeVuUV/VAIm7MnHu5i6/l8mrlFTNkG7ojdSynydgVDNsz2z wPWWcj1Rx1PDWFrZr9b/SvRACPacUkhzvpxT0fNnaqh8IYRYocUkqUiW8TqVQQwfQ0Ej zmKAq/kviMkCiyU3r9cTAF0Rgo9ROhdNxjk6cqF0+glKs9XGp4MPIxGHOLirsAawoQ9p 4HgRT8sUuUbWIncYdTmDJCscPzhNbHPl7hZ8s4FXtqvaIXpDnZ8lTw317H9pWl9VudKI SmvULk/WsvphDV/7b0pD77NgKYkdm4NlioRHDWuw7CtoV1cvNfLUg8wRQiM/Yvz2I+gz yJxA== X-Gm-Message-State: AElRT7ECt6+mo7JGVDQIpjegz6s6OYFMcg2z2t04gB+s5u+BeMLzipsB kLG7DlbbCBewXukPdTEJmenieEQcmuxYPYVry82uvQ== X-Google-Smtp-Source: AG47ELsj8Wtdt9xLp+ybds5yR/AAeg+B2YNQPVpzCki3FVQg3txvbaduVsr+t5V6erjiQ0CPnDU6cdpEABosCZuoszo= X-Received: by 2002:a9d:3464:: with SMTP id v91-v6mr18909928otb.159.1521859666921; Fri, 23 Mar 2018 19:47:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.74.72.70 with HTTP; Fri, 23 Mar 2018 19:47:46 -0700 (PDT) From: Paul Hua Date: Sat, 24 Mar 2018 10:47:46 +0800 Message-ID: Subject: [PATCH, Testsuite, MIPS] Fixing fix-r4000-n.c failure started with r255348 To: gcc-patches Cc: Matthew.Fortune@mips.com, Catherine Moore X-IsSubscribed: yes Hi: The fix-r4000-n.c test fails after r255348, cause the r255348 does not print "[length = NN]" but "[c=NN l=NN]". The asm for fix-r4000-1.c. before r255348: ... mult $4,$5 # 10 mulsi3_r4000 [length = 8] mflo $2 ... after r255348: ... mult $4,$5 # 10 [c=40 l=8] mulsi3_r4000 mflo $2 ... So changes those tests for match new print styles. The changes in patch for fix-r4000-1.c -/* { dg-final { scan-assembler-times "[concat {\tmult\t\$[45],\$[45][^\n]+mulsi3_r4000[^\n]+\n\tmflo\t\$2\n}]" 2 } } */ +/* { dg-final { scan-assembler-times "[concat {\tmult\t\$[45],\$[45][^\n]+mulsi3_r4000\n\tmflo\t\$2\n}]" 2 } } */ And also changes dg-final scan-assembler "mulditi3_r4000" instead of "mulditi3" in fix-r4000-7.c. changes dg-final scan-assembler "umulditi3_r4000" instead of "umulditi3" in fix-r4000-8.c. Thanks. Paul Hua. ChangeLog entries: gcc/testsuite/ChangeLog 2018-03-24 Chenghua Xu * gcc.target/mips/fix-r4000-1.c: Delete "[^\n]" in dg-final. * gcc.target/mips/fix-r4000-2.c: Likewise. * gcc.target/mips/fix-r4000-3.c: Likewise. * gcc.target/mips/fix-r4000-4.c: Likewise. * gcc.target/mips/fix-r4000-5.c: Likewise. * gcc.target/mips/fix-r4000-6.c: Likewise. * gcc.target/mips/fix-r4000-7.c: Likewise. * gcc.target/mips/fix-r4000-8.c: Likewise. * gcc.target/mips/fix-r4000-9.c: Likewise. * gcc.target/mips/fix-r4000-10.c: Likewise. * gcc.target/mips/fix-r4000-7.c: Change dg-final "mulditi3_r4000" instead of "mulditi3". * gcc.target/mips/fix-r4000-8.c: Change dg-final "umulditi3_r4000" instead of "umulditi3". diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-1.c b/gcc/testsuite/gcc.target/mips/fix-r4000-1.c index 5c812f25600..36062b0f6da 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-1.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-1.c @@ -4,4 +4,4 @@ typedef int int32_t; typedef int uint32_t; NOMIPS16 int32_t foo (int32_t x, int32_t y) { return x * y; } NOMIPS16 uint32_t bar (uint32_t x, uint32_t y) { return x * y; } -/* { dg-final { scan-assembler-times "[concat {\tmult\t\$[45],\$[45][^\n]+mulsi3_r4000[^\n]+\n\tmflo\t\$2\n}]" 2 } } */ +/* { dg-final { scan-assembler-times "[concat {\tmult\t\$[45],\$[45][^\n]+mulsi3_r4000\n\tmflo\t\$2\n}]" 2 } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-10.c b/gcc/testsuite/gcc.target/mips/fix-r4000-10.c index 7227bc8c092..7345eb511be 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-10.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-10.c @@ -6,4 +6,4 @@ typedef unsigned long long uint64_t; typedef unsigned int uint128_t __attribute__((mode(TI))); NOMIPS16 uint128_t foo (uint64_t x, uint64_t y) { return (uint128_t) x * y; } -/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umulditi3_r4000[^\n]+\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umulditi3_r4000\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-2.c b/gcc/testsuite/gcc.target/mips/fix-r4000-2.c index 0261b16b1c8..4290d5f7fab 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-2.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-2.c @@ -6,4 +6,4 @@ typedef long long int64_t; NOMIPS16 int32_t foo (int32_t x, int32_t y) { return ((int64_t) x * y) >> 32; } /* ??? A highpart pattern would be a better choice, but we currently don't use them. */ -/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+mulsidi3_32bit_r4000[^\n]+\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+mulsidi3_32bit_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-3.c b/gcc/testsuite/gcc.target/mips/fix-r4000-3.c index 195a9d10ced..5bc8fc8ddd4 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-3.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-3.c @@ -5,4 +5,4 @@ typedef unsigned long long uint64_t; NOMIPS16 uint32_t foo (uint32_t x, uint32_t y) { return ((uint64_t) x * y) >> 32; } /* ??? A highpart pattern would be a better choice, but we currently don't use them. */ -/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsidi3_32bit_r4000[^\n]+\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsidi3_32bit_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-4.c b/gcc/testsuite/gcc.target/mips/fix-r4000-4.c index 7a66182f524..4b655b5edf6 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-4.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-4.c @@ -7,4 +7,4 @@ typedef int int32_t; typedef long long int64_t; NOMIPS16 int64_t foo (int32_t x, int32_t y) { return (int64_t) x * y; } -/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+mulsidi3_32bit_r4000[^\n]+\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+mulsidi3_32bit_r4000\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-5.c b/gcc/testsuite/gcc.target/mips/fix-r4000-5.c index 0c063080068..7536399e5c1 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-5.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-5.c @@ -6,4 +6,4 @@ typedef unsigned int uint32_t; typedef unsigned long long uint64_t; NOMIPS16 uint64_t foo (uint32_t x, uint32_t y) { return (uint64_t) x * y; } -/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsidi3_32bit_r4000[^\n]+\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsidi3_32bit_r4000\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-6.c b/gcc/testsuite/gcc.target/mips/fix-r4000-6.c index 9647a900cdd..cee756b2701 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-6.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-6.c @@ -4,4 +4,4 @@ typedef long long int64_t; typedef unsigned long long uint64_t; NOMIPS16 int64_t foo (int64_t x, int64_t y) { return x * y; } NOMIPS16 uint64_t bar (uint64_t x, uint64_t y) { return x * y; } -/* { dg-final { scan-assembler-times "[concat {\tdmult\t\$[45],\$[45][^\n]+muldi3_r4000[^\n]+\n\tmflo\t\$2\n}]" 2 } } */ +/* { dg-final { scan-assembler-times "[concat {\tdmult\t\$[45],\$[45][^\n]+muldi3_r4000\n\tmflo\t\$2\n}]" 2 } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-7.c b/gcc/testsuite/gcc.target/mips/fix-r4000-7.c index ddba3038350..25178db9070 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-7.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-7.c @@ -6,4 +6,4 @@ typedef int int128_t __attribute__((mode(TI))); NOMIPS16 int64_t foo (int64_t x, int64_t y) { return ((int128_t) x * y) >> 64; } /* ??? A highpart pattern would be a better choice, but we currently don't use them. */ -/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+mulditi3[^\n]+\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+mulditi3_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-8.c b/gcc/testsuite/gcc.target/mips/fix-r4000-8.c index 4ae670622ba..eae148817ce 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-8.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-8.c @@ -5,4 +5,4 @@ typedef unsigned int uint128_t __attribute__((mode(TI))); NOMIPS16 uint64_t foo (uint64_t x, uint64_t y) { return ((uint128_t) x * y) >> 64; } /* ??? A highpart pattern would be a better choice, but we currently don't use them. */ -/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umulditi3[^\n]+\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umulditi3_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-9.c b/gcc/testsuite/gcc.target/mips/fix-r4000-9.c index 316715c5934..63610f97812 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-9.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-9.c @@ -7,4 +7,4 @@ typedef long long int64_t; typedef int int128_t __attribute__((mode(TI))); NOMIPS16 int128_t foo (int64_t x, int64_t y) { return (int128_t) x * y; } -/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+mulditi3_r4000[^\n]+\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+mulditi3_r4000\n\tmflo\t\$2\n\tmfhi\t\$3\n}]" } } */