From patchwork Sun Dec 20 15:24:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Thomas_K=C3=B6nig?= X-Patchwork-Id: 1418827 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkoenig.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=tkoenig.net header.i=@tkoenig.net header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=s63p6B11; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CzRHT3Jvcz9sT6 for ; Mon, 21 Dec 2020 02:25:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F9223861038; Sun, 20 Dec 2020 15:24:56 +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.220]) by sourceware.org (Postfix) with ESMTPS id 811B43857804; Sun, 20 Dec 2020 15:24:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 811B43857804 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tkoenig.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=tk@tkoenig.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1608477891; s=strato-dkim-0002; d=tkoenig.net; h=Date:Message-ID:Subject:From:To:From:Subject:Sender; bh=py1Obd7RsbGI+U+nVCKHy+dVaTAgHxgtCVfgAssIbqw=; b=s63p6B11ZurbDZOKXGO3l3W5im5cLJykN+tw9Hy1f6ya8FHwarrmAugMl/oASNiPnJ iQvNlla4RFqv2Lr6MlnmxX+N4ox5u8LO34x95jVtNbBp4/SlNVT84kw4wbScJjVeE1L+ GxaaVq+1Ry0mavY1E4MCh3zNDB6uOD16Gx5TPIJ+n6NruQH1XRie3ew3rdiEM4XLjSmW /2AOfrcbk78WWK37pbRSynkcZqwzaSHHLbrTciUkucZfmmuq9lx6qUtTm1BWU2TAU39y 7D6nX8ex/zmSnfEdA+/vFyKASsN+i6mEvgf3d6woyds/WZ/m+K7ZrbQXmS5FM+TY7GOF fI6g== X-RZG-AUTH: ":OGckYUunfvGNVUL0FlRnC4eRM+bOwx0tUtYTrJ/xeZX+ZVNns7qeI3kOmGjgW4YumgBsgvUO4YDSCuML/MGOlf9LqhChUNw=" X-RZG-CLASS-ID: mo00 Received: from linux-p51k.fritz.box by smtp.strato.de (RZmta 47.9.3 AUTH) with ESMTPSA id R04b06wBKFOo7lC (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 20 Dec 2020 16:24:50 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: =?utf-8?q?Thomas_K=C3=B6nig?= Subject: [patch, fortran, testsuite, committed] Fix some more coarray stuff Message-ID: <7225a042-9736-19a2-1040-b60a829007bc@tkoenig.net> Date: Sun, 20 Dec 2020 16:24:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 Content-Language: de-DE X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" Hi, I have just committed the attached patch to a test case that was failing on the shared coarray branch. Again, the person who wrote the test case depended on only running on a single image :-) Best regards Thomas Correct coarray indices for test case. gcc/testsuite/ChangeLog: * gfortran.dg/coarray/send_char_array_1.f90: Correct coarray indces. diff --git a/gcc/testsuite/gfortran.dg/coarray/send_char_array_1.f90 b/gcc/testsuite/gfortran.dg/coarray/send_char_array_1.f90 index 3e16fa83685..b3caf80b1ad 100644 --- a/gcc/testsuite/gfortran.dg/coarray/send_char_array_1.f90 +++ b/gcc/testsuite/gfortran.dg/coarray/send_char_array_1.f90 @@ -25,28 +25,28 @@ program send_convert_char_array allocate(character(kind=4, len=5)::co_str_k4_arr(4)[*]) ! First check send/copy to self - co_str_k1_scal[1] = str_k1_scal + co_str_k1_scal[this_image()] = str_k1_scal if (co_str_k1_scal /= str_k1_scal // ' ') STOP 1 - co_str_k4_scal[1] = str_k4_scal + co_str_k4_scal[this_image()] = str_k4_scal if (co_str_k4_scal /= str_k4_scal // 4_' ') STOP 2 - co_str_k4_scal[1] = str_k1_scal + co_str_k4_scal[this_image()] = str_k1_scal if (co_str_k4_scal /= str_k4_scal // 4_' ') STOP 3 - co_str_k1_scal[1] = str_k4_scal + co_str_k1_scal[this_image()] = str_k4_scal if (co_str_k1_scal /= str_k1_scal // ' ') STOP 4 - co_str_k1_arr(:)[1] = str_k1_arr + co_str_k1_arr(:)[this_image()] = str_k1_arr if (any(co_str_k1_arr /= ['abc ', 'EFG ', 'klm ', 'NOP '])) STOP 5 - co_str_k4_arr(:)[1] = [4_'abc', 4_'EFG', 4_'klm', 4_'NOP']! str_k4_arr + co_str_k4_arr(:)[this_image()] = [4_'abc', 4_'EFG', 4_'klm', 4_'NOP']! str_k4_arr if (any(co_str_k4_arr /= [4_'abc ', 4_'EFG ', 4_'klm ', 4_'NOP '])) STOP 6 - co_str_k4_arr(:)[1] = str_k1_arr + co_str_k4_arr(:)[this_image()] = str_k1_arr if (any(co_str_k4_arr /= [ 4_'abc ', 4_'EFG ', 4_'klm ', 4_'NOP '])) STOP 7 - co_str_k1_arr(:)[1] = str_k4_arr + co_str_k1_arr(:)[this_image()] = str_k4_arr if (any(co_str_k1_arr /= ['abc ', 'EFG ', 'klm ', 'NOP '])) STOP 8 end program send_convert_char_array