From patchwork Wed Jan 22 06:08:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 1226991 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-517970-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axis.com 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=O25IXjT2; 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 482ZjG6m51z9sRR for ; Wed, 22 Jan 2020 17:08:48 +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:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=EV5rA0XQy0MX5j5+ AIagneNGJkwUz6Z19QCEmZ6s1d4AA06aS9s02jO6H/BanYLp+jyO0DOljwquIiZF pWaOWeR0oTjlFLli0fg+R/q4Xz/9NdH3clxh4avBP3M7bYmKgEr7hVwCz+4aR87P GXmY0w55VkHjM+BJKWLkAYOy2CA= 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:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; s=default; bh=+++4a7Xsr3geNr9o6aRnep XlOQ4=; b=O25IXjT2rO3VGfYqaXtN+lVx1cQpRdqYBcp0DxL8HG9a7G9iWVjRH6 LgGr5TrMivVbSoAB1VOjvYR44n+O89xs+dxf5An6Hc5Bo6Ui01GwNAO3MoUthRzT UNY5YZB9TUXaKuotGq8mQvwSeFcwHZbe4RYp0qTje8W63Pm+yOVDc= Received: (qmail 66941 invoked by alias); 22 Jan 2020 06:08:41 -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 66930 invoked by uid 89); 22 Jan 2020 06:08:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: smtp2.axis.com Received: from smtp2.axis.com (HELO smtp2.axis.com) (195.60.68.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2020 06:08:39 +0000 IronPort-SDR: FxOy22KOeDfyeYThSTgEFzgELdUgVrUPvIYU6eUSEaO7f+n2uGbJErFAzVnPCNf17zGRJiYoMD HKM7rLH2XMYpSDwRWxckayGp1CwENmlmQGNZ/Mxk9RZ0flkR7ogs4X5kUYstlOGGtIN1grPXwa m68f2mcx6RKPrJVvMAtkmUqGwsBudb5zfbc5l9p4q+8BtydFi0aaTCQTIEdop3mEPJ/OdECMBs hGqQHCh8d6l9WhR8ya2qceZetBsNHdApDOhBHpH/hcVA/FyyQihVBWUhKjMhEJk3X0TtdSkJK6 RQ4= Date: Wed, 22 Jan 2020 07:08:36 +0100 Message-ID: <202001220608.00M68aIx018042@ignucius.se.axis.com> From: Hans-Peter Nilsson To: Subject: [cris-decc0 5/9] gcc/testsuite: Remove traces of crisv32-* outside gcc.target/cris MIME-Version: 1.0 X-IsSubscribed: yes testsuite: * gcc.dg/20020919-1.c, gcc.dg/pr31866.c, gcc.dg/pr46647.c, gcc.dg/sibcall-10.c, gcc.dg/sibcall-3.c, gcc.dg/sibcall-4.c, gcc.dg/sibcall-9.c, gcc.dg/torture/cris-asm-mof-1.c, gcc.dg/torture/cris-volatile-1.c, gcc.dg/torture/pr38948.c, gcc.dg/tree-ssa/20040204-1.c, gcc.dg/tree-ssa/loop-1.c, gcc.dg/weak/typeof-2.c, lib/target-supports.exp: Remove remaining traces of crisv32-*. Part of the removal of crisv32-* and cris-*-linux* (cris-elf remains). Uses of "cris*" (as opposed to "cris") are deliberately left unadjusted. --- gcc/testsuite/gcc.dg/20020919-1.c | 2 +- gcc/testsuite/gcc.dg/pr31866.c | 2 +- gcc/testsuite/gcc.dg/pr46647.c | 4 ++-- gcc/testsuite/gcc.dg/sibcall-10.c | 2 +- gcc/testsuite/gcc.dg/sibcall-3.c | 2 +- gcc/testsuite/gcc.dg/sibcall-4.c | 2 +- gcc/testsuite/gcc.dg/sibcall-9.c | 2 +- gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c | 2 +- gcc/testsuite/gcc.dg/torture/cris-volatile-1.c | 2 +- gcc/testsuite/gcc.dg/torture/pr38948.c | 1 - gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/loop-1.c | 2 +- gcc/testsuite/gcc.dg/weak/typeof-2.c | 1 - gcc/testsuite/lib/target-supports.exp | 5 ++--- 14 files changed, 14 insertions(+), 17 deletions(-) diff --git a/gcc/testsuite/gcc.dg/20020919-1.c b/gcc/testsuite/gcc.dg/20020919-1.c index 1dcf75e8ff6..38add3a45f0 100644 --- a/gcc/testsuite/gcc.dg/20020919-1.c +++ b/gcc/testsuite/gcc.dg/20020919-1.c @@ -8,7 +8,7 @@ You must be this tall ---> fit two long longs in asm-declared registers to enter this amusement. */ -/* { dg-do compile { target alpha*-*-* cris-*-* crisv32-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */ +/* { dg-do compile { target alpha*-*-* cris-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */ /* { dg-options "-O2" } */ /* Constructed examples; input/output (same register), output, input, and diff --git a/gcc/testsuite/gcc.dg/pr31866.c b/gcc/testsuite/gcc.dg/pr31866.c index 4081c0e6ad9..d6a2ab05690 100644 --- a/gcc/testsuite/gcc.dg/pr31866.c +++ b/gcc/testsuite/gcc.dg/pr31866.c @@ -1,5 +1,5 @@ /* PR tree-optimization/31866 */ -/* { dg-do compile { target alpha*-*-* cris-*-* crisv32-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */ +/* { dg-do compile { target alpha*-*-* cris-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */ /* { dg-options "-O2" } */ #if defined (__alpha__) diff --git a/gcc/testsuite/gcc.dg/pr46647.c b/gcc/testsuite/gcc.dg/pr46647.c index d7ada9650dc..7eefc6e336a 100644 --- a/gcc/testsuite/gcc.dg/pr46647.c +++ b/gcc/testsuite/gcc.dg/pr46647.c @@ -25,5 +25,5 @@ func3 (void) return 0; } -/* The xfail for avr, cris-* and crisv32-* is due to PR53535. */ -/* { dg-final { scan-tree-dump-not "memset" "optimized" { xfail avr-*-* cris-*-* crisv32-*-* } } } */ +/* The xfail for avr and cris-* is due to PR53535. */ +/* { dg-final { scan-tree-dump-not "memset" "optimized" { xfail avr-*-* cris-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/sibcall-10.c b/gcc/testsuite/gcc.dg/sibcall-10.c index 3d58036b468..4ac2ee45fbf 100644 --- a/gcc/testsuite/gcc.dg/sibcall-10.c +++ b/gcc/testsuite/gcc.dg/sibcall-10.c @@ -5,7 +5,7 @@ Copyright (C) 2002 Free Software Foundation Inc. Contributed by Hans-Peter Nilsson */ -/* { dg-do run { xfail { { amdgcn*-*-* cris-*-* crisv32-*-* csky-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ +/* { dg-do run { xfail { { amdgcn*-*-* cris-*-* csky-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ /* -mlongcall disables sibcall patterns. */ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */ /* -msave-restore disables sibcall patterns. */ diff --git a/gcc/testsuite/gcc.dg/sibcall-3.c b/gcc/testsuite/gcc.dg/sibcall-3.c index eafe8dd8456..9962b641298 100644 --- a/gcc/testsuite/gcc.dg/sibcall-3.c +++ b/gcc/testsuite/gcc.dg/sibcall-3.c @@ -5,7 +5,7 @@ Copyright (C) 2002 Free Software Foundation Inc. Contributed by Hans-Peter Nilsson */ -/* { dg-do run { xfail { { cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ +/* { dg-do run { xfail { { cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ /* -mlongcall disables sibcall patterns. */ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */ /* { dg-options "-O2 -foptimize-sibling-calls" } */ diff --git a/gcc/testsuite/gcc.dg/sibcall-4.c b/gcc/testsuite/gcc.dg/sibcall-4.c index 1e039c66854..9ba1d16d489 100644 --- a/gcc/testsuite/gcc.dg/sibcall-4.c +++ b/gcc/testsuite/gcc.dg/sibcall-4.c @@ -5,7 +5,7 @@ Copyright (C) 2002 Free Software Foundation Inc. Contributed by Hans-Peter Nilsson */ -/* { dg-do run { xfail { { cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ +/* { dg-do run { xfail { { cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ /* -mlongcall disables sibcall patterns. */ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */ /* { dg-options "-O2 -foptimize-sibling-calls" } */ diff --git a/gcc/testsuite/gcc.dg/sibcall-9.c b/gcc/testsuite/gcc.dg/sibcall-9.c index 6df671da39d..c06acdbea35 100644 --- a/gcc/testsuite/gcc.dg/sibcall-9.c +++ b/gcc/testsuite/gcc.dg/sibcall-9.c @@ -5,7 +5,7 @@ Copyright (C) 2002 Free Software Foundation Inc. Contributed by Hans-Peter Nilsson */ -/* { dg-do run { xfail { { amdgcn*-*-* cris-*-* crisv32-*-* csky-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* nvptx-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ +/* { dg-do run { xfail { { amdgcn*-*-* cris-*-* csky-*-* h8300-*-* hppa*64*-*-* m32r-*-* mcore-*-* mn10300-*-* msp430*-*-* nds32*-*-* nvptx-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */ /* -mlongcall disables sibcall patterns. */ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */ /* -msave-restore disables sibcall patterns. */ diff --git a/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c b/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c index 5ebde5ed544..77cee9f4278 100644 --- a/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c +++ b/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target cris-*-* crisv32-*-* } } */ +/* { dg-do compile { target cris-*-* } } */ /* { dg-skip-if "" { cris*-*-* } { "-march*" } { "" } } */ /* { dg-options "-O2 -march=v10" } */ /* { dg-final { scan-assembler "in-asm: .mof" } } */ diff --git a/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c b/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c index 6b19852c274..7f613c4dc77 100644 --- a/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c +++ b/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c @@ -2,7 +2,7 @@ Check that size-optimizations for move insns (specifically peephole optimizations) aren't applied to volatile objects in the CRIS port. Origin: Hans-Peter Nilsson. */ -/* { dg-do compile { target cris-*-* crisv32-*-* } } */ +/* { dg-do compile { target cris-*-* } } */ /* { dg-final { scan-assembler-not {movu\...\[} } } */ /* { dg-final { scan-assembler-not {move\.[^d].\[} } } */ /* { dg-final { scan-assembler-not {and\.[^d].\[} } } */ diff --git a/gcc/testsuite/gcc.dg/torture/pr38948.c b/gcc/testsuite/gcc.dg/torture/pr38948.c index 90906eebf22..22cef3b356d 100644 --- a/gcc/testsuite/gcc.dg/torture/pr38948.c +++ b/gcc/testsuite/gcc.dg/torture/pr38948.c @@ -1,5 +1,4 @@ /* { dg-options "-fno-tree-sra" } */ -/* { dg-options "-fno-tree-sra -march=v32" { target cris-*-* } } */ typedef unsigned char byte; typedef unsigned int uint; typedef int bool; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c index 3e07a359b55..b7d50ecd6d6 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c @@ -33,4 +33,4 @@ void test55 (int x, int y) that the && should be emitted (based on BRANCH_COST). Fix this by teaching dom to look through && and register all components as true. */ -/* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail { ! "alpha*-*-* arm*-*-* aarch64*-*-* powerpc*-*-* cris-*-* crisv32-*-* hppa*-*-* i?86-*-* mmix-*-* mips*-*-* m68k*-*-* moxie-*-* nds32*-*-* s390*-*-* sh*-*-* sparc*-*-* visium-*-* x86_64-*-* riscv*-*-* or1k*-*-* msp430-*-* pru*-*-*" } } } } */ +/* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail { ! "alpha*-*-* arm*-*-* aarch64*-*-* powerpc*-*-* cris-*-* hppa*-*-* i?86-*-* mmix-*-* mips*-*-* m68k*-*-* moxie-*-* nds32*-*-* s390*-*-* sh*-*-* sparc*-*-* visium-*-* x86_64-*-* riscv*-*-* or1k*-*-* msp430-*-* pru*-*-*" } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c index 39ee4dea883..a531b7584a6 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c @@ -46,7 +46,7 @@ int xxx(void) /* CRIS and MSP430 keep the address in a register. */ /* m68k sometimes puts the address in a register, depending on CPU and PIC. */ -/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* crisv32-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* x86_64-*-mingw* visium-*-* nvptx*-*-* pdp11*-*-* msp430-*-* amdgcn*-*-* } } } */ +/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* x86_64-*-mingw* visium-*-* nvptx*-*-* pdp11*-*-* msp430-*-* amdgcn*-*-* } } } */ /* { dg-final { scan-assembler-times "foo,%r" 5 { target hppa*-*-* } } } */ /* { dg-final { scan-assembler-times "= foo" 5 { target ia64*-*-* } } } */ /* { dg-final { scan-assembler-times "call\[ \t\]*_foo" 5 { target i?86-*-mingw* i?86-*-cygwin* } } } */ diff --git a/gcc/testsuite/gcc.dg/weak/typeof-2.c b/gcc/testsuite/gcc.dg/weak/typeof-2.c index 51995ca52fa..afce17f53cb 100644 --- a/gcc/testsuite/gcc.dg/weak/typeof-2.c +++ b/gcc/testsuite/gcc.dg/weak/typeof-2.c @@ -42,7 +42,6 @@ int bar3 (int x) // { dg-final { if [string match s390*-*-* $target_triplet ] {return} } } // Likewise for CRIS targets. // { dg-final { if [string match cris-*-* $target_triplet ] {return} } } -// { dg-final { if [string match crisv32-*-* $target_triplet ] {return} } } // Likewise for m68k targets. // { dg-final { if [string match fido-*-* $target_triplet ] {return} } } // { dg-final { if [string match m68k-*-* $target_triplet ] {return} } } diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index f65a8100da9..627e26b4325 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -696,7 +696,6 @@ proc check_profiling_available { test_what } { || [istarget avr-*-*] || [istarget bfin-*-*] || [istarget cris-*-*] - || [istarget crisv32-*-*] || [istarget csky-*-elf] || [istarget fido-*-elf] || [istarget h8300-*-*] @@ -7253,7 +7252,7 @@ proc check_effective_target_sync_int_long { } { || [istarget hppa*-*linux*] || [istarget s390*-*-*] || [istarget powerpc*-*-*] - || [istarget crisv32-*-*] || [istarget cris-*-*] + || [istarget cris-*-*] || ([istarget sparc*-*-*] && [check_effective_target_sparc_v9]) || ([istarget arc*-*-*] && [check_effective_target_arc_atomic]) || [check_effective_target_mips_llsc] }}] @@ -7276,7 +7275,7 @@ proc check_effective_target_sync_char_short { } { || [istarget hppa*-*linux*] || [istarget s390*-*-*] || [istarget powerpc*-*-*] - || [istarget crisv32-*-*] || [istarget cris-*-*] + || [istarget cris-*-*] || ([istarget sparc*-*-*] && [check_effective_target_sparc_v9]) || ([istarget arc*-*-*] && [check_effective_target_arc_atomic]) || [check_effective_target_mips_llsc] }}]