From patchwork Wed Jul 19 12:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 122610 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2418049vqt; Wed, 19 Jul 2023 06:00:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlHQ4jmyGb0QdNZdpDCtWILvPos3Z/zV+blRgxLzn4i81jPMSSVZlIrE4bxJmA7Qc2BUKZVj X-Received: by 2002:a17:906:5346:b0:977:e310:1ce7 with SMTP id j6-20020a170906534600b00977e3101ce7mr2055003ejo.38.1689771601064; Wed, 19 Jul 2023 06:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689771601; cv=none; d=google.com; s=arc-20160816; b=Vy2cZzjTq9fVajpOwOmBf0rQxBdDDY/XMrnh6kwgiO5L7Ga/pIPk8EpFjlQGUkE4+w HZHJ7+n3Y479rKVwCdTe0YlcHm6pQG1zKVP7B2EAWRq/M2Zi3zeGLXMbIPz4WG87qPeT 79Prp1S/SWaK2swE5GYUgcz51aEe0YLFNKnJNNRMDu68F2kF+0jgpoPKo0z3TonqbPY2 Wl3MZYct33T0eW2trJyKBB6oSjFxynCcBrI48vyp/0dz71rinv7G8OwbqCAU832sqVDT yHFVDyEBOWXDy5QQgSPacwbiGrM2k0uNtEPYER3+WfmmaBIHOQC2VsRS6suEFh8xz5tk sjlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:subject:from:to :content-language:user-agent:mime-version:date:message-id :ironport-sdr:dmarc-filter:delivered-to; bh=BM09R15Gjq05UKvFADTTeaccVdnZC5yHDE1WSMWQUjc=; fh=GXj5Wr/oVfhyr4eVoXKxiYGPbTknttY/kKG88NGpG30=; b=signzG8h3+/SaKWwmaIADVlkLlVynzqT4dM1cvIX7ujOW+fCwHG+Vqqn8bDFi8jSig wPjuaJeV0HGxYLdEDJ5JchD1PqAiSUx8WYenFukjNWkFrBB+q95rqpcXY/z+uFSfaxlQ LXIxkJXYGZjABL7iWPmnHwqpYWbI3LM8tMSBC/ff+zNdZjDWgyVZYbo08/efqPa0nFDL YFADW+WSUYNqaXc6vZkQdp7bFAZQWHC32+WwaBmuB/ifvRmtaWpTHNtPmLo21d8vtt0C GDHdnYrp3TazkrxPP2tSAjnnncLQ7ZeJlLdtLy2UfofqWtqFoQyQ87wxUUPsWCNy/oGM rSYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id n8-20020a1709065e0800b0099315476299si2645265eju.1040.2023.07.19.06.00.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 06:00:01 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 A2A1B3857353 for ; Wed, 19 Jul 2023 12:59:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 618753858C33 for ; Wed, 19 Jul 2023 12:59:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 618753858C33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="6.01,216,1684828800"; d="diff'?scan'208";a="13687166" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 19 Jul 2023 04:59:20 -0800 IronPort-SDR: Y210n4ytRcBZ8VD7Px8HJJaD+t7PjsPI4AEl4RfLqt15k0tpYI7jPZ5mCrjpikT70dy8sQQ+B3 saHhAiNFu/ouvCcHaXaK+lfA1KhFewoKiMS73gGJ/KVeIRqDKnDwfyFXTMT+7Rf45oMNRQrzB0 IGLQn2a460r6ZPXWl7yUGXC4IM5El/poH6vsTVDRs94OXRkHSU7tYxhRvQ9lsiD/Xiur53DKcw 3B3Ckyc/HcrP4PQMbyMiQWwzWPCyZYlfO0YYmtggVaaSy6EAe2F88RilKF3QByFtX5PRpRDqIj jhk= Message-ID: <4471fdfc-8b27-b0f8-a98e-fdcc6c858f13@codesourcery.com> Date: Wed, 19 Jul 2023 14:59:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: gcc-patches From: Tobias Burnus Subject: [OG13][committed] libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host CC: Julian Brown X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, 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.29 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 Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771853946324814966 X-GMAIL-MSGID: 1771853946324814966 Fix testcase if from "OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic" which has been semi-submitted* to mainline as: "[PATCH 09/14] OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic" https://gcc.gnu.org/pipermail/gcc-patches/2023-June/622221.html Thus, the mainline version will need the same patch. (* The patch is part of the OG13 rebased series of a series scheduled for mainline inclusion; for details, cf. 00/14 email at https://gcc.gnu.org/pipermail/gcc-patches/2023-June/622213.html ) Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 commit a9d17fbd1e918019b77a6d9616704db85b5c3e8c Author: Tobias Burnus Date: Wed Jul 19 14:52:00 2023 +0200 libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host libgomp/ * testsuite/libgomp.fortran/map-subarray-5.f90: Only expect libgomp dg-output for offload_device_nonshared_as. --- libgomp/ChangeLog.omp | 5 +++++ libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 7cc64943446..cbc12c0fab0 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2023-07-19 Tobias Burnus + + * testsuite/libgomp.fortran/map-subarray-5.f90: Only expect + libgomp dg-output for offload_device_nonshared_as. + 2023-07-19 Tobias Burnus Backported from master: diff --git a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 index e7cdf11e610..59ad01ab76b 100644 --- a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 @@ -49,6 +49,6 @@ end do end -! { dg-output "(\n|\r|\r\n)" } -! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" } +! { dg-output "(\n|\r|\r\n)" { target offload_device_nonshared_as } } +! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" { target offload_device_nonshared_as } } ! { dg-shouldfail "" { offload_device_nonshared_as } }