From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 291FA3858D32; Thu, 6 Oct 2022 16:44:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 291FA3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665074669; bh=l2VKs4BM/QrsANqLvRQJagP6mMGaxcyPwTwFJPlUFFA=; h=From:To:Subject:Date:From; b=N31Cwfa0xV1+zs+yzB7ZK1I/lqyD2abwi89B34PvH3L892ijKAPQ63YuUGPmc21cI CukH3XDL4tBuL5As1E/o3+zqTBIct5FXmdwA2jUXhRmzVkttmYN+jangYnma4nFySz CBfLFCsGgE+D/zn7z5bR50IbDQ8VWcVarbRqzMtg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3136] openmp: Map holds clause to IFN_ASSUME for Fortran X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: fa258f6894801aef6785f0327594dc803da63fbd X-Git-Newrev: 50c35c691517291dbb77b1661761bc59950ba101 Message-Id: <20221006164429.291FA3858D32@sourceware.org> Date: Thu, 6 Oct 2022 16:44:29 +0000 (GMT) List-Id: https://gcc.gnu.org/g:50c35c691517291dbb77b1661761bc59950ba101 commit r13-3136-g50c35c691517291dbb77b1661761bc59950ba101 Author: Tobias Burnus Date: Thu Oct 6 18:42:32 2022 +0200 openmp: Map holds clause to IFN_ASSUME for Fortran Same as r13-3107-g847f5addc4d07a2f3b95f5daa50ab4a64dfd957d did for C/C++. Convert '!$omp assume holds(cond)' to IFN_ASSUME (cond). gcc/fortran/ * trans-openmp.cc (gfc_trans_omp_assume): New. (gfc_trans_omp_directive): Call it. gcc/testsuite/ * gfortran.dg/gomp/assume-3.f90: New test. * gfortran.dg/gomp/assume-4.f90: New test. Diff: --- gcc/fortran/trans-openmp.cc | 37 ++++++++++++++++++++- gcc/testsuite/gfortran.dg/gomp/assume-3.f90 | 46 ++++++++++++++++++++++++++ gcc/testsuite/gfortran.dg/gomp/assume-4.f90 | 50 +++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index 21053694f81..8ea573f7d02 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -4570,6 +4570,41 @@ gfc_trans_oacc_wait_directive (gfc_code *code) static tree gfc_trans_omp_sections (gfc_code *, gfc_omp_clauses *); static tree gfc_trans_omp_workshare (gfc_code *, gfc_omp_clauses *); +static tree +gfc_trans_omp_assume (gfc_code *code) +{ + stmtblock_t block; + gfc_init_block (&block); + gfc_omp_assumptions *assume = code->ext.omp_clauses->assume; + if (assume) + for (gfc_expr_list *el = assume->holds; el; el = el->next) + { + location_t loc = gfc_get_location (&el->expr->where); + gfc_se se; + gfc_init_se (&se, NULL); + gfc_conv_expr (&se, el->expr); + tree t; + if (se.pre.head == NULL_TREE && se.post.head == NULL_TREE) + t = se.expr; + else + { + tree var = gfc_create_var (TREE_TYPE (se.expr), NULL); + stmtblock_t block2; + gfc_init_block (&block2); + gfc_add_block_to_block (&block2, &se.pre); + gfc_add_modify_loc (loc, &block2, var, se.expr); + gfc_add_block_to_block (&block2, &se.post); + t = gfc_finish_block (&block2); + t = build4 (TARGET_EXPR, boolean_type_node, var, t, NULL, NULL); + } + t = build_call_expr_internal_loc (loc, IFN_ASSUME, + void_type_node, 1, t); + gfc_add_expr_to_block (&block, t); + } + gfc_add_expr_to_block (&block, gfc_trans_omp_code (code->block->next, true)); + return gfc_finish_block (&block); +} + static tree gfc_trans_omp_atomic (gfc_code *code) { @@ -7488,7 +7523,7 @@ gfc_trans_omp_directive (gfc_code *code) switch (code->op) { case EXEC_OMP_ASSUME: - return gfc_trans_omp_code (code->block->next, true); + return gfc_trans_omp_assume (code); case EXEC_OMP_ATOMIC: return gfc_trans_omp_atomic (code); case EXEC_OMP_BARRIER: diff --git a/gcc/testsuite/gfortran.dg/gomp/assume-3.f90 b/gcc/testsuite/gfortran.dg/gomp/assume-3.f90 new file mode 100644 index 00000000000..e5deace306e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/assume-3.f90 @@ -0,0 +1,46 @@ +! { dg-do compile } +! { dg-options "-fopenmp -O2 -fdump-tree-optimized -fdump-tree-original" } + +! { dg-final { scan-tree-dump-times ".ASSUME \\(x == 42\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times ".ASSUME \\(x <= 41\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times ".ASSUME \\(y <= 6\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times ".ASSUME \\(y > 5\\);" 1 "original" } } + +! { dg-final { scan-tree-dump-times "return 42;" 3 "optimized" } } +! { dg-final { scan-tree-dump-not "return -1;" "optimized" } } + +integer function foo (x) + implicit none + integer, value :: x + integer :: y + !$omp assume holds (x == 42) + y = x; + !$omp end assume + foo = y +end + +integer function bar (x) + implicit none + integer, value :: x + !$omp assume holds (x < 42) + block + end block + if (x == 42) then + bar = -1 + return + end if + bar = 42 +end + +integer function foobar (y) + implicit none + integer, value :: y + !$omp assume holds(y > 5) holds (y < 7) + block + if (y == 6) then + foobar = 42 + return + end if + end block + foobar = -1 +end diff --git a/gcc/testsuite/gfortran.dg/gomp/assume-4.f90 b/gcc/testsuite/gfortran.dg/gomp/assume-4.f90 new file mode 100644 index 00000000000..45857c43516 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/assume-4.f90 @@ -0,0 +1,50 @@ +! { dg-do compile } +! { dg-options "-fopenmp -O2 -fdump-tree-original -fdump-tree-optimized" } +! { dg-final { scan-tree-dump-times ".ASSUME \\(i_lower_bound \\(\\) < i\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times ".ASSUME \\(TARGET_EXPR i_lower_bound ()) + block + if (i > 4) then + f = 42 + else + f = -1 + end if + end block +contains + function i_lower_bound () + integer :: i_lower_bound + i_lower_bound = 5 + end function +end + +integer function g(j) + implicit none + integer, value :: j + + !$omp assume holds(j < j_upper_bound ()) + block + if (j < 10) then + g = 42 + else + g = -1 + end if + end block +contains + function j_upper_bound () + integer, allocatable :: j_upper_bound + j_upper_bound = 10 + end function +end