From patchwork Sun Jan 7 20:12:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 185760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp690443dyq; Sun, 7 Jan 2024 12:12:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFljj/LQ/KzeyCutMJHLih9ou/AE9v0cHFWTXlx8wCoBAw0E9DOkFkZ54lfOG9mYRX/D84N X-Received: by 2002:ac8:7f50:0:b0:429:9291:8b74 with SMTP id g16-20020ac87f50000000b0042992918b74mr1381526qtk.110.1704658367144; Sun, 07 Jan 2024 12:12:47 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1704658367; cv=pass; d=google.com; s=arc-20160816; b=o2bTe8pdi/V2qEMiHmrwv97cYdWkgArmA5uzIZqflHkJUc7yPcDW1NfGZcn35BAsla adrMJh3cpooD5xbf4WDoFeYoYg1K9dJjnzehGZjkjxSWQrjamF5nnwNkaAqTgfprEZRS AmFW0a+/Rhm4o0s4cvApAkcljeH7Bx3rKvOv0Oyr5nlJgEhK/XkRi29A/g9tkZdgeM/K 2GMUUBnDfwthRWkfGQRWNkizz5rTHcmJU/HSrsqikzlsabyn12xBkqcoOceZZRbSutPq 0g9JGPL55a4QXa0IsZk6CGWhQaxaiWYcKNuvTof3sMTHB7s0CUdw39Vx2Tyc1K4lrPGr kvPQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :subject:from:to:content-language:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature:arc-filter:dmarc-filter :delivered-to; bh=Jh+aahDp3UcMBxufXxHu7tUnBm4KsZn5/tgQru82OTI=; fh=pWdLyvNb+I1vVBXs4KtLops0oPhAUdW1QRfYuCnnNPM=; b=mJFxqUKiAZ6lEwx4Jb4002pe4QgVLe4kofDh1HR8XEb4HRo9/2rH9SDkeO8FL1W4dM co9UWn6RmJpZ375UsmuDp2opgnd7r3l9jTd5TJQyxGXOcMIWN7FujTW7GMLhnJpnPliE sMCIHaB8kZztcfkuchfK+9N6fjiAropY0UtuaF3eIinwKQzSd8BuVZqIG3Y5dFm09j5Q tFF9MaDcvQ0gL8hSoq59kq8pK59Daz1NkVEKqy0MsoegxqrzsfEkJ5N4umoShY9/ax9A lwRKE20U7tqqE34ooPoQZDK1tash4HM24HLCe+r+JM1HR0sZwbg6eo1b6y9A4w+B8kKK f8og== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@gjlay.de header.s=strato-dkim-0002 header.b=p12To7yp; dkim=neutral (no key) header.i=@gjlay.de header.s=strato-dkim-0003; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id e22-20020ac85996000000b0042996ed2560si417812qte.132.2024.01.07.12.12.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 12:12:47 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gjlay.de header.s=strato-dkim-0002 header.b=p12To7yp; dkim=neutral (no key) header.i=@gjlay.de header.s=strato-dkim-0003; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D5DFC3858425 for ; Sun, 7 Jan 2024 20:12:46 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.221]) by sourceware.org (Postfix) with ESMTPS id 5F4133858D35 for ; Sun, 7 Jan 2024 20:12:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F4133858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5F4133858D35 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.221 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1704658326; cv=pass; b=B+rn2VTz3PEmdEiSJw9qLPCQvtPCtByTBeBPhDGTS2AqwmH9QkenGYSPZDNUcAnhyDMz7NJL0TkRu285K1oY1tUwMsmvfz/k81smrqShuUsPY16lh9HwLnndyWbzgpIj41yy5n8Alebh3H7poIW92gGNgd0aQO7vEQDaZu4qhkc= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1704658326; c=relaxed/simple; bh=uU8V8bwuA15XQvC98R2gEs6HuVFGViXDJ4+useltAb0=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:To: From:Subject; b=WnhGxJnkhpzlXT8svzZ12IWU6PwnoddZ1dhW+ysk0JxK6gW6y3+ATPUJoIRVu02K3rLpDT5GFZeEbSosptTif57wVDHfudCfgD1/dw9lQsh1cs1y2BKGzhAFfxnol9EbvgbOe4xCFUmkVhIc04RLIjVdeidHbfPpq2bHoUgKjTQ= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1704658322; cv=none; d=strato.com; s=strato-dkim-0002; b=PZmOuiXD1OVwxDhJLdWQE89k5bkPDSmrm3Akmg8cy7LM6pVfaroP5xeGpO8vgkDaSp Fr8bbGPeBhtwTt8e7mHybaSEyMznRfdtaFfI0e1I65KN8PXTxtrs4wGNQs8ygTD8l/CD y1CndO1J+F1PgP7RhxVO3uBiXGFDDhSw5tuUO7bWgL0rBLx+u9++158yiT3gLFJS8H0t MpGIwMZku3wJZPaIhglSbAYquHPUQ3stbIL008NQqWlhl+YSGDXBvk8VHkBWsyUSZNcO 1JhLcPwQaaZEGXD0N7OYrQxdYvGRtd76VpJqJ54fz2+ktTp8MMSeYX0Kwz6hxz5ilf4Z cv7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1704658322; s=strato-dkim-0002; d=strato.com; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=Jh+aahDp3UcMBxufXxHu7tUnBm4KsZn5/tgQru82OTI=; b=ZaLsTwd3wU7oHAJjrSXMDqHSEBFwfLg+20NTfznK4QIWErChIaYk0K3/KYBZdcv2z9 yvhGerm1GSElF4jeUf//f+HVoHQki+DV6drlAWRnuB1lKoLFiMq6XLRPGNEOpWDVRkTN rt2dohV8A6vJ8iPBoq2zGF/WsU5TG6qY3bcR4d3MI4MG0Mwg0GIQAqeBrtgAYY1Ym7/4 5u9yiwvcjDFA0ehkIk/+QGdb7Z7UVyQRJPksJ4xcarTu1PpCMUQUD+MTMzJrqs9Ww/w7 4TRE1ZMOqb09ySpZ1vhS8At7ZOiZhyFDrzudHejCec4K0yZhzkulQR4LoKmI5xSk95MZ JICg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1704658322; s=strato-dkim-0002; d=gjlay.de; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=Jh+aahDp3UcMBxufXxHu7tUnBm4KsZn5/tgQru82OTI=; b=p12To7ypkMiBhIQ4GgEaZ5ohlbBelcD61iMlve9x/XK8vwkhUum2tg+GUfpKY5l5Nn ue90fwMrfa7YnkNRrRikaaY65Znq2Z591bkHY/JJncKA1G5FeAWmvK2e37jucWQbydn0 oQaKJwGEW3XiUK38aB5oLQ14EdkO+/YEKHlO+Z4nJ7QE6dFkuYN+ulN5lv2qtyItV/up c1aHm4Gi+wnmOEmsrEPpBUljlA1J3YoFV1SZZCHeGWt8Rq6rjcnw/LQUUmUqHefC1AT6 hH4HNGisdg+ugHj/talP63aSSrq7KIkyhq2MFz3mKrp6yTTPLLojAK63DrdpQNjPmEKu 1HQw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1704658322; s=strato-dkim-0003; d=gjlay.de; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=Jh+aahDp3UcMBxufXxHu7tUnBm4KsZn5/tgQru82OTI=; b=Ut5QPKmspyNKHYfQd7R/jOuFAtdoHyWC/V+fW4fc4/H1EvZXTjv6SlEjf90Yk5S5Sv uVqSZ2lLH8xs8fhMcTAA== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKT7Qq0xotTetVnKkSjsSjq3WhKPVxx3mY" Received: from [192.168.2.102] by smtp.strato.de (RZmta 49.10.2 DYNA|AUTH) with ESMTPSA id 641e88007KC2K4W (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 7 Jan 2024 21:12:02 +0100 (CET) Message-ID: <2b2e3cab-a87e-402f-9820-d785a6056e6a@gjlay.de> Date: Sun, 7 Jan 2024 21:12:01 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches@gcc.gnu.org, Denis Chertykov From: Georg-Johann Lay Subject: [patch,avr,applied] Fix some avr test cases X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787463851981994988 X-GMAIL-MSGID: 1787463851981994988 The patch below fixes some obvious problems in gcc.target/avr: * Remove duplicate -mmcu= * Skip tests with address spaces on Reduced Tiny which does not support address spaces at all. * Address spaces are GNU-C, but some tests were missing -std=gnu* * Don't test address-space __flash1 on devices that don't have it. Johann --- AVR: Fix some test options. Skip tests with address-space on Reduced Tiny. gcc/testsuite/ * gcc.target/avr/lra-cpymem_qi.c: Remove duplicate -mmcu=. * gcc.target/avr/lra-elim.c: Same. * gcc.target/avr/pr112830.c: Skip for Reduced Tiny. * gcc.target/avr/pr46779-1.c: Same. * gcc.target/avr/pr46779-2.c: Same. * gcc.target/avr/pr86869.c: Skip for Reduced Tiny and add -std=gnu99 for GNU-C due to address spaces. * gcc.target/avr/pr89270.c: Same. * gcc.target/avr/torture/builtins-2-flash.c: Only test address space __flash1 if we have it. * gcc.target/avr/torture/addr-space-1-1.c: Same. * gcc.target/avr/torture/addr-space-2-1.c: Same. diff --git a/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c b/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c index fdffb445b45..31cf2003c43 100644 --- a/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c +++ b/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-mmcu=avr51 -Os" } */ +/* { dg-options "-Os" } */ #include diff --git a/gcc/testsuite/gcc.target/avr/lra-elim.c b/gcc/testsuite/gcc.target/avr/lra-elim.c index d5086a7fd5d..8d5dbf8ac4e 100644 --- a/gcc/testsuite/gcc.target/avr/lra-elim.c +++ b/gcc/testsuite/gcc.target/avr/lra-elim.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-mmcu=avr25 -Os" } */ +/* { dg-options "-Os" } */ typedef int HItype __attribute__ ((mode (HI))); HItype diff --git a/gcc/testsuite/gcc.target/avr/pr112830.c b/gcc/testsuite/gcc.target/avr/pr112830.c index c305daed06c..dd70dd0ea39 100644 --- a/gcc/testsuite/gcc.target/avr/pr112830.c +++ b/gcc/testsuite/gcc.target/avr/pr112830.c @@ -1,4 +1,4 @@ -/* { dg-do compile } */ +/* { dg-do compile { target { ! avr_tiny } } } */ /* { dg-options "" } */ typedef __SIZE_TYPE__ size_t; diff --git a/gcc/testsuite/gcc.target/avr/pr46779-1.c b/gcc/testsuite/gcc.target/avr/pr46779-1.c index 24522f175be..e3e0b292114 100644 --- a/gcc/testsuite/gcc.target/avr/pr46779-1.c +++ b/gcc/testsuite/gcc.target/avr/pr46779-1.c @@ -1,4 +1,4 @@ -/* { dg-do run } */ +/* { dg-do run { target { ! avr_tiny } } } */ /* { dg-options "-Os -fsplit-wide-types" } */ /* This testcase should uncover bugs like diff --git a/gcc/testsuite/gcc.target/avr/pr46779-2.c b/gcc/testsuite/gcc.target/avr/pr46779-2.c index 682070b5ef9..557cc749c75 100644 --- a/gcc/testsuite/gcc.target/avr/pr46779-2.c +++ b/gcc/testsuite/gcc.target/avr/pr46779-2.c @@ -1,4 +1,4 @@ -/* { dg-do run } */ +/* { dg-do run { target { ! avr_tiny } } } */ /* { dg-options "-Os -fno-split-wide-types" } */ /* This testcase should uncover bugs like diff --git a/gcc/testsuite/gcc.target/avr/pr86869.c b/gcc/testsuite/gcc.target/avr/pr86869.c index fbfb378e8c9..a5de4cc6510 100644 --- a/gcc/testsuite/gcc.target/avr/pr86869.c +++ b/gcc/testsuite/gcc.target/avr/pr86869.c @@ -1,4 +1,5 @@ -/* { dg-do compile } */ +/* { dg-do compile { target { ! avr_tiny } } } */ +/* { dg-additional-options "-std=gnu99 -w" } */ struct S { char y[2]; diff --git a/gcc/testsuite/gcc.target/avr/pr89270.c b/gcc/testsuite/gcc.target/avr/pr89270.c index 2b6e4a8aa5b..5b43218eddb 100644 --- a/gcc/testsuite/gcc.target/avr/pr89270.c +++ b/gcc/testsuite/gcc.target/avr/pr89270.c @@ -1,4 +1,5 @@ -/* { dg-do compile } */ +/* { dg-do compile { target { ! avr_tiny } } } */ +/* { dg-additional-options "-std=gnu99" } */ void test() { diff --git a/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c b/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c index e90bdcb5bfb..4812f67e2f1 100644 --- a/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c +++ b/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c @@ -1,6 +1,10 @@ /* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */ /* { dg-do run { target { ! avr_tiny } } } */ +#ifdef __FLASH1 #define __as __flash1 +#else +#define __as __flash +#endif #include "addr-space-1.h" diff --git a/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c b/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c index 327124aff27..d5fcf0a5520 100644 --- a/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c +++ b/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c @@ -1,6 +1,10 @@ /* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */ /* { dg-do run { target { ! avr_tiny } } } */ +#ifdef __FLASH1 #define __as __flash1 +#else +#define __as __flash +#endif #include "addr-space-2.h" diff --git a/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c b/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c index 318551d5ccf..11dba67b85a 100644 --- a/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c +++ b/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c @@ -4,7 +4,9 @@ #include const __flash char c0 = 1; +#ifdef __FLASH1 const __flash1 char c1 = 1; +#endif int main (void) { @@ -14,9 +16,11 @@ int main (void) if (__builtin_avr_flash_segment (p) != 0) abort(); +#ifdef __FLASH1 p = &c1; if (__builtin_avr_flash_segment (p) != 1) abort(); +#endif if (__builtin_avr_flash_segment ("p") != -1) abort();