From patchwork Tue Jan 5 12:42:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 1422425 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=cU+z+Onk; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4D9Bwb4JFMz9sVw for ; Tue, 5 Jan 2021 23:42:36 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 46CDA388C033; Tue, 5 Jan 2021 12:42:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46CDA388C033 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1609850552; bh=RatoRkBr//HhmPWf8udtm8Ruiedv8nnnaUpunrLfD4s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=cU+z+Onkw5r0YRJ50/Y3DUgdOeTTEC3pZZUKqKt7pIl0YxozsYIuGq6oAJ8n589di syFli3K6lLhqELSiiy8lPVd8cUuGY6kStJBqsx3A1zMrhbwdpRBQYKxx4fTFNPbm1o P0wGcE1Z1+gd+zMjHjErnVNuuIxs5Za8fP8IivnE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from cc-smtpout2.netcologne.de (cc-smtpout2.netcologne.de [89.1.8.212]) by sourceware.org (Postfix) with ESMTPS id 6E403383E80F; Tue, 5 Jan 2021 12:42:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6E403383E80F Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201]) by cc-smtpout2.netcologne.de (Postfix) with ESMTP id E76FF12469; Tue, 5 Jan 2021 13:42:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin1.netcologne.de (Postfix) with ESMTP id C3FF611EA8; Tue, 5 Jan 2021 13:42:26 +0100 (CET) Received: from [2a0a:a540:2028:0:5045:25ac:ef6c:d9c0] (helo=cc-smtpin1.netcologne.de) by localhost with ESMTP (eXpurgate 4.11.6) (envelope-from ) id 5ff45eb2-02f5-7f0000012729-7f000001cff2-1 for ; Tue, 05 Jan 2021 13:42:26 +0100 Received: from linux-p51k.fritz.box (2a0a-a540-2028-0-5045-25ac-ef6c-d9c0.ipv6dyn.netcologne.de [IPv6:2a0a:a540:2028:0:5045:25ac:ef6c:d9c0]) (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 cc-smtpin1.netcologne.de (Postfix) with ESMTPSA; Tue, 5 Jan 2021 13:42:25 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches Subject: [patch, committed, coarray_native] Fix CO_REDUCE with RESULT_IMAGE Message-ID: Date: Tue, 5 Jan 2021 13:42:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 Content-Language: de-DE X-Spam-Status: No, score=-11.3 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_NONE, SPF_PASS, 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: , X-Patchwork-Original-From: Thomas Koenig via Gcc-patches From: Thomas Koenig Reply-To: Thomas Koenig Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, I just committed the attached patch to the branch. I had also merged the trunk to branch previously, so it should be more or less up to date by now. Best regards Thomas Fix CO_REDUCE with RESULT_IMAGE. gcc/fortran/ChangeLog: * trans-array.c (gfc_conv_ss_descriptor): Use correct ref. * trans-intrinsic.c (trans_argument): Use gfc_conv_expr_reference. * trans-decl.c (gfc_build_builtin_function_decls): Correct spec for array. libgfortran/ChangeLog: * caf_shared/collective_subroutine.c (collsub_reduce_array): Fix off by one error for result. gcc/testsuite/ChangeLog: * gfortran.dg/caf-shared/co_reduce_1.f90: New test. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 199bcaed9b1..85ef1537fcd 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -3120,7 +3120,6 @@ gfc_conv_ss_descriptor (stmtblock_t * block, gfc_ss * ss, int base) gfc_ss_info *ss_info; gfc_array_info *info; tree tmp; - gfc_ref *ref; ss_info = ss->info; info = &ss_info->data.array; @@ -3172,7 +3171,7 @@ gfc_conv_ss_descriptor (stmtblock_t * block, gfc_ss * ss, int base) if (flag_coarray == GFC_FCOARRAY_SHARED) { - gfc_ref *co_ref = cas_impl_this_image_ref (ref); + gfc_ref *co_ref = cas_impl_this_image_ref (ss_info->expr->ref); if (co_ref) tmp = cas_add_this_image_offset (tmp, se.expr, &co_ref->u.ar, true); } diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 3ecd63d6169..f86f39159c5 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -4187,7 +4187,7 @@ gfc_build_builtin_function_decls (void) gfor_fndecl_cas_reduce_array = gfc_build_library_function_decl_with_spec ( - get_identifier (PREFIX("cas_collsub_reduce_array")), ". W r r w w . ", + get_identifier (PREFIX("cas_collsub_reduce_array")), ". w r r w w . ", void_type_node, 6, pvoid_type_node /* desc. */, build_pointer_type (build_function_type_list (void_type_node, pvoid_type_node, pvoid_type_node, NULL_TREE)) /* assign function. */, diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 13c32957d69..92cdb3e1bdb 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -11217,7 +11217,7 @@ trans_argument (gfc_actual_arglist **curr_al, stmtblock_t *blk, if (expr->rank > 0) gfc_conv_expr_descriptor (argse, expr); else - gfc_conv_expr (argse, expr); + gfc_conv_expr_reference (argse, expr); gfc_add_block_to_block (blk, &argse->pre); gfc_add_block_to_block (postblk, &argse->post); diff --git a/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 b/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 new file mode 100644 index 00000000000..ab8b2877295 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 @@ -0,0 +1,24 @@ +! { dg-do run } +! { dg-set-target-env-var GFORTRAN_NUM_IMAGES "4" } +! This test only works with four images, it will fail otherwise. +program main + implicit none + integer, parameter :: n = 3 + integer, dimension(n) :: a + a = [1,2,3] + this_image() + call co_reduce (a, mysum, result_image = 2) + if (this_image () == 2) then + if (any(a /= [14,18,22])) then + print *,a + print *,a /= [14,18,22] + print *,any(a /= [14,18,22]) + stop 1 + end if + end if +contains + PURE FUNCTION mysum (lhs,rhs) + integer, intent(in) :: lhs, rhs + integer :: mysum + mysum = lhs + rhs + END FUNCTION mysum +end program main diff --git a/libgfortran/caf_shared/collective_subroutine.c b/libgfortran/caf_shared/collective_subroutine.c index 875eb946e60..a39f0ae390f 100644 --- a/libgfortran/caf_shared/collective_subroutine.c +++ b/libgfortran/caf_shared/collective_subroutine.c @@ -121,7 +121,7 @@ collsub_reduce_array (collsub_iface *ci, gfc_array_char *desc, for (; (local->total_num_images >> cbit) != 0; cbit++) collsub_sync (ci); - if (!result_image || *result_image == this_image.image_num) + if (!result_image || (*result_image - 1 ) == this_image.image_num) { if (packed) memcpy (GFC_DESCRIPTOR_DATA (desc), buffer, this_image_size_bytes);