Done. I have permission for contributing but I don't have write permission on the repository.
2015-12-09 8:23 GMT+01:00 Tobias Burnus <bur...@net-b.de>: > Alessandro Fanfarillo wrote: >> >> in attachment the new patch. I also checked the behavior with >> move_alloc: it synchronizes right after the deregistration of the >> destination. >> I also noticed that __asm__ __volatile__ ("":::"memory") is called >> before sync all and not after. It shouldn't be a problem, right? > > > The patch looks mostly good to me, except: > >> @@ -1222,6 +1230,15 @@ gfc_conv_intrinsic_caf_get (gfc_se *se, gfc_expr >> *expr, tree lhs, tree lhs_kind, >> se->expr = res_var; >> if (array_expr->ts.type == BT_CHARACTER) >> se->string_length = argse.string_length; >> + >> + /* It guarantees memory consistency within the same segment */ >> + /* tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), */ >> + /* tmp = build5_loc (input_location, ASM_EXPR, void_type_node, */ >> + /* gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, >> */ >> + /* tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); */ >> + /* ASM_VOLATILE_P (tmp) = 1; */ >> + /* gfc_add_expr_to_block (&se->pre, tmp); */ >> + >> } > > > Do not add out-commented code. Please remove. > > >> gfc_trans_critical (gfc_code *code) >> { >> stmtblock_t block; >> tree tmp, token = NULL_TREE; >> >> gfc_start_block (&block); >> >> if (flag_coarray == GFC_FCOARRAY_LIB) >> { >> token = gfc_get_symbol_decl (code->resolved_sym); >> token = GFC_TYPE_ARRAY_CAF_TOKEN (TREE_TYPE (token)); >> tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_lock, 7, >> token, integer_zero_node, >> integer_one_node, >> null_pointer_node, null_pointer_node, >> null_pointer_node, integer_zero_node); >> gfc_add_expr_to_block (&block, tmp); >> } >> >> + /* It guarantees memory consistency within the same segment */ >> + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), >> + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, >> + gfc_build_string_const (1, ""), NULL_TREE, >> NULL_TREE, >> + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); >> + ASM_VOLATILE_P (tmp) = 1; >> + >> + gfc_add_expr_to_block (&block, tmp); >> + >> tmp = gfc_trans_code (code->block->next); >> gfc_add_expr_to_block (&block, tmp); >> >> if (flag_coarray == GFC_FCOARRAY_LIB) >> { >> tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_unlock, >> 6, >> token, integer_zero_node, >> integer_one_node, >> null_pointer_node, null_pointer_node, >> integer_zero_node); >> gfc_add_expr_to_block (&block, tmp); >> } >> >> + /* It guarantees memory consistency within the same segment */ >> + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), >> + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, >> + gfc_build_string_const (1, ""), NULL_TREE, >> NULL_TREE, >> + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); >> + ASM_VOLATILE_P (tmp) = 1; >> + >> + gfc_add_expr_to_block (&block, tmp); >> >> return gfc_finish_block (&block); >> } > > > Please move the two new code additions into the associated "if (flag_coarray > == GFC_FCOARRAY_LIB)" blocks - and keep an eye on the indentation: for the > current code location, the second block is wrongly idented. > > > With the two issues fixed: LGTM. > > Cheers, > > Tobias > > PS: I assume you can still commit yourself. I am asking because Steve did > commit the recent EVENT patch for you.
2015-12-09 Tobias Burnus <bur...@net-b.de> Alessandro Fanfarillo <fanfarillo....@gmail.com> * trans.c (gfc_allocate_using_lib,gfc_deallocate_with_status): Introducing __asm__ __volatile__ ("":::"memory") after image control statements. * trans-stmt.c (gfc_trans_sync, gfc_trans_event_post_wait, gfc_trans_lock_unlock, gfc_trans_critical): Ditto. * trans-intrinsic.c (gfc_conv_intrinsic_caf_get, conv_caf_send): Introducing __asm__ __volatile__ ("":::"memory") after send, before get and around sendget. 2015-12-09 Tobias Burnus <bur...@net-b.de> Alessandro Fanfarillo <fanfarillo....@gmail.com> * gfortran.dg/coarray_40.f90: New. commit 96975d401c4b66c0362d853bf6b604cda171552b Author: Alessandro Fanfarillo <fanfari...@ing.uniroma2.it> Date: Wed Dec 9 17:05:28 2015 +0100 Introducing __asm__ __volatile__ (:::memory) after image control statements, send, get and sendget diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 21efe44..31bad35 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1211,6 +1211,14 @@ gfc_conv_intrinsic_caf_get (gfc_se *se, gfc_expr *expr, tree lhs, tree lhs_kind, if (lhs == NULL_TREE) may_require_tmp = boolean_false_node; + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&se->pre, tmp); + tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_get, 9, token, offset, image_index, argse.expr, vec, dst_var, kind, lhs_kind, may_require_tmp); @@ -1375,6 +1383,14 @@ conv_caf_send (gfc_code *code) { { tree rhs_token, rhs_offset, rhs_image_index; + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&block, tmp); + caf_decl = gfc_get_tree_for_caf_expr (rhs_expr); if (TREE_CODE (TREE_TYPE (caf_decl)) == REFERENCE_TYPE) caf_decl = build_fold_indirect_ref_loc (input_location, caf_decl); @@ -1390,6 +1406,15 @@ conv_caf_send (gfc_code *code) { gfc_add_expr_to_block (&block, tmp); gfc_add_block_to_block (&block, &lhs_se.post); gfc_add_block_to_block (&block, &rhs_se.post); + + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&block, tmp); + return gfc_finish_block (&block); } diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 3df483a..72416d4 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -818,6 +818,15 @@ gfc_trans_lock_unlock (gfc_code *code, gfc_exec_op op) errmsg, errmsg_len); gfc_add_expr_to_block (&se.pre, tmp); + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + + gfc_add_expr_to_block (&se.pre, tmp); + if (stat2 != NULL_TREE) gfc_add_modify (&se.pre, stat2, fold_convert (TREE_TYPE (stat2), stat)); @@ -995,6 +1004,14 @@ gfc_trans_event_post_wait (gfc_code *code, gfc_exec_op op) errmsg, errmsg_len); gfc_add_expr_to_block (&se.pre, tmp); + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&se.pre, tmp); + if (stat2 != NULL_TREE) gfc_add_modify (&se.pre, stat2, fold_convert (TREE_TYPE (stat2), stat)); @@ -1080,6 +1097,18 @@ gfc_trans_sync (gfc_code *code, gfc_exec_op type) fold_convert (integer_type_node, images)); } + /* Per F2008, 8.5.1, a SYNC MEMORY is implied by calling the + image control statements SYNC IMAGES and SYNC ALL. */ + if (flag_coarray == GFC_FCOARRAY_LIB) + { + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&se.pre, tmp); + } + if (flag_coarray != GFC_FCOARRAY_LIB) { /* Set STAT to zero. */ @@ -1399,6 +1428,17 @@ gfc_trans_critical (gfc_code *code) null_pointer_node, null_pointer_node, null_pointer_node, integer_zero_node); gfc_add_expr_to_block (&block, tmp); + + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), + NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), + NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + + gfc_add_expr_to_block (&block, tmp); } tmp = gfc_trans_code (code->block->next); @@ -1411,8 +1451,18 @@ gfc_trans_critical (gfc_code *code) null_pointer_node, null_pointer_node, integer_zero_node); gfc_add_expr_to_block (&block, tmp); - } + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), + NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), + NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + + gfc_add_expr_to_block (&block, tmp); + } return gfc_finish_block (&block); } diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index 001db41..1993743 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -746,6 +746,14 @@ gfc_allocate_using_lib (stmtblock_t * block, tree pointer, tree size, TREE_TYPE (pointer), pointer, fold_convert ( TREE_TYPE (pointer), tmp)); gfc_add_expr_to_block (block, tmp); + + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (block, tmp); } @@ -1356,6 +1364,14 @@ gfc_deallocate_with_status (tree pointer, tree status, tree errmsg, token, pstat, errmsg, errlen); gfc_add_expr_to_block (&non_null, tmp); + /* It guarantees memory consistency within the same segment */ + tmp = gfc_build_string_const (strlen ("memory")+1, "memory"), + tmp = build5_loc (input_location, ASM_EXPR, void_type_node, + gfc_build_string_const (1, ""), NULL_TREE, NULL_TREE, + tree_cons (NULL_TREE, tmp, NULL_TREE), NULL_TREE); + ASM_VOLATILE_P (tmp) = 1; + gfc_add_expr_to_block (&non_null, tmp); + if (status != NULL_TREE) { tree stat = build_fold_indirect_ref_loc (input_location, status); diff --git a/gcc/testsuite/gfortran.dg/coarray_40.f90 b/gcc/testsuite/gfortran.dg/coarray_40.f90 new file mode 100644 index 0000000..84af50e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray_40.f90 @@ -0,0 +1,25 @@ +! { dg-do run } +! { dg-options "-fcoarray=lib -lcaf_single" } +! +! Run-time test for memory consistency +! +! Contributed by Deepak Eachempati + +program cp_bug + implicit none + integer :: v1, v2, u[*] + integer :: me + + me = this_image() + + u = 0 + v1 = 10 + + v1 = u[me] + + ! v2 should get value in u (0) + v2 = v1 + + if(v2 /= u) call abort() + +end program