Fortran OpenMP UDR fixes, nested handling fixes etc.

Tobias Burnus burnus@net-b.de
Sat Jun 21 08:28:00 GMT 2014


Jakub Jelinek wrote:
> Bootstrap/regtest pending, does this look ok?

Except for the module/resolved issues discussed elsewhere, it look good 
to me.

Thanks!

Tobias

> 2014-06-20  Jakub Jelinek  <jakub@redhat.com>
>
> 	* gimplify.c (gimplify_scan_omp_clauses) <case OMP_CLAUSE_MAP,
> 	OMP_CLAUSE_TO, OMP_CLAUSE_FROM): Make sure OMP_CLAUSE_SIZE is
> 	non-NULL.
> 	<case OMP_CLAUSE_ALIGNED>: Gimplify OMP_CLAUSE_ALIGNED_ALIGNMENT.
> 	(gimplify_adjust_omp_clauses_1): Make sure OMP_CLAUSE_SIZE is
> 	non-NULL.
> 	(gimplify_adjust_omp_clauses): Likewise.
> 	* omp-low.c (lower_rec_simd_input_clauses,
> 	lower_rec_input_clauses, expand_omp_simd): Handle non-constant
> 	safelen the same as safelen(1).
> 	* tree-nested.c (convert_nonlocal_omp_clauses,
> 	convert_local_omp_clauses): Handle OMP_CLAUSE_ALIGNED.  For
> 	OMP_CLAUSE_{MAP,TO,FROM} if not decl use walk_tree.
> 	(convert_nonlocal_reference_stmt, convert_local_reference_stmt):
> 	Fixup handling of GIMPLE_OMP_TARGET.
> 	(convert_tramp_reference_stmt, convert_gimple_call): Handle
> 	GIMPLE_OMP_TARGET.
> gcc/fortran/
> 	* dump-parse-tree.c (show_omp_namelist): Use n->udr->udr instead
> 	of n->udr.
> 	* f95-lang.c (gfc_init_builtin_functions): Initialize
> 	BUILT_IN_ASSUME_ALIGNED.
> 	* gfortran.h (gfc_omp_namelist): Change udr field type to
> 	struct gfc_omp_namelist_udr.
> 	(gfc_omp_namelist_udr): New type.
> 	(gfc_get_omp_namelist_udr): Define.
> 	(gfc_resolve_code): New prototype.
> 	* match.c (gfc_free_omp_namelist): Free name->udr.
> 	* module.c (intrinsics): Add INTRINSIC_USER.
> 	(mio_expr): Handle INSTRINSIC_USER and non-resolved EXPR_FUNCTION.
> 	* openmp.c (gfc_match_omp_clauses): Adjust initialization of n->udr.
> 	(gfc_match_omp_declare_reduction): Treat len=: the same as len=*.
> 	Set attr.flavor on omp_{out,in,priv,orig} artificial variables.
> 	(struct resolve_omp_udr_callback_data): New type.
> 	(resolve_omp_udr_callback, resolve_omp_udr_callback2,
> 	resolve_omp_udr_clause): New functions.
> 	(resolve_omp_clauses): Adjust for n->udr changes, resolve UDR clauses
> 	here.
> 	(omp_udr_callback): Don't check for implicitly declared functions
> 	here.
> 	(gfc_resolve_omp_udr): Don't call gfc_resolve.  Don't check for
> 	implicitly declared subroutines here.
> 	* resolve.c (resolve_code): Renamed to ...
> 	(gfc_resolve_code): ... this.  No longer static.
> 	(gfc_resolve_blocks, generate_component_assignments, resolve_codes):
> 	Adjust callers.
> 	* trans-openmp.c (gfc_omp_privatize_by_reference): Don't privatize
> 	by reference type (C_PTR) variables.
> 	(gfc_omp_finish_clause): Make sure OMP_CLAUSE_SIZE is non-NULL.
> 	(gfc_trans_omp_udr_expr): Remove.
> 	(gfc_trans_omp_array_reduction_or_udr): Adjust for n->udr changes.
> 	Don't call gfc_trans_omp_udr_expr, even for sym->attr.dimension
> 	expand it as assignment or subroutine call.
> gcc/testsuite/
> 	* gfortran.dg/gomp/udr2.f90 (f7, f9): Add !$omp parallel with
> 	reduction clause.
> 	* gfortran.dg/gomp/udr4.f90 (f4): Likewise.
> 	Remove Label is never defined expected error.
> 	* gfortran.dg/gomp/udr8.f90: New test.
> libgomp/
> 	* testsuite/libgomp.fortran/aligned1.f03: New test.
> 	* testsuite/libgomp.fortran/nestedfn5.f90: New test.
> 	* testsuite/libgomp.fortran/target7.f90: Surround loop spawning
> 	tasks with !$omp parallel !$omp single.
> 	* testsuite/libgomp.fortran/target8.f90: New test.
> 	* testsuite/libgomp.fortran/udr4.f90 (foo UDR, bar UDR): Adjust
> 	not to use trim in the combiner, instead call elemental function.
> 	(fn): New elemental function.
> 	* testsuite/libgomp.fortran/udr6.f90 (do_add, dp_add, dp_init):
> 	Make elemental.
> 	* testsuite/libgomp.fortran/udr7.f90 (omp_priv, omp_orig, omp_out,
> 	omp_in): Likewise.
> 	* testsuite/libgomp.fortran/udr12.f90: New test.
> 	* testsuite/libgomp.fortran/udr13.f90: New test.
> 	* testsuite/libgomp.fortran/udr14.f90: New test.
> 	* testsuite/libgomp.fortran/udr15.f90: New test.



More information about the Fortran mailing list