gcc/ChangeLog: * omp-transform-loops.cc (print_optimized_unroll_partial_msg): Output "omp unroll partial" instead of "omp unroll auto". (optimize_transformation_clauses): Likewise.
libgomp/ChangeLog: * testsuite/libgomp.fortran/loop-transforms/unroll-6.f90: Adjust. gcc/testsuite/ChangeLog: * gfortran.dg/gomp/loop-transforms/unroll-8.f90: Adjust. * gfortran.dg/gomp/loop-transforms/unroll-9.f90: Adjust. --- gcc/omp-transform-loops.cc | 4 ++-- gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-8.f90 | 2 +- gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-9.f90 | 2 +- .../testsuite/libgomp.fortran/loop-transforms/unroll-6.f90 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/omp-transform-loops.cc b/gcc/omp-transform-loops.cc index 275a5260dae..c8853bcee89 100644 --- a/gcc/omp-transform-loops.cc +++ b/gcc/omp-transform-loops.cc @@ -1423,7 +1423,7 @@ print_optimized_unroll_partial_msg (tree c) tree unroll_factor = OMP_CLAUSE_UNROLL_PARTIAL_EXPR (c); dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, dump_loc, "replaced consecutive %<omp unroll%> directives by " - "%<omp unroll auto(" HOST_WIDE_INT_PRINT_UNSIGNED + "%<omp unroll partial(" HOST_WIDE_INT_PRINT_UNSIGNED ")%>\n", tree_to_uhwi (unroll_factor)); } @@ -1483,7 +1483,7 @@ optimize_transformation_clauses (tree clauses) dump_printf_loc ( MSG_OPTIMIZED_LOCATIONS, dump_loc, - "removed useless %<omp unroll auto%> directives " + "removed useless %<omp unroll partial%> directives " "preceding 'omp unroll full'\n"); } } diff --git a/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-8.f90 b/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-8.f90 index fd687890ee6..dab3f0fb5cf 100644 --- a/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-8.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-8.f90 @@ -5,7 +5,7 @@ subroutine test1 implicit none integer :: i !$omp parallel do collapse(1) - !$omp unroll partial(4) ! { dg-optimized {replaced consecutive 'omp unroll' directives by 'omp unroll auto\(24\)'} } + !$omp unroll partial(4) ! { dg-optimized {replaced consecutive 'omp unroll' directives by 'omp unroll partial\(24\)'} } !$omp unroll partial(3) !$omp unroll partial(2) !$omp unroll partial(1) diff --git a/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-9.f90 b/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-9.f90 index 928ca44e811..91e13ff1b37 100644 --- a/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-9.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/loop-transforms/unroll-9.f90 @@ -4,7 +4,7 @@ subroutine test1 implicit none integer :: i - !$omp unroll full ! { dg-optimized {removed useless 'omp unroll auto' directives preceding 'omp unroll full'} } + !$omp unroll full ! { dg-optimized {removed useless 'omp unroll partial' directives preceding 'omp unroll full'} } !$omp unroll partial(3) !$omp unroll partial(2) !$omp unroll partial(1) diff --git a/libgomp/testsuite/libgomp.fortran/loop-transforms/unroll-6.f90 b/libgomp/testsuite/libgomp.fortran/loop-transforms/unroll-6.f90 index 1df8ce8d5bb..b953ce31b5b 100644 --- a/libgomp/testsuite/libgomp.fortran/loop-transforms/unroll-6.f90 +++ b/libgomp/testsuite/libgomp.fortran/loop-transforms/unroll-6.f90 @@ -22,7 +22,7 @@ contains sum = 0 !$omp parallel do reduction(+:sum) lastprivate(i) - !$omp unroll partial(5) ! { dg-optimized {replaced consecutive 'omp unroll' directives by 'omp unroll auto\(50\)'} } + !$omp unroll partial(5) ! { dg-optimized {replaced consecutive 'omp unroll' directives by 'omp unroll partial\(50\)'} } !$omp unroll partial(10) do i = 1,n,step sum = sum + 1 @@ -36,7 +36,7 @@ contains sum = 0 !$omp parallel do reduction(+:sum) lastprivate(i) do i = 1,n,step - !$omp unroll full ! { dg-optimized {removed useless 'omp unroll auto' directives preceding 'omp unroll full'} } + !$omp unroll full ! { dg-optimized {removed useless 'omp unroll partial' directives preceding 'omp unroll full'} } !$omp unroll partial(10) do j = 1, 1000 sum = sum + 1 -- 2.36.1 ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955