From patchwork Thu Dec 14 07:14:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 178560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8392011dys; Thu, 14 Dec 2023 00:18:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhCpLSWhPTeHCwaedmckpN+2dN4H9zcwCmcvx8BYTQ7SnnC2QG+Lg96DrzLXZ/+xLpm6pJ X-Received: by 2002:a0c:c583:0:b0:67e:aadb:780 with SMTP id a3-20020a0cc583000000b0067eaadb0780mr8608020qvj.28.1702541927312; Thu, 14 Dec 2023 00:18:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702541927; cv=pass; d=google.com; s=arc-20160816; b=T8rJW7rZJWMNqFaAQ5Fq5K5Sa1T4M2KUA2YNKuiJr2CtPUOPdxcDQU0RNPGsLq9Cm4 15+t5TI8g6FVS/0H1jrl1iJSfhBRTQaNoHZIwKy8Ddi7+W/V4776uGY/G77JfF1vlobD Y0HRoPk22kkX7V8ozYZz9+8ChSrrtji3LJj/qi1Hmf+qRsgyzw5XTolZNHgJ+7ZhIn/k ysQDyeRUDKpnzycBXgnF2KaIYp6DsYZhXt6ZXPlwow84jS2CouZ9WcUtgc3seuBw2m/0 VVvNEnnFMwv1IJL1Coqsa1tvM1gBh+DhtzLjirKl2su9Kpvc6ZSyvW3l838MBEjIAoHm AFCQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=Y0Cru3ijM3cLwLJLU8rQXkNdbydi2CrPfNNMi8PE5yE=; fh=hkrW3KDzQg8uui69Lebcq2VtLSw9gZ1LMQl4c/mYnGI=; b=yNgrXeUOxlErjlOeZR6irMBymDBvh7lqSff3DD+RkqrssQyfeqKnHhkOBlAxwWf44O ZEoHYt+QlUudW1cGg3SY+cphPm4vNkJRUb1ZqE1A0aBfe/HWtxK0drdWok4qWRDMm8Gh TyPnNrtjdllHspDhaBHOqzX1gHdl6Kq+r/Bcr/gW3Shpr5SeD5zx4eCw6DN3qtuPOPX2 1gpQO+mkmfqa+rUFMrU6S6tpr1N11fDqYcRuk6Rwpna3iqspwKPGyJTe4ostgNqpqCxB N6wvgshPKL9jvHUveI5pymWcpqHx0dE/Zt1kh/KphLFd4E77rPbD5XkfdO18x6JNL82s oRbQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pa5qgrBB; arc=pass (i=1); 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i11-20020a0cd84b000000b0067ef59c437csi3484897qvj.543.2023.12.14.00.18.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 00:18: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=@redhat.com header.s=mimecast20190719 header.b=Pa5qgrBB; arc=pass (i=1); 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 695103852764 for ; Thu, 14 Dec 2023 07:15:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DD5EC385B524 for ; Thu, 14 Dec 2023 07:15:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD5EC385B524 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD5EC385B524 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702538107; cv=none; b=q1Q8eNRIkA64oeIhbPD5R9n9GdOTgZzedjuUmiBzs2QfdUCybFfNUmvF9aHZwsITDs3G+bDlSqCVtNuk8xL0Fqm3bPSdpYHW8IbDoqRH98pC5k0KRkZPG6pyuZBR2N4Yhdc094YXh4awtzjOq1N10mXam9c8zMBkFsMV5Dfid08= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702538107; c=relaxed/simple; bh=dALZUVVI9xftjLCr7wXWY35JzgNyGSxArZDbicuV3VM=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=nbDz0JmWND+itbhPZG8Xb6HkH9KpArXc8U096ePSxU/cJQL8PBuN1XgBzXp4q4+9VKDYpfRD1XBxcf0qTetIYJtgLt6+o7m6WEf7llvVh+2oJcaz9sFBkGCbwF2MSI6VQS6iz5ZXNqTAm5fpc99hXifHjHjlDlUrRPPignA4Y3A= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702538103; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=Y0Cru3ijM3cLwLJLU8rQXkNdbydi2CrPfNNMi8PE5yE=; b=Pa5qgrBB9fNksOlEkrZ/Hkn4aG2JAnYd8kIOoy2gYV9b6IY697BUgucuxEqoWwho4zLlOz lUmNGkXbHqk09Da99BkDSGm2S1PUlwkF8cXnj/Xo+HkNeyGK/mvwLXXvJYAKWQ/Q66Tjug nZjkM86KHu6aCcDHvLopCEsu3+4gxnY= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-209-e20CbrjgPoGjJRU-uLOGbw-1; Thu, 14 Dec 2023 02:15:01 -0500 X-MC-Unique: e20CbrjgPoGjJRU-uLOGbw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D8A81C05147; Thu, 14 Dec 2023 07:15:00 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60AE3492BF0; Thu, 14 Dec 2023 07:15:00 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 3BE7EvuA1104553 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 14 Dec 2023 08:14:58 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 3BE7EuUo1104552; Thu, 14 Dec 2023 08:14:56 +0100 Date: Thu, 14 Dec 2023 08:14:56 +0100 From: Jakub Jelinek To: Julian Brown Cc: Tobias Burnus , gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Subject: [committed] testsuite: Fix up target-enter-data-1.c on 32-bit targets Message-ID: References: <20231129114212.21f7b62d@squid.athome> MIME-Version: 1.0 In-Reply-To: <20231129114212.21f7b62d@squid.athome> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, 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: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785244603665623480 X-GMAIL-MSGID: 1785244603665623480 On Wed, Nov 29, 2023 at 11:43:05AM +0000, Julian Brown wrote: > * c-c++-common/gomp/target-enter-data-1.c: Adjust scan output. struct bar { int num_vectors; double *vectors; }; is 16 bytes only on 64-bit targets, on 32-bit ones it is just 8 bytes, so the explicit matching of the * 16 multiplication only works on the former. Tested on x86_64-linux -m32/-m64, committed to trunk. 2023-12-14 Jakub Jelinek * c-c++-common/gomp/target-enter-data-1.c: Match also sizeof bar on 32-bit targets - 8 bytes - rather than just 16 bytes. Jakub --- gcc/testsuite/c-c++-common/gomp/target-enter-data-1.c.jj 2023-12-14 07:49:53.364577887 +0100 +++ gcc/testsuite/c-c++-common/gomp/target-enter-data-1.c 2023-12-14 08:08:59.680964433 +0100 @@ -22,4 +22,4 @@ void func (struct foo *f, int n, int m) } /* { dg-final { scan-tree-dump-times {map\(struct:\*f \[len: 1\]\) map\(alloc:[a-z0-9\._]+->vectors \[len: 0\]\) map\(to:\*_[0-9]+ \[len: _[0-9]+\]\) map\(attach:[a-z0-9\._]+->vectors \[bias: [^\]]+\]\) map\(attach:\*_[0-9]+ \[bias: _[0-9]+\]\)} 1 "gimple" } } */ -/* { dg-final { scan-tree-dump-times {map\(struct:\*\(f->bars \+ \(sizetype\) \(\([^\)]+\) n \* 16\)\) \[len: 1\]\) map\(alloc:[a-z0-9\._]+->vectors \[len: 0\]\) map\(to:\*_[0-9]+ \[len: _[0-9]+\]\) map\(attach:[a-z0-9\._]+->vectors \[bias: [^\]]+\]\)} 2 "gimple" } } */ +/* { dg-final { scan-tree-dump-times {map\(struct:\*\(f->bars \+ \(sizetype\) \(\([^\)]+\) n \* (?:16|8)\)\) \[len: 1\]\) map\(alloc:[a-z0-9\._]+->vectors \[len: 0\]\) map\(to:\*_[0-9]+ \[len: _[0-9]+\]\) map\(attach:[a-z0-9\._]+->vectors \[bias: [^\]]+\]\)} 2 "gimple" } } */