diff options
175 files changed, 22428 insertions, 13527 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c2d8c9d79d4..580a0b2c259 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2009-07-24 Jakub Jelinek <jakub@redhat.com> + + PR fortran/40643 + PR fortran/31067 + * trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc, + gfc_conv_intrinsic_minmaxval): Handle Infinities and NaNs properly, + optimize. + * trans-array.c (gfc_trans_scalarized_loop_end): No longer static. + * trans-array.h (gfc_trans_scalarized_loop_end): New prototype. + 2009-07-23 Jakub Jelinek <jakub@redhat.com> PR fortran/40839 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 270835556ba..c625bc4bf60 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2755,7 +2755,7 @@ gfc_start_scalarized_body (gfc_loopinfo * loop, stmtblock_t * pbody) /* Generates the actual loop code for a scalarization loop. */ -static void +void gfc_trans_scalarized_loop_end (gfc_loopinfo * loop, int n, stmtblock_t * pbody) { @@ -2822,7 +2822,8 @@ gfc_trans_scalarized_loop_end (gfc_loopinfo * loop, int n, loopbody = gfc_finish_block (pbody); /* Initialize the loopvar. */ - gfc_add_modify (&loop->code[n], loop->loopvar[n], loop->from[n]); + if (loop->loopvar[n] != loop->from[n]) + gfc_add_modify (&loop->code[n], loop->loopvar[n], loop->from[n]); exit_label = gfc_build_label_decl (NULL_TREE); diff --git a/gcc/fortran/trans-array.h b/gcc/fortran/trans-array.h index 9b0b830d92e..175b3c60ff5 100644 --- a/gcc/fortran/trans-array.h +++ b/gcc/fortran/trans-array.h @@ -1,5 +1,5 @@ /* Header for array handling functions - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Paul Brook @@ -84,6 +84,8 @@ void gfc_copy_loopinfo_to_se (gfc_se *, gfc_loopinfo *); /* Marks the start of a scalarized expression, and declares loop variables. */ void gfc_start_scalarized_body (gfc_loopinfo *, stmtblock_t *); +/* Generates one actual loop for a scalarized expression. */ +void gfc_trans_scalarized_loop_end (gfc_loopinfo *, int, stmtblock_t *); /* Generates the actual loops for a scalarized expression. */ void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *); /* Mark the end of the main loop body and the start of the copying loop. */ diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index bf8768e0572..779343224fd 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -2146,6 +2146,72 @@ gfc_conv_intrinsic_dot_product (gfc_se * se, gfc_expr * expr) } +/* Emit code for minloc or maxloc intrinsic. There are many different cases + we need to handle. For performance reasons we sometimes create two + loops instead of one, where the second one is much simpler. + Examples for minloc intrinsic: + 1) Result is an array, a call is generated + 2) Array mask is used and NaNs need to be supported: + limit = Infinity; + pos = 0; + S = from; + while (S <= to) { + if (mask[S]) { + if (pos == 0) pos = S + (1 - from); + if (a[S] <= limit) { limit = a[S]; pos = S + (1 - from); goto lab1; } + } + S++; + } + goto lab2; + lab1:; + while (S <= to) { + if (mask[S]) if (a[S] < limit) { limit = a[S]; pos = S + (1 - from); } + S++; + } + lab2:; + 3) NaNs need to be supported, but it is known at compile time or cheaply + at runtime whether array is nonempty or not: + limit = Infinity; + pos = 0; + S = from; + while (S <= to) { + if (a[S] <= limit) { limit = a[S]; pos = S + (1 - from); goto lab1; } + S++; + } + if (from <= to) pos = 1; + goto lab2; + lab1:; + while (S <= to) { + if (a[S] < limit) { limit = a[S]; pos = S + (1 - from); } + S++; + } + lab2:; + 4) NaNs aren't supported, array mask is used: + limit = infinities_supported ? Infinity : huge (limit); + pos = 0; + S = from; + while (S <= to) { + if (mask[S]) { limit = a[S]; pos = S + (1 - from); goto lab1; } + S++; + } + goto lab2; + lab1:; + while (S <= to) { + if (mask[S]) if (a[S] < limit) { limit = a[S]; pos = S + (1 - from); } + S++; + } + lab2:; + 5) Same without array mask: + limit = infinities_supported ? Infinity : huge (limit); + pos = (from <= to) ? 1 : 0; + S = from; + while (S <= to) { + if (a[S] < limit) { limit = a[S]; pos = S + (1 - from); } + S++; + } + For 3) and 5), if mask is scalar, this all goes into a conditional, + setting pos = 0; in the else branch. */ + static void gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) { @@ -2156,9 +2222,12 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) tree limit; tree type; tree tmp; + tree cond; tree elsetmp; tree ifbody; tree offset; + tree nonempty; + tree lab1, lab2; gfc_loopinfo loop; gfc_actual_arglist *actual; gfc_ss *arrayss; @@ -2190,21 +2259,39 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) actual = actual->next->next; gcc_assert (actual); maskexpr = actual->expr; + nonempty = NULL; if (maskexpr && maskexpr->rank != 0) { maskss = gfc_walk_expr (maskexpr); gcc_assert (maskss != gfc_ss_terminator); } else - maskss = NULL; + { + mpz_t asize; + if (gfc_array_size (arrayexpr, &asize) == SUCCESS) + { + nonempty = gfc_conv_mpz_to_tree (asize, gfc_index_integer_kind); + mpz_clear (asize); + nonempty = fold_build2 (GT_EXPR, boolean_type_node, nonempty, + gfc_index_zero_node); + } + maskss = NULL; + } limit = gfc_create_var (gfc_typenode_for_spec (&arrayexpr->ts), "limit"); n = gfc_validate_kind (arrayexpr->ts.type, arrayexpr->ts.kind, false); switch (arrayexpr->ts.type) { case BT_REAL: - tmp = gfc_conv_mpfr_to_tree (gfc_real_kinds[n].huge, - arrayexpr->ts.kind, 0); + if (HONOR_INFINITIES (DECL_MODE (limit))) + { + REAL_VALUE_TYPE real; + real_inf (&real); + tmp = build_real (TREE_TYPE (limit), real); + } + else + tmp = gfc_conv_mpfr_to_tree (gfc_real_kinds[n].huge, + arrayexpr->ts.kind, 0); break; case BT_INTEGER: @@ -2239,11 +2326,30 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) gfc_conv_loop_setup (&loop, &expr->where); gcc_assert (loop.dimen == 1); + if (nonempty == NULL && maskss == NULL && loop.from[0] && loop.to[0]) + nonempty = fold_build2 (LE_EXPR, boolean_type_node, loop.from[0], + loop.to[0]); + lab1 = NULL; + lab2 = NULL; /* Initialize the position to zero, following Fortran 2003. We are free to do this because Fortran 95 allows the result of an entirely false - mask to be processor dependent. */ - gfc_add_modify (&loop.pre, pos, gfc_index_zero_node); + mask to be processor dependent. If we know at compile time the array + is non-empty and no MASK is used, we can initialize to 1 to simplify + the inner loop. */ + if (nonempty != NULL && !HONOR_NANS (DECL_MODE (limit))) + gfc_add_modify (&loop.pre, pos, + fold_build3 (COND_EXPR, gfc_array_index_type, + nonempty, gfc_index_one_node, + gfc_index_zero_node)); + else + { + gfc_add_modify (&loop.pre, pos, gfc_index_zero_node); + lab1 = gfc_build_label_decl (NULL_TREE); + TREE_USED (lab1) = 1; + lab2 = gfc_build_label_decl (NULL_TREE); + TREE_USED (lab2) = 1; + } gfc_mark_ss_chain_used (arrayss, 1); if (maskss) @@ -2285,27 +2391,47 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) gfc_index_one_node, loop.from[0]); else tmp = gfc_index_one_node; - + gfc_add_modify (&block, offset, tmp); + if (nonempty == NULL && HONOR_NANS (DECL_MODE (limit))) + { + stmtblock_t ifblock2; + tree ifbody2; + + gfc_start_block (&ifblock2); + tmp = fold_build2 (PLUS_EXPR, TREE_TYPE (pos), + loop.loopvar[0], offset); + gfc_add_modify (&ifblock2, pos, tmp); + ifbody2 = gfc_finish_block (&ifblock2); + cond = fold_build2 (EQ_EXPR, boolean_type_node, pos, + gfc_index_zero_node); + tmp = build3_v (COND_EXPR, cond, ifbody2, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block, tmp); + } + tmp = fold_build2 (PLUS_EXPR, TREE_TYPE (pos), loop.loopvar[0], offset); gfc_add_modify (&ifblock, pos, tmp); + if (lab1) + gfc_add_expr_to_block (&ifblock, build1_v (GOTO_EXPR, lab1)); + ifbody = gfc_finish_block (&ifblock); - /* If it is a more extreme value or pos is still zero and the value - equal to the limit. */ - tmp = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, - fold_build2 (EQ_EXPR, boolean_type_node, - pos, gfc_index_zero_node), - fold_build2 (EQ_EXPR, boolean_type_node, - arrayse.expr, limit)); - tmp = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, - fold_build2 (op, boolean_type_node, - arrayse.expr, limit), tmp); - tmp = build3_v (COND_EXPR, tmp, ifbody, build_empty_stmt (input_location)); - gfc_add_expr_to_block (&block, tmp); + if (!lab1 || HONOR_NANS (DECL_MODE (limit))) + { + if (lab1) + cond = fold_build2 (op == GT_EXPR ? GE_EXPR : LE_EXPR, + boolean_type_node, arrayse.expr, limit); + else + cond = fold_build2 (op, boolean_type_node, arrayse.expr, limit); + + ifbody = build3_v (COND_EXPR, cond, ifbody, + build_empty_stmt (input_location)); + } + gfc_add_expr_to_block (&block, ifbody); if (maskss) { @@ -2319,8 +2445,95 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) tmp = gfc_finish_block (&block); gfc_add_expr_to_block (&body, tmp); + if (lab1) + { + gfc_trans_scalarized_loop_end (&loop, 0, &body); + + if (HONOR_NANS (DECL_MODE (limit))) + { + if (nonempty != NULL) + { + ifbody = build2_v (MODIFY_EXPR, pos, gfc_index_one_node); + tmp = build3_v (COND_EXPR, nonempty, ifbody, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&loop.code[0], tmp); + } + } + + gfc_add_expr_to_block (&loop.code[0], build1_v (GOTO_EXPR, lab2)); + gfc_add_expr_to_block (&loop.code[0], build1_v (LABEL_EXPR, lab1)); + gfc_start_block (&body); + + /* If we have a mask, only check this element if the mask is set. */ + if (maskss) + { + gfc_init_se (&maskse, NULL); + gfc_copy_loopinfo_to_se (&maskse, &loop); + maskse.ss = maskss; + gfc_conv_expr_val (&maskse, maskexpr); + gfc_add_block_to_block (&body, &maskse.pre); + + gfc_start_block (&block); + } + else + gfc_init_block (&block); + + /* Compare with the current limit. */ + gfc_init_se (&arrayse, NULL); + gfc_copy_loopinfo_to_se (&arrayse, &loop); + arrayse.ss = arrayss; + gfc_conv_expr_val (&arrayse, arrayexpr); + gfc_add_block_to_block (&block, &arrayse.pre); + + /* We do the following if this is a more extreme value. */ + gfc_start_block (&ifblock); + + /* Assign the value to the limit... */ + gfc_add_modify (&ifblock, limit, arrayse.expr); + + /* Remember where we are. An offset must be added to the loop + counter to obtain the required position. */ + if (loop.from[0]) + tmp = fold_build2 (MINUS_EXPR, gfc_array_index_type, + gfc_index_one_node, loop.from[0]); + else + tmp = gfc_index_one_node; + + gfc_add_modify (&block, offset, tmp); + + tmp = fold_build2 (PLUS_EXPR, TREE_TYPE (pos), + loop.loopvar[0], offset); + gfc_add_modify (&ifblock, pos, tmp); + + ifbody = gfc_finish_block (&ifblock); + + cond = fold_build2 (op, boolean_type_node, arrayse.expr, limit); + + tmp = build3_v (COND_EXPR, cond, ifbody, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block, tmp); + + if (maskss) + { + /* We enclose the above in if (mask) {...}. */ + tmp = gfc_finish_block (&block); + + tmp = build3_v (COND_EXPR, maskse.expr, tmp, + build_empty_stmt (input_location)); + } + else + tmp = gfc_finish_block (&block); + gfc_add_expr_to_block (&body, tmp); + /* Avoid initializing loopvar[0] again, it should be left where + it finished by the first loop. */ + loop.from[0] = loop.loopvar[0]; + } + gfc_trans_scalarizing_loops (&loop, &body); + if (lab2) + gfc_add_expr_to_block (&loop.pre, build1_v (LABEL_EXPR, lab2)); + /* For a scalar mask, enclose the loop in an if statement. */ if (maskexpr && maskss == NULL) { @@ -2352,6 +2565,99 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) se->expr = convert (type, pos); } +/* Emit code for minval or maxval intrinsic. There are many different cases + we need to handle. For performance reasons we sometimes create two + loops instead of one, where the second one is much simpler. + Examples for minval intrinsic: + 1) Result is an array, a call is generated + 2) Array mask is used and NaNs need to be supported, rank 1: + limit = Infinity; + nonempty = false; + S = from; + while (S <= to) { + if (mask[S]) { nonempty = true; if (a[S] <= limit) goto lab; } + S++; + } + limit = nonempty ? NaN : huge (limit); + lab: + while (S <= to) { if(mask[S]) limit = min (a[S], limit); S++; } + 3) NaNs need to be supported, but it is known at compile time or cheaply + at runtime whether array is nonempty or not, rank 1: + limit = Infinity; + S = from; + while (S <= to) { if (a[S] <= limit) goto lab; S++; } + limit = (from <= to) ? NaN : huge (limit); + lab: + while (S <= to) { limit = min (a[S], limit); S++; } + 4) Array mask is used and NaNs need to be supported, rank > 1: + limit = Infinity; + nonempty = false; + fast = false; + S1 = from1; + while (S1 <= to1) { + S2 = from2; + while (S2 <= to2) { + if (mask[S1][S2]) { + if (fast) limit = min (a[S1][S2], limit); + else { + nonempty = true; + if (a[S1][S2] <= limit) { + limit = a[S1][S2]; + fast = true; + } + } + } + S2++; + } + S1++; + } + if (!fast) + limit = nonempty ? NaN : huge (limit); + 5) NaNs need to be supported, but it is known at compile time or cheaply + at runtime whether array is nonempty or not, rank > 1: + limit = Infinity; + fast = false; + S1 = from1; + while (S1 <= to1) { + S2 = from2; + while (S2 <= to2) { + if (fast) limit = min (a[S1][S2], limit); + else { + if (a[S1][S2] <= limit) { + limit = a[S1][S2]; + fast = true; + } + } + S2++; + } + S1++; + } + if (!fast) + limit = (nonempty_array) ? NaN : huge (limit); + 6) NaNs aren't supported, but infinities are. Array mask is used: + limit = Infinity; + nonempty = false; + S = from; + while (S <= to) { + if (mask[S]) { nonempty = true; limit = min (a[S], limit); } + S++; + } + limit = nonempty ? limit : huge (limit); + 7) Same without array mask: + limit = Infinity; + S = from; + while (S <= to) { limit = min (a[S], limit); S++; } + limit = (from <= to) ? limit : huge (limit); + 8) Neither NaNs nor infinities are supported (-ffast-math or BT_INTEGER): + limit = huge (limit); + S = from; + while (S <= to) { limit = min (a[S], limit); S++); } + (or + while (S <= to) { if (mask[S]) limit = min (a[S], limit); S++; } + with array mask instead). + For 3), 5), 7) and 8), if mask is scalar, this all goes into a conditional, + setting limit = huge (limit); in the else branch. */ + static void gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) { @@ -2359,8 +2665,13 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) tree type; tree tmp; tree ifbody; + tree nonempty; + tree nonempty_var; + tree lab; + tree fast; + tree huge_cst = NULL, nan_cst = NULL; stmtblock_t body; - stmtblock_t block; + stmtblock_t block, block2; gfc_loopinfo loop; gfc_actual_arglist *actual; gfc_ss *arrayss; @@ -2384,7 +2695,22 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) switch (expr->ts.type) { case BT_REAL: - tmp = gfc_conv_mpfr_to_tree (gfc_real_kinds[n].huge, expr->ts.kind, 0); + huge_cst = gfc_conv_mpfr_to_tree (gfc_real_kinds[n].huge, + expr->ts.kind, 0); + if (HONOR_INFINITIES (DECL_MODE (limit))) + { + REAL_VALUE_TYPE real; + real_inf (&real); + tmp = build_real (type, real); + } + else + tmp = huge_cst; + if (HONOR_NANS (DECL_MODE (limit))) + { + REAL_VALUE_TYPE real; + real_nan (&real, "", 1, DECL_MODE (limit)); + nan_cst = build_real (type, real); + } break; case BT_INTEGER: @@ -2400,7 +2726,11 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) -HUGE for BT_REAL and (-HUGE - 1) for BT_INTEGER; the most positive possible value is HUGE in both cases. */ if (op == GT_EXPR) - tmp = fold_build1 (NEGATE_EXPR, TREE_TYPE (tmp), tmp); + { + tmp = fold_build1 (NEGATE_EXPR, TREE_TYPE (tmp), tmp); + if (huge_cst) + huge_cst = fold_build1 (NEGATE_EXPR, TREE_TYPE (huge_cst), huge_cst); + } if (op == GT_EXPR && expr->ts.type == BT_INTEGER) tmp = fold_build2 (MINUS_EXPR, TREE_TYPE (tmp), @@ -2417,13 +2747,24 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) actual = actual->next->next; gcc_assert (actual); maskexpr = actual->expr; + nonempty = NULL; if (maskexpr && maskexpr->rank != 0) { maskss = gfc_walk_expr (maskexpr); gcc_assert (maskss != gfc_ss_terminator); } else - maskss = NULL; + { + mpz_t asize; + if (gfc_array_size (arrayexpr, &asize) == SUCCESS) + { + nonempty = gfc_conv_mpz_to_tree (asize, gfc_index_integer_kind); + mpz_clear (asize); + nonempty = fold_build2 (GT_EXPR, boolean_type_node, nonempty, + gfc_index_zero_node); + } + maskss = NULL; + } /* Initialize the scalarizer. */ gfc_init_loopinfo (&loop); @@ -2435,6 +2776,35 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) gfc_conv_ss_startstride (&loop); gfc_conv_loop_setup (&loop, &expr->where); + if (nonempty == NULL && maskss == NULL + && loop.dimen == 1 && loop.from[0] && loop.to[0]) + nonempty = fold_build2 (LE_EXPR, boolean_type_node, loop.from[0], + loop.to[0]); + nonempty_var = NULL; + if (nonempty == NULL + && (HONOR_INFINITIES (DECL_MODE (limit)) + || HONOR_NANS (DECL_MODE (limit)))) + { + nonempty_var = gfc_create_var (boolean_type_node, "nonempty"); + gfc_add_modify (&se->pre, nonempty_var, boolean_false_node); + nonempty = nonempty_var; + } + lab = NULL; + fast = NULL; + if (HONOR_NANS (DECL_MODE (limit))) + { + if (loop.dimen == 1) + { + lab = gfc_build_label_decl (NULL_TREE); + TREE_USED (lab) = 1; + } + else + { + fast = gfc_create_var (boolean_type_node, "fast"); + gfc_add_modify (&se->pre, fast, boolean_false_node); + } + } + gfc_mark_ss_chain_used (arrayss, 1); if (maskss) gfc_mark_ss_chain_used (maskss, 1); @@ -2462,13 +2832,76 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) gfc_conv_expr_val (&arrayse, arrayexpr); gfc_add_block_to_block (&block, &arrayse.pre); - /* Assign the value to the limit... */ - ifbody = build2_v (MODIFY_EXPR, limit, arrayse.expr); + gfc_init_block (&block2); + + if (nonempty_var) + gfc_add_modify (&block2, nonempty_var, boolean_true_node); + + if (HONOR_NANS (DECL_MODE (limit))) + { + tmp = fold_build2 (op == GT_EXPR ? GE_EXPR : LE_EXPR, + boolean_type_node, arrayse.expr, limit); + if (lab) + ifbody = build1_v (GOTO_EXPR, lab); + else + { + stmtblock_t ifblock; + + gfc_init_block (&ifblock); + gfc_add_modify (&ifblock, limit, arrayse.expr); + gfc_add_modify (&ifblock, fast, boolean_true_node); + ifbody = gfc_finish_block (&ifblock); + } + tmp = build3_v (COND_EXPR, tmp, ifbody, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block2, tmp); + } + else + { + /* MIN_EXPR/MAX_EXPR has unspecified behavior with NaNs or + signed zeros. */ + if (HONOR_SIGNED_ZEROS (DECL_MODE (limit))) + { + tmp = fold_build2 (op, boolean_type_node, arrayse.expr, limit); + ifbody = build2_v (MODIFY_EXPR, limit, arrayse.expr); + tmp = build3_v (COND_EXPR, tmp, ifbody, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block2, tmp); + } + else + { + tmp = fold_build2 (op == GT_EXPR ? MAX_EXPR : MIN_EXPR, + type, arrayse.expr, limit); + gfc_add_modify (&block2, limit, tmp); + } + } + + if (fast) + { + tree elsebody = gfc_finish_block (&block2); + + /* MIN_EXPR/MAX_EXPR has unspecified behavior with NaNs or + signed zeros. */ + if (HONOR_NANS (DECL_MODE (limit)) + || HONOR_SIGNED_ZEROS (DECL_MODE (limit))) + { + tmp = fold_build2 (op, boolean_type_node, arrayse.expr, limit); + ifbody = build2_v (MODIFY_EXPR, limit, arrayse.expr); + ifbody = build3_v (COND_EXPR, tmp, ifbody, + build_empty_stmt (input_location)); + } + else + { + tmp = fold_build2 (op == GT_EXPR ? MAX_EXPR : MIN_EXPR, + type, arrayse.expr, limit); + ifbody = build2_v (MODIFY_EXPR, limit, tmp); + } + tmp = build3_v (COND_EXPR, fast, ifbody, elsebody); + gfc_add_expr_to_block (&block, tmp); + } + else + gfc_add_block_to_block (&block, &block2); - /* If it is a more extreme value. */ - tmp = fold_build2 (op, boolean_type_node, arrayse.expr, limit); - tmp = build3_v (COND_EXPR, tmp, ifbody, build_empty_stmt (input_location)); - gfc_add_expr_to_block (&block, tmp); gfc_add_block_to_block (&block, &arrayse.post); tmp = gfc_finish_block (&block); @@ -2478,11 +2911,88 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) build_empty_stmt (input_location)); gfc_add_expr_to_block (&body, tmp); + if (lab) + { + gfc_trans_scalarized_loop_end (&loop, 0, &body); + + tmp = fold_build3 (COND_EXPR, type, nonempty, nan_cst, huge_cst); + gfc_add_modify (&loop.code[0], limit, tmp); + gfc_add_expr_to_block (&loop.code[0], build1_v (LABEL_EXPR, lab)); + + gfc_start_block (&body); + + /* If we have a mask, only add this element if the mask is set. */ + if (maskss) + { + gfc_init_se (&maskse, NULL); + gfc_copy_loopinfo_to_se (&maskse, &loop); + maskse.ss = maskss; + gfc_conv_expr_val (&maskse, maskexpr); + gfc_add_block_to_block (&body, &maskse.pre); + + gfc_start_block (&block); + } + else + gfc_init_block (&block); + + /* Compare with the current limit. */ + gfc_init_se (&arrayse, NULL); + gfc_copy_loopinfo_to_se (&arrayse, &loop); + arrayse.ss = arrayss; + gfc_conv_expr_val (&arrayse, arrayexpr); + gfc_add_block_to_block (&block, &arrayse.pre); + + /* MIN_EXPR/MAX_EXPR has unspecified behavior with NaNs or + signed zeros. */ + if (HONOR_NANS (DECL_MODE (limit)) + || HONOR_SIGNED_ZEROS (DECL_MODE (limit))) + { + tmp = fold_build2 (op, boolean_type_node, arrayse.expr, limit); + ifbody = build2_v (MODIFY_EXPR, limit, arrayse.expr); + tmp = build3_v (COND_EXPR, tmp, ifbody, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block, tmp); + } + else + { + tmp = fold_build2 (op == GT_EXPR ? MAX_EXPR : MIN_EXPR, + type, arrayse.expr, limit); + gfc_add_modify (&block, limit, tmp); + } + + gfc_add_block_to_block (&block, &arrayse.post); + + tmp = gfc_finish_block (&block); + if (maskss) + /* We enclose the above in if (mask) {...}. */ + tmp = build3_v (COND_EXPR, maskse.expr, tmp, + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&body, tmp); + /* Avoid initializing loopvar[0] again, it should be left where + it finished by the first loop. */ + loop.from[0] = loop.loopvar[0]; + } gfc_trans_scalarizing_loops (&loop, &body); + if (fast) + { + tmp = fold_build3 (COND_EXPR, type, nonempty, nan_cst, huge_cst); + ifbody = build2_v (MODIFY_EXPR, limit, tmp); + tmp = build3_v (COND_EXPR, fast, build_empty_stmt (input_location), + ifbody); + gfc_add_expr_to_block (&loop.pre, tmp); + } + else if (HONOR_INFINITIES (DECL_MODE (limit)) && !lab) + { + tmp = fold_build3 (COND_EXPR, type, nonempty, limit, huge_cst); + gfc_add_modify (&loop.pre, limit, tmp); + } + /* For a scalar mask, enclose the loop in an if statement. */ if (maskexpr && maskss == NULL) { + tree else_stmt; + gfc_init_se (&maskse, NULL); gfc_conv_expr_val (&maskse, maskexpr); gfc_init_block (&block); @@ -2490,8 +3000,11 @@ gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) gfc_add_block_to_block (&block, &loop.post); tmp = gfc_finish_block (&block); - tmp = build3_v (COND_EXPR, maskse.expr, tmp, - build_empty_stmt (input_location)); + if (HONOR_INFINITIES (DECL_MODE (limit))) + else_stmt = build2_v (MODIFY_EXPR, limit, huge_cst); + else + else_stmt = build_empty_stmt (input_location); + tmp = build3_v (COND_EXPR, maskse.expr, tmp, else_stmt); gfc_add_expr_to_block (&block, tmp); gfc_add_block_to_block (&se->pre, &block); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a2ca909642b..671f681caf5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2009-07-24 Jakub Jelinek <jakub@redhat.com> + + PR fortran/40643 + PR fortran/31067 + * gfortran.dg/maxlocval_2.f90: New test. + * gfortran.dg/maxlocval_3.f90: New test. + * gfortran.dg/maxlocval_4.f90: New test. + * gfortran.dg/minlocval_1.f90: New test. + * gfortran.dg/minlocval_2.f90: New test. + * gfortran.dg/minlocval_3.f90: New test. + * gfortran.dg/minlocval_4.f90: New test. + 2009-07-23 Joseph Myers <joseph@codesourcery.com> * gcc.dg/dll-4.c: Allow foo1 and foo2 in either order in diff --git a/gcc/testsuite/gfortran.dg/maxlocval_2.f90 b/gcc/testsuite/gfortran.dg/maxlocval_2.f90 new file mode 100644 index 00000000000..82f917a9bc1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/maxlocval_2.f90 @@ -0,0 +1,153 @@ +! { dg-do run } + real :: a(3), nan, minf, pinf + real, allocatable :: c(:) + logical :: l + logical :: l2(3) + + nan = 0.0 + minf = 0.0 + pinf = 0.0 + nan = 0.0/nan + minf = -1.0/minf + pinf = 1.0/pinf + + allocate (c(3)) + a(:) = nan + if (maxloc (a, dim = 1).ne.1) call abort + if (.not.isnan(maxval (a, dim = 1))) call abort + a(:) = minf + if (maxloc (a, dim = 1).ne.1) call abort + if (maxval (a, dim = 1).ne.minf) call abort + a(1:2) = nan + if (maxloc (a, dim = 1).ne.3) call abort + if (maxval (a, dim = 1).ne.minf) call abort + a(2) = 1.0 + if (maxloc (a, dim = 1).ne.2) call abort + if (maxval (a, dim = 1).ne.1) call abort + a(2) = pinf + if (maxloc (a, dim = 1).ne.2) call abort + if (maxval (a, dim = 1).ne.pinf) call abort + c(:) = nan + if (maxloc (c, dim = 1).ne.1) call abort + if (.not.isnan(maxval (c, dim = 1))) call abort + c(:) = minf + if (maxloc (c, dim = 1).ne.1) call abort + if (maxval (c, dim = 1).ne.minf) call abort + c(1:2) = nan + if (maxloc (c, dim = 1).ne.3) call abort + if (maxval (c, dim = 1).ne.minf) call abort + c(2) = 1.0 + if (maxloc (c, dim = 1).ne.2) call abort + if (maxval (c, dim = 1).ne.1) call abort + c(2) = pinf + if (maxloc (c, dim = 1).ne.2) call abort + if (maxval (c, dim = 1).ne.pinf) call abort + l = .false. + l2(:) = .false. + a(:) = nan + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(minf)) call abort + a(:) = minf + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(minf)) call abort + a(1:2) = nan + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(minf)) call abort + a(2) = 1.0 + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(minf)) call abort + a(2) = pinf + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(minf)) call abort + c(:) = nan + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(minf)) call abort + c(:) = minf + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(minf)) call abort + c(1:2) = nan + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(minf)) call abort + c(2) = 1.0 + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(minf)) call abort + c(2) = pinf + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(minf)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(minf)) call abort + l = .true. + l2(:) = .true. + a(:) = nan + if (maxloc (a, dim = 1, mask = l).ne.1) call abort + if (.not.isnan(maxval (a, dim = 1, mask = l))) call abort + if (maxloc (a, dim = 1, mask = l2).ne.1) call abort + if (.not.isnan(maxval (a, dim = 1, mask = l2))) call abort + a(:) = minf + if (maxloc (a, dim = 1, mask = l).ne.1) call abort + if (maxval (a, dim = 1, mask = l).ne.minf) call abort + if (maxloc (a, dim = 1, mask = l2).ne.1) call abort + if (maxval (a, dim = 1, mask = l2).ne.minf) call abort + a(1:2) = nan + if (maxloc (a, dim = 1, mask = l).ne.3) call abort + if (maxval (a, dim = 1, mask = l).ne.minf) call abort + if (maxloc (a, dim = 1, mask = l2).ne.3) call abort + if (maxval (a, dim = 1, mask = l2).ne.minf) call abort + a(2) = 1.0 + if (maxloc (a, dim = 1, mask = l).ne.2) call abort + if (maxval (a, dim = 1, mask = l).ne.1) call abort + if (maxloc (a, dim = 1, mask = l2).ne.2) call abort + if (maxval (a, dim = 1, mask = l2).ne.1) call abort + a(2) = pinf + if (maxloc (a, dim = 1, mask = l).ne.2) call abort + if (maxval (a, dim = 1, mask = l).ne.pinf) call abort + if (maxloc (a, dim = 1, mask = l2).ne.2) call abort + if (maxval (a, dim = 1, mask = l2).ne.pinf) call abort + c(:) = nan + if (maxloc (c, dim = 1, mask = l).ne.1) call abort + if (.not.isnan(maxval (c, dim = 1, mask = l))) call abort + if (maxloc (c, dim = 1, mask = l2).ne.1) call abort + if (.not.isnan(maxval (c, dim = 1, mask = l2))) call abort + c(:) = minf + if (maxloc (c, dim = 1, mask = l).ne.1) call abort + if (maxval (c, dim = 1, mask = l).ne.minf) call abort + if (maxloc (c, dim = 1, mask = l2).ne.1) call abort + if (maxval (c, dim = 1, mask = l2).ne.minf) call abort + c(1:2) = nan + if (maxloc (c, dim = 1, mask = l).ne.3) call abort + if (maxval (c, dim = 1, mask = l).ne.minf) call abort + if (maxloc (c, dim = 1, mask = l2).ne.3) call abort + if (maxval (c, dim = 1, mask = l2).ne.minf) call abort + c(2) = 1.0 + if (maxloc (c, dim = 1, mask = l).ne.2) call abort + if (maxval (c, dim = 1, mask = l).ne.1) call abort + if (maxloc (c, dim = 1, mask = l2).ne.2) call abort + if (maxval (c, dim = 1, mask = l2).ne.1) call abort + c(2) = pinf + if (maxloc (c, dim = 1, mask = l).ne.2) call abort + if (maxval (c, dim = 1, mask = l).ne.pinf) call abort + if (maxloc (c, dim = 1, mask = l2).ne.2) call abort + if (maxval (c, dim = 1, mask = l2).ne.pinf) call abort + deallocate (c) + allocate (c(-2:-3)) + if (maxloc (c, dim = 1).ne.0) call abort + if (maxval (c, dim = 1).ne.-huge(minf)) call abort +end diff --git a/gcc/testsuite/gfortran.dg/maxlocval_3.f90 b/gcc/testsuite/gfortran.dg/maxlocval_3.f90 new file mode 100644 index 00000000000..cbd35957b13 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/maxlocval_3.f90 @@ -0,0 +1,122 @@ +! { dg-do run } + integer :: a(3), h + integer, allocatable :: c(:) + logical :: l + logical :: l2(3) + + h = -huge(h) + h = h - 1 + allocate (c(3)) + a(:) = 5 + if (maxloc (a, dim = 1).ne.1) call abort + if (maxval (a, dim = 1).ne.5) call abort + a(2) = huge(h) + if (maxloc (a, dim = 1).ne.2) call abort + if (maxval (a, dim = 1).ne.huge(h)) call abort + a(:) = h + if (maxloc (a, dim = 1).ne.1) call abort + if (maxval (a, dim = 1).ne.h) call abort + a(3) = -huge(h) + if (maxloc (a, dim = 1).ne.3) call abort + if (maxval (a, dim = 1).ne.-huge(h)) call abort + c(:) = 5 + if (maxloc (c, dim = 1).ne.1) call abort + if (maxval (c, dim = 1).ne.5) call abort + c(2) = huge(h) + if (maxloc (c, dim = 1).ne.2) call abort + if (maxval (c, dim = 1).ne.huge(h)) call abort + c(:) = h + if (maxloc (c, dim = 1).ne.1) call abort + if (maxval (c, dim = 1).ne.h) call abort + c(3) = -huge(h) + if (maxloc (c, dim = 1).ne.3) call abort + if (maxval (c, dim = 1).ne.-huge(h)) call abort + l = .false. + l2(:) = .false. + a(:) = 5 + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.h) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.h) call abort + a(2) = huge(h) + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.h) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.h) call abort + a(:) = h + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.h) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.h) call abort + a(3) = -huge(h) + if (maxloc (a, dim = 1, mask = l).ne.0) call abort + if (maxval (a, dim = 1, mask = l).ne.h) call abort + if (maxloc (a, dim = 1, mask = l2).ne.0) call abort + if (maxval (a, dim = 1, mask = l2).ne.h) call abort + c(:) = 5 + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.h) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.h) call abort + c(2) = huge(h) + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.h) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.h) call abort + c(:) = h + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.h) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.h) call abort + c(3) = -huge(h) + if (maxloc (c, dim = 1, mask = l).ne.0) call abort + if (maxval (c, dim = 1, mask = l).ne.h) call abort + if (maxloc (c, dim = 1, mask = l2).ne.0) call abort + if (maxval (c, dim = 1, mask = l2).ne.h) call abort + l = .true. + l2(:) = .true. + a(:) = 5 + if (maxloc (a, dim = 1, mask = l).ne.1) call abort + if (maxval (a, dim = 1, mask = l).ne.5) call abort + if (maxloc (a, dim = 1, mask = l2).ne.1) call abort + if (maxval (a, dim = 1, mask = l2).ne.5) call abort + a(2) = huge(h) + if (maxloc (a, dim = 1, mask = l).ne.2) call abort + if (maxval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.2) call abort + if (maxval (a, dim = 1, mask = l2).ne.huge(h)) call abort + a(:) = h + if (maxloc (a, dim = 1, mask = l).ne.1) call abort + if (maxval (a, dim = 1, mask = l).ne.h) call abort + if (maxloc (a, dim = 1, mask = l2).ne.1) call abort + if (maxval (a, dim = 1, mask = l2).ne.h) call abort + a(3) = -huge(h) + if (maxloc (a, dim = 1, mask = l).ne.3) call abort + if (maxval (a, dim = 1, mask = l).ne.-huge(h)) call abort + if (maxloc (a, dim = 1, mask = l2).ne.3) call abort + if (maxval (a, dim = 1, mask = l2).ne.-huge(h)) call abort + c(:) = 5 + if (maxloc (c, dim = 1, mask = l).ne.1) call abort + if (maxval (c, dim = 1, mask = l).ne.5) call abort + if (maxloc (c, dim = 1, mask = l2).ne.1) call abort + if (maxval (c, dim = 1, mask = l2).ne.5) call abort + c(2) = huge(h) + if (maxloc (c, dim = 1, mask = l).ne.2) call abort + if (maxval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.2) call abort + if (maxval (c, dim = 1, mask = l2).ne.huge(h)) call abort + c(:) = h + if (maxloc (c, dim = 1, mask = l).ne.1) call abort + if (maxval (c, dim = 1, mask = l).ne.h) call abort + if (maxloc (c, dim = 1, mask = l2).ne.1) call abort + if (maxval (c, dim = 1, mask = l2).ne.h) call abort + c(3) = -huge(h) + if (maxloc (c, dim = 1, mask = l).ne.3) call abort + if (maxval (c, dim = 1, mask = l).ne.-huge(h)) call abort + if (maxloc (c, dim = 1, mask = l2).ne.3) call abort + if (maxval (c, dim = 1, mask = l2).ne.-huge(h)) call abort + deallocate (c) + allocate (c(-2:-3)) + if (maxloc (c, dim = 1).ne.0) call abort + if (maxval (c, dim = 1).ne.h) call abort +end diff --git a/gcc/testsuite/gfortran.dg/maxlocval_4.f90 b/gcc/testsuite/gfortran.dg/maxlocval_4.f90 new file mode 100644 index 00000000000..408b08d6fad --- /dev/null +++ b/gcc/testsuite/gfortran.dg/maxlocval_4.f90 @@ -0,0 +1,118 @@ +! { dg-do run } + real :: a(3,3), b(3), nan, minf, pinf, h + logical :: l, l2 + logical :: l3(3,3), l4(3,3), l5(3,3) + + nan = 0.0 + minf = 0.0 + pinf = 0.0 + nan = 0.0/nan + minf = -1.0/minf + pinf = 1.0/pinf + h = -huge(h) + l = .false. + l2 = .true. + l3 = .false. + l4 = .true. + l5 = .true. + l5(1,1) = .false. + l5(1,2) = .false. + l5(2,3) = .false. + a = reshape ((/ nan, nan, nan, minf, minf, minf, minf, pinf, minf /), (/ 3, 3 /)) + if (maxval (a).ne.pinf) call abort + if (any (maxloc (a).ne.(/ 2, 3 /))) call abort + b = maxval (a, dim = 1) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, minf, pinf /))) call abort + if (any (maxloc (a, dim = 1).ne.(/ 1, 1, 2 /))) call abort + b = maxval (a, dim = 2) + if (any (b.ne.(/ minf, pinf, minf /))) call abort + if (any (maxloc (a, dim = 2).ne.(/ 2, 3, 2 /))) call abort + if (maxval (a, mask = l).ne.h) call abort + if (any (maxloc (a, mask = l).ne.(/ 0, 0 /))) call abort + b = maxval (a, dim = 1, mask = l) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (maxloc (a, dim = 1, mask = l).ne.(/ 0, 0, 0 /))) call abort + b = maxval (a, dim = 2, mask = l) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (maxloc (a, dim = 2, mask = l).ne.(/ 0, 0, 0 /))) call abort + if (maxval (a, mask = l3).ne.h) call abort + if (any (maxloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + b = maxval (a, dim = 1, mask = l3) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (maxloc (a, dim = 1, mask = l3).ne.(/ 0, 0, 0 /))) call abort + b = maxval (a, dim = 2, mask = l3) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (maxloc (a, dim = 2, mask = l3).ne.(/ 0, 0, 0 /))) call abort + if (maxval (a, mask = l2).ne.pinf) call abort + if (maxval (a, mask = l4).ne.pinf) call abort + if (any (maxloc (a, mask = l2).ne.(/ 2, 3 /))) call abort + if (any (maxloc (a, mask = l4).ne.(/ 2, 3 /))) call abort + b = maxval (a, dim = 1, mask = l2) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, minf, pinf /))) call abort + if (any (maxloc (a, dim = 1, mask = l2).ne.(/ 1, 1, 2 /))) call abort + b = maxval (a, dim = 2, mask = l2) + if (any (b.ne.(/ minf, pinf, minf /))) call abort + if (any (maxloc (a, dim = 2, mask = l2).ne.(/ 2, 3, 2 /))) call abort + b = maxval (a, dim = 1, mask = l4) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, minf, pinf /))) call abort + if (any (maxloc (a, dim = 1, mask = l2).ne.(/ 1, 1, 2 /))) call abort + b = maxval (a, dim = 2, mask = l4) + if (any (b.ne.(/ minf, pinf, minf /))) call abort + if (any (maxloc (a, dim = 2, mask = l2).ne.(/ 2, 3, 2 /))) call abort + if (maxval (a, mask = l5).ne.minf) call abort + if (any (maxloc (a, mask = l5).ne.(/ 2, 2 /))) call abort + b = maxval (a, dim = 1, mask = l5) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, minf, minf /))) call abort + if (any (maxloc (a, dim = 1, mask = l5).ne.(/ 2, 2, 1 /))) call abort + b = maxval (a, dim = 2, mask = l5) + if (any (b.ne.(/ minf, minf, minf /))) call abort + if (any (maxloc (a, dim = 2, mask = l5).ne.(/ 3, 2, 2 /))) call abort + a = nan + if (.not.isnan(maxval (a))) call abort + if (maxval (a, mask = l).ne.h) call abort + if (.not.isnan(maxval (a, mask = l2))) call abort + if (maxval (a, mask = l3).ne.h) call abort + if (.not.isnan(maxval (a, mask = l4))) call abort + if (.not.isnan(maxval (a, mask = l5))) call abort + if (any (maxloc (a).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l2).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l4).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l5).ne.(/ 2, 1 /))) call abort + a = minf + if (maxval (a).ne.minf) call abort + if (maxval (a, mask = l).ne.h) call abort + if (maxval (a, mask = l2).ne.minf) call abort + if (maxval (a, mask = l3).ne.h) call abort + if (maxval (a, mask = l4).ne.minf) call abort + if (maxval (a, mask = l5).ne.minf) call abort + if (any (maxloc (a).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l2).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l4).ne.(/ 1, 1 /))) call abort + if (any (maxloc (a, mask = l5).ne.(/ 2, 1 /))) call abort + a = nan + a(1,3) = minf + if (maxval (a).ne.minf) call abort + if (maxval (a, mask = l).ne.h) call abort + if (maxval (a, mask = l2).ne.minf) call abort + if (maxval (a, mask = l3).ne.h) call abort + if (maxval (a, mask = l4).ne.minf) call abort + if (maxval (a, mask = l5).ne.minf) call abort + if (any (maxloc (a).ne.(/ 1, 3 /))) call abort + if (any (maxloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l2).ne.(/ 1, 3 /))) call abort + if (any (maxloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (maxloc (a, mask = l4).ne.(/ 1, 3 /))) call abort + if (any (maxloc (a, mask = l5).ne.(/ 1, 3 /))) call abort +end diff --git a/gcc/testsuite/gfortran.dg/minlocval_1.f90 b/gcc/testsuite/gfortran.dg/minlocval_1.f90 new file mode 100644 index 00000000000..f821e54bd68 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minlocval_1.f90 @@ -0,0 +1,153 @@ +! { dg-do run } + real :: a(3), nan, minf, pinf + real, allocatable :: c(:) + logical :: l + logical :: l2(3) + + nan = 0.0 + minf = 0.0 + pinf = 0.0 + nan = 0.0/nan + minf = -1.0/minf + pinf = 1.0/pinf + + allocate (c(3)) + a(:) = nan + if (minloc (a, dim = 1).ne.1) call abort + if (.not.isnan(minval (a, dim = 1))) call abort + a(:) = pinf + if (minloc (a, dim = 1).ne.1) call abort + if (minval (a, dim = 1).ne.pinf) call abort + a(1:2) = nan + if (minloc (a, dim = 1).ne.3) call abort + if (minval (a, dim = 1).ne.pinf) call abort + a(2) = 1.0 + if (minloc (a, dim = 1).ne.2) call abort + if (minval (a, dim = 1).ne.1) call abort + a(2) = minf + if (minloc (a, dim = 1).ne.2) call abort + if (minval (a, dim = 1).ne.minf) call abort + c(:) = nan + if (minloc (c, dim = 1).ne.1) call abort + if (.not.isnan(minval (c, dim = 1))) call abort + c(:) = pinf + if (minloc (c, dim = 1).ne.1) call abort + if (minval (c, dim = 1).ne.pinf) call abort + c(1:2) = nan + if (minloc (c, dim = 1).ne.3) call abort + if (minval (c, dim = 1).ne.pinf) call abort + c(2) = 1.0 + if (minloc (c, dim = 1).ne.2) call abort + if (minval (c, dim = 1).ne.1) call abort + c(2) = minf + if (minloc (c, dim = 1).ne.2) call abort + if (minval (c, dim = 1).ne.minf) call abort + l = .false. + l2(:) = .false. + a(:) = nan + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(pinf)) call abort + a(:) = pinf + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(pinf)) call abort + a(1:2) = nan + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(pinf)) call abort + a(2) = 1.0 + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(pinf)) call abort + a(2) = minf + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(pinf)) call abort + c(:) = nan + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(pinf)) call abort + c(:) = pinf + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(pinf)) call abort + c(1:2) = nan + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(pinf)) call abort + c(2) = 1.0 + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(pinf)) call abort + c(2) = minf + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(pinf)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(pinf)) call abort + l = .true. + l2(:) = .true. + a(:) = nan + if (minloc (a, dim = 1, mask = l).ne.1) call abort + if (.not.isnan(minval (a, dim = 1, mask = l))) call abort + if (minloc (a, dim = 1, mask = l2).ne.1) call abort + if (.not.isnan(minval (a, dim = 1, mask = l2))) call abort + a(:) = pinf + if (minloc (a, dim = 1, mask = l).ne.1) call abort + if (minval (a, dim = 1, mask = l).ne.pinf) call abort + if (minloc (a, dim = 1, mask = l2).ne.1) call abort + if (minval (a, dim = 1, mask = l2).ne.pinf) call abort + a(1:2) = nan + if (minloc (a, dim = 1, mask = l).ne.3) call abort + if (minval (a, dim = 1, mask = l).ne.pinf) call abort + if (minloc (a, dim = 1, mask = l2).ne.3) call abort + if (minval (a, dim = 1, mask = l2).ne.pinf) call abort + a(2) = 1.0 + if (minloc (a, dim = 1, mask = l).ne.2) call abort + if (minval (a, dim = 1, mask = l).ne.1) call abort + if (minloc (a, dim = 1, mask = l2).ne.2) call abort + if (minval (a, dim = 1, mask = l2).ne.1) call abort + a(2) = minf + if (minloc (a, dim = 1, mask = l).ne.2) call abort + if (minval (a, dim = 1, mask = l).ne.minf) call abort + if (minloc (a, dim = 1, mask = l2).ne.2) call abort + if (minval (a, dim = 1, mask = l2).ne.minf) call abort + c(:) = nan + if (minloc (c, dim = 1, mask = l).ne.1) call abort + if (.not.isnan(minval (c, dim = 1, mask = l))) call abort + if (minloc (c, dim = 1, mask = l2).ne.1) call abort + if (.not.isnan(minval (c, dim = 1, mask = l2))) call abort + c(:) = pinf + if (minloc (c, dim = 1, mask = l).ne.1) call abort + if (minval (c, dim = 1, mask = l).ne.pinf) call abort + if (minloc (c, dim = 1, mask = l2).ne.1) call abort + if (minval (c, dim = 1, mask = l2).ne.pinf) call abort + c(1:2) = nan + if (minloc (c, dim = 1, mask = l).ne.3) call abort + if (minval (c, dim = 1, mask = l).ne.pinf) call abort + if (minloc (c, dim = 1, mask = l2).ne.3) call abort + if (minval (c, dim = 1, mask = l2).ne.pinf) call abort + c(2) = 1.0 + if (minloc (c, dim = 1, mask = l).ne.2) call abort + if (minval (c, dim = 1, mask = l).ne.1) call abort + if (minloc (c, dim = 1, mask = l2).ne.2) call abort + if (minval (c, dim = 1, mask = l2).ne.1) call abort + c(2) = minf + if (minloc (c, dim = 1, mask = l).ne.2) call abort + if (minval (c, dim = 1, mask = l).ne.minf) call abort + if (minloc (c, dim = 1, mask = l2).ne.2) call abort + if (minval (c, dim = 1, mask = l2).ne.minf) call abort + deallocate (c) + allocate (c(-2:-3)) + if (minloc (c, dim = 1).ne.0) call abort + if (minval (c, dim = 1).ne.huge(pinf)) call abort +end diff --git a/gcc/testsuite/gfortran.dg/minlocval_2.f90 b/gcc/testsuite/gfortran.dg/minlocval_2.f90 new file mode 100644 index 00000000000..8e04dc6ded8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minlocval_2.f90 @@ -0,0 +1,122 @@ +! { dg-do run } + integer :: a(3), h + integer, allocatable :: c(:) + logical :: l + logical :: l2(3) + + h = -huge(h) + h = h - 1 + allocate (c(3)) + a(:) = 5 + if (minloc (a, dim = 1).ne.1) call abort + if (minval (a, dim = 1).ne.5) call abort + a(2) = h + if (minloc (a, dim = 1).ne.2) call abort + if (minval (a, dim = 1).ne.h) call abort + a(:) = huge(h) + if (minloc (a, dim = 1).ne.1) call abort + if (minval (a, dim = 1).ne.huge(h)) call abort + a(3) = huge(h) - 1 + if (minloc (a, dim = 1).ne.3) call abort + if (minval (a, dim = 1).ne.huge(h)-1) call abort + c(:) = 5 + if (minloc (c, dim = 1).ne.1) call abort + if (minval (c, dim = 1).ne.5) call abort + c(2) = h + if (minloc (c, dim = 1).ne.2) call abort + if (minval (c, dim = 1).ne.h) call abort + c(:) = huge(h) + if (minloc (c, dim = 1).ne.1) call abort + if (minval (c, dim = 1).ne.huge(h)) call abort + c(3) = huge(h) - 1 + if (minloc (c, dim = 1).ne.3) call abort + if (minval (c, dim = 1).ne.huge(h)-1) call abort + l = .false. + l2(:) = .false. + a(:) = 5 + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)) call abort + a(2) = h + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)) call abort + a(:) = huge(h) + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)) call abort + a(3) = huge(h) - 1 + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (a, dim = 1, mask = l2).ne.0) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)) call abort + c(:) = 5 + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)) call abort + c(2) = h + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)) call abort + c(:) = huge(h) + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)) call abort + c(3) = huge(h) - 1 + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (c, dim = 1, mask = l2).ne.0) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)) call abort + l = .true. + l2(:) = .true. + a(:) = 5 + if (minloc (a, dim = 1, mask = l).ne.1) call abort + if (minval (a, dim = 1, mask = l).ne.5) call abort + if (minloc (a, dim = 1, mask = l2).ne.1) call abort + if (minval (a, dim = 1, mask = l2).ne.5) call abort + a(2) = h + if (minloc (a, dim = 1, mask = l).ne.2) call abort + if (minval (a, dim = 1, mask = l).ne.h) call abort + if (minloc (a, dim = 1, mask = l2).ne.2) call abort + if (minval (a, dim = 1, mask = l2).ne.h) call abort + a(:) = huge(h) + if (minloc (a, dim = 1, mask = l).ne.1) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (a, dim = 1, mask = l2).ne.1) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)) call abort + a(3) = huge(h) - 1 + if (minloc (a, dim = 1, mask = l).ne.3) call abort + if (minval (a, dim = 1, mask = l).ne.huge(h)-1) call abort + if (minloc (a, dim = 1, mask = l2).ne.3) call abort + if (minval (a, dim = 1, mask = l2).ne.huge(h)-1) call abort + c(:) = 5 + if (minloc (c, dim = 1, mask = l).ne.1) call abort + if (minval (c, dim = 1, mask = l).ne.5) call abort + if (minloc (c, dim = 1, mask = l2).ne.1) call abort + if (minval (c, dim = 1, mask = l2).ne.5) call abort + c(2) = h + if (minloc (c, dim = 1, mask = l).ne.2) call abort + if (minval (c, dim = 1, mask = l).ne.h) call abort + if (minloc (c, dim = 1, mask = l2).ne.2) call abort + if (minval (c, dim = 1, mask = l2).ne.h) call abort + c(:) = huge(h) + if (minloc (c, dim = 1, mask = l).ne.1) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)) call abort + if (minloc (c, dim = 1, mask = l2).ne.1) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)) call abort + c(3) = huge(h) - 1 + if (minloc (c, dim = 1, mask = l).ne.3) call abort + if (minval (c, dim = 1, mask = l).ne.huge(h)-1) call abort + if (minloc (c, dim = 1, mask = l2).ne.3) call abort + if (minval (c, dim = 1, mask = l2).ne.huge(h)-1) call abort + deallocate (c) + allocate (c(-2:-3)) + if (minloc (c, dim = 1).ne.0) call abort + if (minval (c, dim = 1).ne.huge(h)) call abort +end diff --git a/gcc/testsuite/gfortran.dg/minlocval_3.f90 b/gcc/testsuite/gfortran.dg/minlocval_3.f90 new file mode 100644 index 00000000000..6a4fc558a35 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minlocval_3.f90 @@ -0,0 +1,284 @@ + real :: a(30), b(10, 10), m + real, allocatable :: c(:), d(:, :) + integer :: e(30), f(10, 10), n + integer, allocatable :: g(:), h(:,:) + logical :: l(30), l2(10, 10) + allocate (c (30)) + allocate (d (10, 10)) + allocate (g (30)) + allocate (h (10, 10)) + a = 7.0 + b = 7.0 + c = 7.0 + d = 7.0 + e = 7 + f = 7 + g = 7 + h = 7 + m = huge(m) + n = huge(n) + a(7) = 6.0 + b(5, 5) = 6.0 + b(5, 6) = 5.0 + b(6, 7) = 4.0 + c(7) = 6.0 + d(5, 5) = 6.0 + d(5, 6) = 5.0 + d(6, 7) = 4.0 + e(7) = 6 + f(5, 5) = 6 + f(5, 6) = 5 + f(6, 7) = 4 + g(7) = 6 + h(5, 5) = 6 + h(5, 6) = 5 + h(6, 7) = 4 + if (minloc (a, dim = 1).ne.7) call abort + if (minval (a, dim = 1).ne.6.0) call abort + if (minloc (a(::2), dim = 1).ne.4) call abort + if (minval (a(::2), dim = 1).ne.6.0) call abort + if (any (minloc (a).ne.(/ 7 /))) call abort + if (minval (a).ne.6.0) call abort + if (any (minloc (a(::2)).ne.(/ 4 /))) call abort + if (minval (a(::2)).ne.6.0) call abort + if (any (minloc (b, dim = 1).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (b, dim = 1).ne.(/ 7.0, 7.0, 7.0, 7.0, 6.0, 5.0, 4.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (b(::2,::2), dim = 1).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (b(::2,::2), dim = 1).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (b, dim = 2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (b, dim = 2).ne.(/ 7.0, 7.0, 7.0, 7.0, 5.0, 4.0, 7.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (b(::2,::2), dim = 2).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (b(::2,::2), dim = 2).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (b).ne.(/ 6, 7 /))) call abort + if (minval (b).ne.4.0) call abort + if (any (minloc (b(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (b(::2,::2)).ne.6.0) call abort + if (minloc (c, dim = 1).ne.7) call abort + if (minval (c, dim = 1).ne.6.0) call abort + if (minloc (c(::2), dim = 1).ne.4) call abort + if (minval (c(::2), dim = 1).ne.6.0) call abort + if (any (minloc (c).ne.(/ 7 /))) call abort + if (minval (c).ne.6.0) call abort + if (any (minloc (c(::2)).ne.(/ 4 /))) call abort + if (minval (c(::2)).ne.6.0) call abort + if (any (minloc (d, dim = 1).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (d, dim = 1).ne.(/ 7.0, 7.0, 7.0, 7.0, 6.0, 5.0, 4.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (d(::2,::2), dim = 1).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (d(::2,::2), dim = 1).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (d, dim = 2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (d, dim = 2).ne.(/ 7.0, 7.0, 7.0, 7.0, 5.0, 4.0, 7.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (d(::2,::2), dim = 2).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (d(::2,::2), dim = 2).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (d).ne.(/ 6, 7 /))) call abort + if (minval (d).ne.4.0) call abort + if (any (minloc (d(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (d(::2,::2)).ne.6.0) call abort + if (minloc (e, dim = 1).ne.7) call abort + if (minval (e, dim = 1).ne.6) call abort + if (minloc (e(::2), dim = 1).ne.4) call abort + if (minval (e(::2), dim = 1).ne.6) call abort + if (any (minloc (e).ne.(/ 7 /))) call abort + if (minval (e).ne.6) call abort + if (any (minloc (e(::2)).ne.(/ 4 /))) call abort + if (minval (e(::2)).ne.6) call abort + if (any (minloc (f, dim = 1).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (f, dim = 1).ne.(/ 7, 7, 7, 7, 6, 5, 4, 7, 7, 7 /))) call abort + if (any (minloc (f(::2,::2), dim = 1).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (f(::2,::2), dim = 1).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (f, dim = 2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (f, dim = 2).ne.(/ 7, 7, 7, 7, 5, 4, 7, 7, 7, 7 /))) call abort + if (any (minloc (f(::2,::2), dim = 2).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (f(::2,::2), dim = 2).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (f).ne.(/ 6, 7 /))) call abort + if (minval (f).ne.4) call abort + if (any (minloc (f(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (f(::2,::2)).ne.6) call abort + if (minloc (g, dim = 1).ne.7) call abort + if (minval (g, dim = 1).ne.6) call abort + if (minloc (g(::2), dim = 1).ne.4) call abort + if (minval (g(::2), dim = 1).ne.6) call abort + if (any (minloc (g).ne.(/ 7 /))) call abort + if (minval (g).ne.6) call abort + if (any (minloc (g(::2)).ne.(/ 4 /))) call abort + if (minval (g(::2)).ne.6) call abort + if (any (minloc (h, dim = 1).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (h, dim = 1).ne.(/ 7, 7, 7, 7, 6, 5, 4, 7, 7, 7 /))) call abort + if (any (minloc (h(::2,::2), dim = 1).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (h(::2,::2), dim = 1).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (h, dim = 2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (h, dim = 2).ne.(/ 7, 7, 7, 7, 5, 4, 7, 7, 7, 7 /))) call abort + if (any (minloc (h(::2,::2), dim = 2).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (h(::2,::2), dim = 2).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (h).ne.(/ 6, 7 /))) call abort + if (minval (h).ne.4) call abort + if (any (minloc (h(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (h(::2,::2)).ne.6) call abort + l = .true. + l2 = .true. + if (minloc (a, dim = 1, mask = l).ne.7) call abort + if (minval (a, dim = 1, mask = l).ne.6.0) call abort + if (minloc (a(::2), dim = 1, mask = l(::2)).ne.4) call abort + if (minval (a(::2), dim = 1, mask = l(::2)).ne.6.0) call abort + if (any (minloc (a, mask = l).ne.(/ 7 /))) call abort + if (minval (a, mask = l).ne.6.0) call abort + if (any (minloc (a(::2), mask = l(::2)).ne.(/ 4 /))) call abort + if (minval (a(::2), mask = l(::2)).ne.6.0) call abort + if (any (minloc (b, dim = 1, mask = l2).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (b, dim = 1, mask = l2).ne.(/ 7.0, 7.0, 7.0, 7.0, 6.0, 5.0, 4.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (b(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (b(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (b, dim = 2, mask = l2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (b, dim = 2, mask = l2).ne.(/ 7.0, 7.0, 7.0, 7.0, 5.0, 4.0, 7.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (b(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (b(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (b, mask = l2).ne.(/ 6, 7 /))) call abort + if (minval (b, mask = l2).ne.4.0) call abort + if (any (minloc (b(::2,::2), mask = l2(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (b(::2,::2), mask = l2(::2,::2)).ne.6.0) call abort + if (minloc (c, dim = 1, mask = l).ne.7) call abort + if (minval (c, dim = 1, mask = l).ne.6.0) call abort + if (minloc (c(::2), dim = 1, mask = l(::2)).ne.4) call abort + if (minval (c(::2), dim = 1, mask = l(::2)).ne.6.0) call abort + if (any (minloc (c, mask = l).ne.(/ 7 /))) call abort + if (minval (c, mask = l).ne.6.0) call abort + if (any (minloc (c(::2), mask = l(::2)).ne.(/ 4 /))) call abort + if (minval (c(::2), mask = l(::2)).ne.6.0) call abort + if (any (minloc (d, dim = 1, mask = l2).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (d, dim = 1, mask = l2).ne.(/ 7.0, 7.0, 7.0, 7.0, 6.0, 5.0, 4.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (d(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (d(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (d, dim = 2, mask = l2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (d, dim = 2, mask = l2).ne.(/ 7.0, 7.0, 7.0, 7.0, 5.0, 4.0, 7.0, 7.0, 7.0, 7.0 /))) call abort + if (any (minloc (d(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (d(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 7.0, 7.0, 6.0, 7.0, 7.0 /))) call abort + if (any (minloc (d, mask = l2).ne.(/ 6, 7 /))) call abort + if (minval (d, mask = l2).ne.4.0) call abort + if (any (minloc (d(::2,::2), mask = l2(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (d(::2,::2), mask = l2(::2,::2)).ne.6.0) call abort + if (minloc (e, dim = 1, mask = l).ne.7) call abort + if (minval (e, dim = 1, mask = l).ne.6) call abort + if (minloc (e(::2), dim = 1, mask = l(::2)).ne.4) call abort + if (minval (e(::2), dim = 1, mask = l(::2)).ne.6) call abort + if (any (minloc (e, mask = l).ne.(/ 7 /))) call abort + if (minval (e, mask = l).ne.6) call abort + if (any (minloc (e(::2), mask = l(::2)).ne.(/ 4 /))) call abort + if (minval (e(::2), mask = l(::2)).ne.6) call abort + if (any (minloc (f, dim = 1, mask = l2).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (f, dim = 1, mask = l2).ne.(/ 7, 7, 7, 7, 6, 5, 4, 7, 7, 7 /))) call abort + if (any (minloc (f(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (f(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (f, dim = 2, mask = l2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (f, dim = 2, mask = l2).ne.(/ 7, 7, 7, 7, 5, 4, 7, 7, 7, 7 /))) call abort + if (any (minloc (f(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (f(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (f, mask = l2).ne.(/ 6, 7 /))) call abort + if (minval (f, mask = l2).ne.4) call abort + if (any (minloc (f(::2,::2), mask = l2(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (f(::2,::2), mask = l2(::2,::2)).ne.6) call abort + if (minloc (g, dim = 1, mask = l).ne.7) call abort + if (minval (g, dim = 1, mask = l).ne.6) call abort + if (minloc (g(::2), dim = 1, mask = l(::2)).ne.4) call abort + if (minval (g(::2), dim = 1, mask = l(::2)).ne.6) call abort + if (any (minloc (g, mask = l).ne.(/ 7 /))) call abort + if (minval (g, mask = l).ne.6) call abort + if (any (minloc (g(::2), mask = l(::2)).ne.(/ 4 /))) call abort + if (minval (g(::2), mask = l(::2)).ne.6) call abort + if (any (minloc (h, dim = 1, mask = l2).ne.(/ 1, 1, 1, 1, 5, 5, 6, 1, 1, 1 /))) call abort + if (any (minval (h, dim = 1, mask = l2).ne.(/ 7, 7, 7, 7, 6, 5, 4, 7, 7, 7 /))) call abort + if (any (minloc (h(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (h(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (h, dim = 2, mask = l2).ne.(/ 1, 1, 1, 1, 6, 7, 1, 1, 1, 1 /))) call abort + if (any (minval (h, dim = 2, mask = l2).ne.(/ 7, 7, 7, 7, 5, 4, 7, 7, 7, 7 /))) call abort + if (any (minloc (h(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 1, 1, 3, 1, 1 /))) call abort + if (any (minval (h(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 7, 7, 6, 7, 7 /))) call abort + if (any (minloc (h, mask = l2).ne.(/ 6, 7 /))) call abort + if (minval (h, mask = l2).ne.4) call abort + if (any (minloc (h(::2,::2), mask = l2(::2,::2)).ne.(/ 3, 3 /))) call abort + if (minval (h(::2,::2), mask = l2(::2,::2)).ne.6) call abort + l = .false. + l2 = .false. + if (minloc (a, dim = 1, mask = l).ne.0) call abort + if (minval (a, dim = 1, mask = l).ne.m) call abort + if (minloc (a(::2), dim = 1, mask = l(::2)).ne.0) call abort + if (minval (a(::2), dim = 1, mask = l(::2)).ne.m) call abort + if (any (minloc (a, mask = l).ne.(/ 0 /))) call abort + if (minval (a, mask = l).ne.m) call abort + if (any (minloc (a(::2), mask = l(::2)).ne.(/ 0 /))) call abort + if (minval (a(::2), mask = l(::2)).ne.m) call abort + if (any (minloc (b, dim = 1, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (b, dim = 1, mask = l2).ne.(/ m, m, m, m, m, m, m, m, m, m /))) call abort + if (any (minloc (b(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (b(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ m, m, m, m, m /))) call abort + if (any (minloc (b, dim = 2, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (b, dim = 2, mask = l2).ne.(/ m, m, m, m, m, m, m, m, m, m /))) call abort + if (any (minloc (b(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (b(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ m, m, m, m, m /))) call abort + if (any (minloc (b, mask = l2).ne.(/ 0, 0 /))) call abort + if (minval (b, mask = l2).ne.m) call abort + if (any (minloc (b(::2,::2), mask = l2(::2,::2)).ne.(/ 0, 0 /))) call abort + if (minval (b(::2,::2), mask = l2(::2,::2)).ne.m) call abort + if (minloc (c, dim = 1, mask = l).ne.0) call abort + if (minval (c, dim = 1, mask = l).ne.m) call abort + if (minloc (c(::2), dim = 1, mask = l(::2)).ne.0) call abort + if (minval (c(::2), dim = 1, mask = l(::2)).ne.m) call abort + if (any (minloc (c, mask = l).ne.(/ 0 /))) call abort + if (minval (c, mask = l).ne.m) call abort + if (any (minloc (c(::2), mask = l(::2)).ne.(/ 0 /))) call abort + if (minval (c(::2), mask = l(::2)).ne.m) call abort + if (any (minloc (d, dim = 1, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (d, dim = 1, mask = l2).ne.(/ m, m, m, m, m, m, m, m, m, m /))) call abort + if (any (minloc (d(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (d(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ m, m, m, m, m /))) call abort + if (any (minloc (d, dim = 2, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (d, dim = 2, mask = l2).ne.(/ m, m, m, m, m, m, m, m, m, m /))) call abort + if (any (minloc (d(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (d(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ m, m, m, m, m /))) call abort + if (any (minloc (d, mask = l2).ne.(/ 0, 0 /))) call abort + if (minval (d, mask = l2).ne.m) call abort + if (any (minloc (d(::2,::2), mask = l2(::2,::2)).ne.(/ 0, 0 /))) call abort + if (minval (d(::2,::2), mask = l2(::2,::2)).ne.m) call abort + if (minloc (e, dim = 1, mask = l).ne.0) call abort + if (minval (e, dim = 1, mask = l).ne.n) call abort + if (minloc (e(::2), dim = 1, mask = l(::2)).ne.0) call abort + if (minval (e(::2), dim = 1, mask = l(::2)).ne.n) call abort + if (any (minloc (e, mask = l).ne.(/ 0 /))) call abort + if (minval (e, mask = l).ne.n) call abort + if (any (minloc (e(::2), mask = l(::2)).ne.(/ 0 /))) call abort + if (minval (e(::2), mask = l(::2)).ne.n) call abort + if (any (minloc (f, dim = 1, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (f, dim = 1, mask = l2).ne.(/ n, n, n, n, n, n, n, n, n, n /))) call abort + if (any (minloc (f(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (f(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ n, n, n, n, n /))) call abort + if (any (minloc (f, dim = 2, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (f, dim = 2, mask = l2).ne.(/ n, n, n, n, n, n, n, n, n, n /))) call abort + if (any (minloc (f(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (f(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ n, n, n, n, n /))) call abort + if (any (minloc (f, mask = l2).ne.(/ 0, 0 /))) call abort + if (minval (f, mask = l2).ne.n) call abort + if (any (minloc (f(::2,::2), mask = l2(::2,::2)).ne.(/ 0, 0 /))) call abort + if (minval (f(::2,::2), mask = l2(::2,::2)).ne.n) call abort + if (minloc (g, dim = 1, mask = l).ne.0) call abort + if (minval (g, dim = 1, mask = l).ne.n) call abort + if (minloc (g(::2), dim = 1, mask = l(::2)).ne.0) call abort + if (minval (g(::2), dim = 1, mask = l(::2)).ne.n) call abort + if (any (minloc (g, mask = l).ne.(/ 0 /))) call abort + if (minval (g, mask = l).ne.n) call abort + if (any (minloc (g(::2), mask = l(::2)).ne.(/ 0 /))) call abort + if (minval (g(::2), mask = l(::2)).ne.n) call abort + if (any (minloc (h, dim = 1, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (h, dim = 1, mask = l2).ne.(/ n, n, n, n, n, n, n, n, n, n /))) call abort + if (any (minloc (h(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (h(::2,::2), dim = 1, mask = l2(::2,::2)).ne.(/ n, n, n, n, n /))) call abort + if (any (minloc (h, dim = 2, mask = l2).ne.(/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /))) call abort + if (any (minval (h, dim = 2, mask = l2).ne.(/ n, n, n, n, n, n, n, n, n, n /))) call abort + if (any (minloc (h(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ 0, 0, 0, 0, 0 /))) call abort + if (any (minval (h(::2,::2), dim = 2, mask = l2(::2,::2)).ne.(/ n, n, n, n, n /))) call abort + if (any (minloc (h, mask = l2).ne.(/ 0, 0 /))) call abort + if (minval (h, mask = l2).ne.n) call abort + if (any (minloc (h(::2,::2), mask = l2(::2,::2)).ne.(/ 0, 0 /))) call abort + if (minval (h(::2,::2), mask = l2(::2,::2)).ne.n) call abort + a = 7.0 + b = 7.0 + c = 7.0 + d = 7.0 +end diff --git a/gcc/testsuite/gfortran.dg/minlocval_4.f90 b/gcc/testsuite/gfortran.dg/minlocval_4.f90 new file mode 100644 index 00000000000..1e72ba8e2a9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minlocval_4.f90 @@ -0,0 +1,118 @@ +! { dg-do run } + real :: a(3,3), b(3), nan, minf, pinf, h + logical :: l, l2 + logical :: l3(3,3), l4(3,3), l5(3,3) + + nan = 0.0 + minf = 0.0 + pinf = 0.0 + nan = 0.0/nan + minf = -1.0/minf + pinf = 1.0/pinf + h = huge(h) + l = .false. + l2 = .true. + l3 = .false. + l4 = .true. + l5 = .true. + l5(1,1) = .false. + l5(1,2) = .false. + l5(2,3) = .false. + a = reshape ((/ nan, nan, nan, pinf, pinf, pinf, pinf, minf, pinf /), (/ 3, 3 /)) + if (minval (a).ne.minf) call abort + if (any (minloc (a).ne.(/ 2, 3 /))) call abort + b = minval (a, dim = 1) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, pinf, minf /))) call abort + if (any (minloc (a, dim = 1).ne.(/ 1, 1, 2 /))) call abort + b = minval (a, dim = 2) + if (any (b.ne.(/ pinf, minf, pinf /))) call abort + if (any (minloc (a, dim = 2).ne.(/ 2, 3, 2 /))) call abort + if (minval (a, mask = l).ne.h) call abort + if (any (minloc (a, mask = l).ne.(/ 0, 0 /))) call abort + b = minval (a, dim = 1, mask = l) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (minloc (a, dim = 1, mask = l).ne.(/ 0, 0, 0 /))) call abort + b = minval (a, dim = 2, mask = l) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (minloc (a, dim = 2, mask = l).ne.(/ 0, 0, 0 /))) call abort + if (minval (a, mask = l3).ne.h) call abort + if (any (minloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + b = minval (a, dim = 1, mask = l3) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (minloc (a, dim = 1, mask = l3).ne.(/ 0, 0, 0 /))) call abort + b = minval (a, dim = 2, mask = l3) + if (any (b.ne.(/ h, h, h /))) call abort + if (any (minloc (a, dim = 2, mask = l3).ne.(/ 0, 0, 0 /))) call abort + if (minval (a, mask = l2).ne.minf) call abort + if (minval (a, mask = l4).ne.minf) call abort + if (any (minloc (a, mask = l2).ne.(/ 2, 3 /))) call abort + if (any (minloc (a, mask = l4).ne.(/ 2, 3 /))) call abort + b = minval (a, dim = 1, mask = l2) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, pinf, minf /))) call abort + if (any (minloc (a, dim = 1, mask = l2).ne.(/ 1, 1, 2 /))) call abort + b = minval (a, dim = 2, mask = l2) + if (any (b.ne.(/ pinf, minf, pinf /))) call abort + if (any (minloc (a, dim = 2, mask = l2).ne.(/ 2, 3, 2 /))) call abort + b = minval (a, dim = 1, mask = l4) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, pinf, minf /))) call abort + if (any (minloc (a, dim = 1, mask = l2).ne.(/ 1, 1, 2 /))) call abort + b = minval (a, dim = 2, mask = l4) + if (any (b.ne.(/ pinf, minf, pinf /))) call abort + if (any (minloc (a, dim = 2, mask = l2).ne.(/ 2, 3, 2 /))) call abort + if (minval (a, mask = l5).ne.pinf) call abort + if (any (minloc (a, mask = l5).ne.(/ 2, 2 /))) call abort + b = minval (a, dim = 1, mask = l5) + if (.not.isnan(b(1))) call abort + b(1) = 0.0 + if (any (b.ne.(/ 0.0, pinf, pinf /))) call abort + if (any (minloc (a, dim = 1, mask = l5).ne.(/ 2, 2, 1 /))) call abort + b = minval (a, dim = 2, mask = l5) + if (any (b.ne.(/ pinf, pinf, pinf /))) call abort + if (any (minloc (a, dim = 2, mask = l5).ne.(/ 3, 2, 2 /))) call abort + a = nan + if (.not.isnan(minval (a))) call abort + if (minval (a, mask = l).ne.h) call abort + if (.not.isnan(minval (a, mask = l2))) call abort + if (minval (a, mask = l3).ne.h) call abort + if (.not.isnan(minval (a, mask = l4))) call abort + if (.not.isnan(minval (a, mask = l5))) call abort + if (any (minloc (a).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l2).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l4).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l5).ne.(/ 2, 1 /))) call abort + a = pinf + if (minval (a).ne.pinf) call abort + if (minval (a, mask = l).ne.h) call abort + if (minval (a, mask = l2).ne.pinf) call abort + if (minval (a, mask = l3).ne.h) call abort + if (minval (a, mask = l4).ne.pinf) call abort + if (minval (a, mask = l5).ne.pinf) call abort + if (any (minloc (a).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l2).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l4).ne.(/ 1, 1 /))) call abort + if (any (minloc (a, mask = l5).ne.(/ 2, 1 /))) call abort + a = nan + a(1,3) = pinf + if (minval (a).ne.pinf) call abort + if (minval (a, mask = l).ne.h) call abort + if (minval (a, mask = l2).ne.pinf) call abort + if (minval (a, mask = l3).ne.h) call abort + if (minval (a, mask = l4).ne.pinf) call abort + if (minval (a, mask = l5).ne.pinf) call abort + if (any (minloc (a).ne.(/ 1, 3 /))) call abort + if (any (minloc (a, mask = l).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l2).ne.(/ 1, 3 /))) call abort + if (any (minloc (a, mask = l3).ne.(/ 0, 0 /))) call abort + if (any (minloc (a, mask = l4).ne.(/ 1, 3 /))) call abort + if (any (minloc (a, mask = l5).ne.(/ 1, 3 /))) call abort +end diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 5bb68ce291a..12db11758d5 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,177 @@ +2009-07-24 Jakub Jelinek <jakub@redhat.com> + + PR fortran/40643 + PR fortran/31067 + * libgfortran.h (GFC_REAL_4_INFINITY, GFC_REAL_8_INFINITY, + GFC_REAL_10_INFINITY, GFC_REAL_16_INFINITY, GFC_REAL_4_QUIET_NAN, + GFC_REAL_8_QUIET_NAN, GFC_REAL_10_QUIET_NAN, GFC_REAL_16_QUIET_NAN): + Define. + * m4/iparm.m4 (atype_inf, atype_nan): Define. + * m4/ifunction.m4: Formatting. + * m4/iforeach.m4: Likewise. + (START_FOREACH_FUNCTION): Initialize dest to all 1s, not all 0s. + (START_FOREACH_BLOCK, FINISH_FOREACH_FUNCTION, + FINISH_MASKED_FOREACH_FUNCTION): Run foreach block inside a loop + until count[0] == extent[0]. + * m4/minval.m4: Formatting. Handle NaNs and infinities. Optimize. + * m4/maxval.m4: Likewise. + * m4/minloc0.m4: Likewise. + * m4/maxloc0.m4: Likewise. + * m4/minloc1.m4: Likewise. + * m4/maxloc1.m4: Likewise. + * generated/maxloc0_16_i16.c: Regenerated. + * generated/maxloc0_16_i1.c: Likewise. + * generated/maxloc0_16_i2.c: Likewise. + * generated/maxloc0_16_i4.c: Likewise. + * generated/maxloc0_16_i8.c: Likewise. + * generated/maxloc0_16_r10.c: Likewise. + * generated/maxloc0_16_r16.c: Likewise. + * generated/maxloc0_16_r4.c: Likewise. + * generated/maxloc0_16_r8.c: Likewise. + * generated/maxloc0_4_i16.c: Likewise. + * generated/maxloc0_4_i1.c: Likewise. + * generated/maxloc0_4_i2.c: Likewise. + * generated/maxloc0_4_i4.c: Likewise. + * generated/maxloc0_4_i8.c: Likewise. + * generated/maxloc0_4_r10.c: Likewise. + * generated/maxloc0_4_r16.c: Likewise. + * generated/maxloc0_4_r4.c: Likewise. + * generated/maxloc0_4_r8.c: Likewise. + * generated/maxloc0_8_i16.c: Likewise. + * generated/maxloc0_8_i1.c: Likewise. + * generated/maxloc0_8_i2.c: Likewise. + * generated/maxloc0_8_i4.c: Likewise. + * generated/maxloc0_8_i8.c: Likewise. + * generated/maxloc0_8_r10.c: Likewise. + * generated/maxloc0_8_r16.c: Likewise. + * generated/maxloc0_8_r4.c: Likewise. + * generated/maxloc0_8_r8.c: Likewise. + * generated/maxloc1_16_i16.c: Likewise. + * generated/maxloc1_16_i1.c: Likewise. + * generated/maxloc1_16_i2.c: Likewise. + * generated/maxloc1_16_i4.c: Likewise. + * generated/maxloc1_16_i8.c: Likewise. + * generated/maxloc1_16_r10.c: Likewise. + * generated/maxloc1_16_r16.c: Likewise. + * generated/maxloc1_16_r4.c: Likewise. + * generated/maxloc1_16_r8.c: Likewise. + * generated/maxloc1_4_i16.c: Likewise. + * generated/maxloc1_4_i1.c: Likewise. + * generated/maxloc1_4_i2.c: Likewise. + * generated/maxloc1_4_i4.c: Likewise. + * generated/maxloc1_4_i8.c: Likewise. + * generated/maxloc1_4_r10.c: Likewise. + * generated/maxloc1_4_r16.c: Likewise. + * generated/maxloc1_4_r4.c: Likewise. + * generated/maxloc1_4_r8.c: Likewise. + * generated/maxloc1_8_i16.c: Likewise. + * generated/maxloc1_8_i1.c: Likewise. + * generated/maxloc1_8_i2.c: Likewise. + * generated/maxloc1_8_i4.c: Likewise. + * generated/maxloc1_8_i8.c: Likewise. + * generated/maxloc1_8_r10.c: Likewise. + * generated/maxloc1_8_r16.c: Likewise. + * generated/maxloc1_8_r4.c: Likewise. + * generated/maxloc1_8_r8.c: Likewise. + * generated/maxval_i16.c: Likewise. + * generated/maxval_i1.c: Likewise. + * generated/maxval_i2.c: Likewise. + * generated/maxval_i4.c: Likewise. + * generated/maxval_i8.c: Likewise. + * generated/maxval_r10.c: Likewise. + * generated/maxval_r16.c: Likewise. + * generated/maxval_r4.c: Likewise. + * generated/maxval_r8.c: Likewise. + * generated/minloc0_16_i16.c: Likewise. + * generated/minloc0_16_i1.c: Likewise. + * generated/minloc0_16_i2.c: Likewise. + * generated/minloc0_16_i4.c: Likewise. + * generated/minloc0_16_i8.c: Likewise. + * generated/minloc0_16_r10.c: Likewise. + * generated/minloc0_16_r16.c: Likewise. + * generated/minloc0_16_r4.c: Likewise. + * generated/minloc0_16_r8.c: Likewise. + * generated/minloc0_4_i16.c: Likewise. + * generated/minloc0_4_i1.c: Likewise. + * generated/minloc0_4_i2.c: Likewise. + * generated/minloc0_4_i4.c: Likewise. + * generated/minloc0_4_i8.c: Likewise. + * generated/minloc0_4_r10.c: Likewise. + * generated/minloc0_4_r16.c: Likewise. + * generated/minloc0_4_r4.c: Likewise. + * generated/minloc0_4_r8.c: Likewise. + * generated/minloc0_8_i16.c: Likewise. + * generated/minloc0_8_i1.c: Likewise. + * generated/minloc0_8_i2.c: Likewise. + * generated/minloc0_8_i4.c: Likewise. + * generated/minloc0_8_i8.c: Likewise. + * generated/minloc0_8_r10.c: Likewise. + * generated/minloc0_8_r16.c: Likewise. + * generated/minloc0_8_r4.c: Likewise. + * generated/minloc0_8_r8.c: Likewise. + * generated/minloc1_16_i16.c: Likewise. + * generated/minloc1_16_i1.c: Likewise. + * generated/minloc1_16_i2.c: Likewise. + * generated/minloc1_16_i4.c: Likewise. + * generated/minloc1_16_i8.c: Likewise. + * generated/minloc1_16_r10.c: Likewise. + * generated/minloc1_16_r16.c: Likewise. + * generated/minloc1_16_r4.c: Likewise. + * generated/minloc1_16_r8.c: Likewise. + * generated/minloc1_4_i16.c: Likewise. + * generated/minloc1_4_i1.c: Likewise. + * generated/minloc1_4_i2.c: Likewise. + * generated/minloc1_4_i4.c: Likewise. + * generated/minloc1_4_i8.c: Likewise. + * generated/minloc1_4_r10.c: Likewise. + * generated/minloc1_4_r16.c: Likewise. + * generated/minloc1_4_r4.c: Likewise. + * generated/minloc1_4_r8.c: Likewise. + * generated/minloc1_8_i16.c: Likewise. + * generated/minloc1_8_i1.c: Likewise. + * generated/minloc1_8_i2.c: Likewise. + * generated/minloc1_8_i4.c: Likewise. + * generated/minloc1_8_i8.c: Likewise. + * generated/minloc1_8_r10.c: Likewise. + * generated/minloc1_8_r16.c: Likewise. + * generated/minloc1_8_r4.c: Likewise. + * generated/minloc1_8_r8.c: Likewise. + * generated/minval_i16.c: Likewise. + * generated/minval_i1.c: Likewise. + * generated/minval_i2.c: Likewise. + * generated/minval_i4.c: Likewise. + * generated/minval_i8.c: Likewise. + * generated/minval_r10.c: Likewise. + * generated/minval_r16.c: Likewise. + * generated/minval_r4.c: Likewise. + * generated/minval_r8.c: Likewise. + * generated/product_c10.c: Likewise. + * generated/product_c16.c: Likewise. + * generated/product_c4.c: Likewise. + * generated/product_c8.c: Likewise. + * generated/product_i16.c: Likewise. + * generated/product_i1.c: Likewise. + * generated/product_i2.c: Likewise. + * generated/product_i4.c: Likewise. + * generated/product_i8.c: Likewise. + * generated/product_r10.c: Likewise. + * generated/product_r16.c: Likewise. + * generated/product_r4.c: Likewise. + * generated/product_r8.c: Likewise. + * generated/sum_c10.c: Likewise. + * generated/sum_c16.c: Likewise. + * generated/sum_c4.c: Likewise. + * generated/sum_c8.c: Likewise. + * generated/sum_i16.c: Likewise. + * generated/sum_i1.c: Likewise. + * generated/sum_i2.c: Likewise. + * generated/sum_i4.c: Likewise. + * generated/sum_i8.c: Likewise. + * generated/sum_r10.c: Likewise. + * generated/sum_r16.c: Likewise. + * generated/sum_r4.c: Likewise. + * generated/sum_r8.c: Likewise. + 2009-07-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/32784 diff --git a/libgfortran/generated/maxloc0_16_i1.c b/libgfortran/generated/maxloc0_16_i1.c index c9f58e33ea6..5649018db89 100644 --- a/libgfortran/generated/maxloc0_16_i1.c +++ b/libgfortran/generated/maxloc0_16_i1.c @@ -63,8 +63,8 @@ maxloc0_16_i1 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_i1 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 maxval; - - maxval = (-GFC_INTEGER_1_HUGE-1); + GFC_INTEGER_1 maxval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_i1 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_1 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_1_HUGE-1); - +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_i16.c b/libgfortran/generated/maxloc0_16_i16.c index 8adbc932279..1ff74f6e222 100644 --- a/libgfortran/generated/maxloc0_16_i16.c +++ b/libgfortran/generated/maxloc0_16_i16.c @@ -63,8 +63,8 @@ maxloc0_16_i16 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_i16 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 maxval; - - maxval = (-GFC_INTEGER_16_HUGE-1); + GFC_INTEGER_16 maxval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_i16 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_16 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_16_HUGE-1); - +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_i2.c b/libgfortran/generated/maxloc0_16_i2.c index 16849c27363..8ca75b9f99c 100644 --- a/libgfortran/generated/maxloc0_16_i2.c +++ b/libgfortran/generated/maxloc0_16_i2.c @@ -63,8 +63,8 @@ maxloc0_16_i2 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_i2 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 maxval; - - maxval = (-GFC_INTEGER_2_HUGE-1); + GFC_INTEGER_2 maxval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_i2 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_2 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_2_HUGE-1); - +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_i4.c b/libgfortran/generated/maxloc0_16_i4.c index a6e979ce489..18feabbcde4 100644 --- a/libgfortran/generated/maxloc0_16_i4.c +++ b/libgfortran/generated/maxloc0_16_i4.c @@ -63,8 +63,8 @@ maxloc0_16_i4 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_i4 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 maxval; - - maxval = (-GFC_INTEGER_4_HUGE-1); + GFC_INTEGER_4 maxval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_i4 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_4 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_4_HUGE-1); - +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_i8.c b/libgfortran/generated/maxloc0_16_i8.c index 8e2d4bc0a35..bc5a3b3ebb7 100644 --- a/libgfortran/generated/maxloc0_16_i8.c +++ b/libgfortran/generated/maxloc0_16_i8.c @@ -63,8 +63,8 @@ maxloc0_16_i8 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_i8 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 maxval; - - maxval = (-GFC_INTEGER_8_HUGE-1); + GFC_INTEGER_8 maxval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_i8 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_8 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_8_HUGE-1); - +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_r10.c b/libgfortran/generated/maxloc0_16_r10.c index d76e947aa0d..ee0052f9328 100644 --- a/libgfortran/generated/maxloc0_16_r10.c +++ b/libgfortran/generated/maxloc0_16_r10.c @@ -63,8 +63,8 @@ maxloc0_16_r10 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_r10 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 maxval; - - maxval = -GFC_REAL_10_HUGE; + GFC_REAL_10 maxval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_r10 (gfc_array_i16 * const restrict retarray, { GFC_REAL_10 maxval; + int fast = 0; - maxval = -GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_r16.c b/libgfortran/generated/maxloc0_16_r16.c index 2e6dcf1dcfa..3c28d196855 100644 --- a/libgfortran/generated/maxloc0_16_r16.c +++ b/libgfortran/generated/maxloc0_16_r16.c @@ -63,8 +63,8 @@ maxloc0_16_r16 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_r16 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 maxval; - - maxval = -GFC_REAL_16_HUGE; + GFC_REAL_16 maxval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_r16 (gfc_array_i16 * const restrict retarray, { GFC_REAL_16 maxval; + int fast = 0; - maxval = -GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_r4.c b/libgfortran/generated/maxloc0_16_r4.c index 5d1fe355faf..616ec7acd97 100644 --- a/libgfortran/generated/maxloc0_16_r4.c +++ b/libgfortran/generated/maxloc0_16_r4.c @@ -63,8 +63,8 @@ maxloc0_16_r4 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_r4 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 maxval; - - maxval = -GFC_REAL_4_HUGE; + GFC_REAL_4 maxval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_r4 (gfc_array_i16 * const restrict retarray, { GFC_REAL_4 maxval; + int fast = 0; - maxval = -GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_16_r8.c b/libgfortran/generated/maxloc0_16_r8.c index dc489f31116..8bb5f0d8f8a 100644 --- a/libgfortran/generated/maxloc0_16_r8.c +++ b/libgfortran/generated/maxloc0_16_r8.c @@ -63,8 +63,8 @@ maxloc0_16_r8 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_16_r8 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 maxval; - - maxval = -GFC_REAL_8_HUGE; + GFC_REAL_8 maxval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_16_r8 (gfc_array_i16 * const restrict retarray, { GFC_REAL_8 maxval; + int fast = 0; - maxval = -GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_i1.c b/libgfortran/generated/maxloc0_4_i1.c index 7cdd813391e..5fb626b59e7 100644 --- a/libgfortran/generated/maxloc0_4_i1.c +++ b/libgfortran/generated/maxloc0_4_i1.c @@ -63,8 +63,8 @@ maxloc0_4_i1 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_i1 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 maxval; - - maxval = (-GFC_INTEGER_1_HUGE-1); + GFC_INTEGER_1 maxval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_i1 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_1 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_1_HUGE-1); - +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_i16.c b/libgfortran/generated/maxloc0_4_i16.c index b2bc05307eb..e4d252d4ec3 100644 --- a/libgfortran/generated/maxloc0_4_i16.c +++ b/libgfortran/generated/maxloc0_4_i16.c @@ -63,8 +63,8 @@ maxloc0_4_i16 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_i16 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 maxval; - - maxval = (-GFC_INTEGER_16_HUGE-1); + GFC_INTEGER_16 maxval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_i16 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_16 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_16_HUGE-1); - +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_i2.c b/libgfortran/generated/maxloc0_4_i2.c index fb3b40bd791..a3866e4867f 100644 --- a/libgfortran/generated/maxloc0_4_i2.c +++ b/libgfortran/generated/maxloc0_4_i2.c @@ -63,8 +63,8 @@ maxloc0_4_i2 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_i2 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 maxval; - - maxval = (-GFC_INTEGER_2_HUGE-1); + GFC_INTEGER_2 maxval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_i2 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_2 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_2_HUGE-1); - +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_i4.c b/libgfortran/generated/maxloc0_4_i4.c index 2a84c7f4897..0a4a5bda97f 100644 --- a/libgfortran/generated/maxloc0_4_i4.c +++ b/libgfortran/generated/maxloc0_4_i4.c @@ -63,8 +63,8 @@ maxloc0_4_i4 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_i4 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 maxval; - - maxval = (-GFC_INTEGER_4_HUGE-1); + GFC_INTEGER_4 maxval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_i4 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_4 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_4_HUGE-1); - +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_i8.c b/libgfortran/generated/maxloc0_4_i8.c index 2e1fa6daef8..435123bdc61 100644 --- a/libgfortran/generated/maxloc0_4_i8.c +++ b/libgfortran/generated/maxloc0_4_i8.c @@ -63,8 +63,8 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 maxval; - - maxval = (-GFC_INTEGER_8_HUGE-1); + GFC_INTEGER_8 maxval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_8 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_8_HUGE-1); - +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_r10.c b/libgfortran/generated/maxloc0_4_r10.c index 934337a6ac0..4b99bbecf22 100644 --- a/libgfortran/generated/maxloc0_4_r10.c +++ b/libgfortran/generated/maxloc0_4_r10.c @@ -63,8 +63,8 @@ maxloc0_4_r10 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_r10 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 maxval; - - maxval = -GFC_REAL_10_HUGE; + GFC_REAL_10 maxval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_r10 (gfc_array_i4 * const restrict retarray, { GFC_REAL_10 maxval; + int fast = 0; - maxval = -GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_r16.c b/libgfortran/generated/maxloc0_4_r16.c index c2660258a31..1290355cc8e 100644 --- a/libgfortran/generated/maxloc0_4_r16.c +++ b/libgfortran/generated/maxloc0_4_r16.c @@ -63,8 +63,8 @@ maxloc0_4_r16 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_r16 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 maxval; - - maxval = -GFC_REAL_16_HUGE; + GFC_REAL_16 maxval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_r16 (gfc_array_i4 * const restrict retarray, { GFC_REAL_16 maxval; + int fast = 0; - maxval = -GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_r4.c b/libgfortran/generated/maxloc0_4_r4.c index a3499531d27..5483fda44a2 100644 --- a/libgfortran/generated/maxloc0_4_r4.c +++ b/libgfortran/generated/maxloc0_4_r4.c @@ -63,8 +63,8 @@ maxloc0_4_r4 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_r4 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 maxval; - - maxval = -GFC_REAL_4_HUGE; + GFC_REAL_4 maxval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_r4 (gfc_array_i4 * const restrict retarray, { GFC_REAL_4 maxval; + int fast = 0; - maxval = -GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_4_r8.c b/libgfortran/generated/maxloc0_4_r8.c index 7180bf8ce60..e4631db4ef8 100644 --- a/libgfortran/generated/maxloc0_4_r8.c +++ b/libgfortran/generated/maxloc0_4_r8.c @@ -63,8 +63,8 @@ maxloc0_4_r8 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_4_r8 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 maxval; - - maxval = -GFC_REAL_8_HUGE; + GFC_REAL_8 maxval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_4_r8 (gfc_array_i4 * const restrict retarray, { GFC_REAL_8 maxval; + int fast = 0; - maxval = -GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_i1.c b/libgfortran/generated/maxloc0_8_i1.c index a850603e5c5..ddfc4df57f1 100644 --- a/libgfortran/generated/maxloc0_8_i1.c +++ b/libgfortran/generated/maxloc0_8_i1.c @@ -63,8 +63,8 @@ maxloc0_8_i1 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_i1 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 maxval; - - maxval = (-GFC_INTEGER_1_HUGE-1); + GFC_INTEGER_1 maxval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_i1 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_1 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_1_HUGE-1); - +#if defined(GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_i16.c b/libgfortran/generated/maxloc0_8_i16.c index 73683d89589..ce324b5fdf6 100644 --- a/libgfortran/generated/maxloc0_8_i16.c +++ b/libgfortran/generated/maxloc0_8_i16.c @@ -63,8 +63,8 @@ maxloc0_8_i16 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_i16 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 maxval; - - maxval = (-GFC_INTEGER_16_HUGE-1); + GFC_INTEGER_16 maxval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_i16 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_16 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_16_HUGE-1); - +#if defined(GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_i2.c b/libgfortran/generated/maxloc0_8_i2.c index 3b8e793e4ce..1b59bb62508 100644 --- a/libgfortran/generated/maxloc0_8_i2.c +++ b/libgfortran/generated/maxloc0_8_i2.c @@ -63,8 +63,8 @@ maxloc0_8_i2 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_i2 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 maxval; - - maxval = (-GFC_INTEGER_2_HUGE-1); + GFC_INTEGER_2 maxval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_i2 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_2 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_2_HUGE-1); - +#if defined(GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_i4.c b/libgfortran/generated/maxloc0_8_i4.c index 1b0bc42bf69..f1071d1e990 100644 --- a/libgfortran/generated/maxloc0_8_i4.c +++ b/libgfortran/generated/maxloc0_8_i4.c @@ -63,8 +63,8 @@ maxloc0_8_i4 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_i4 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 maxval; - - maxval = (-GFC_INTEGER_4_HUGE-1); + GFC_INTEGER_4 maxval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_i4 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_4 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_4_HUGE-1); - +#if defined(GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_i8.c b/libgfortran/generated/maxloc0_8_i8.c index 5bf95201d7c..2774558ea0e 100644 --- a/libgfortran/generated/maxloc0_8_i8.c +++ b/libgfortran/generated/maxloc0_8_i8.c @@ -63,8 +63,8 @@ maxloc0_8_i8 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_i8 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 maxval; - - maxval = (-GFC_INTEGER_8_HUGE-1); + GFC_INTEGER_8 maxval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_i8 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_8 maxval; + int fast = 0; - maxval = (-GFC_INTEGER_8_HUGE-1); - +#if defined(GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_r10.c b/libgfortran/generated/maxloc0_8_r10.c index 28008d4a0c4..0d5183c41a6 100644 --- a/libgfortran/generated/maxloc0_8_r10.c +++ b/libgfortran/generated/maxloc0_8_r10.c @@ -63,8 +63,8 @@ maxloc0_8_r10 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_r10 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 maxval; - - maxval = -GFC_REAL_10_HUGE; + GFC_REAL_10 maxval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_r10 (gfc_array_i8 * const restrict retarray, { GFC_REAL_10 maxval; + int fast = 0; - maxval = -GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_r16.c b/libgfortran/generated/maxloc0_8_r16.c index 04bfd57e1fc..51bc7b3ee8c 100644 --- a/libgfortran/generated/maxloc0_8_r16.c +++ b/libgfortran/generated/maxloc0_8_r16.c @@ -63,8 +63,8 @@ maxloc0_8_r16 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_r16 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 maxval; - - maxval = -GFC_REAL_16_HUGE; + GFC_REAL_16 maxval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_r16 (gfc_array_i8 * const restrict retarray, { GFC_REAL_16 maxval; + int fast = 0; - maxval = -GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_r4.c b/libgfortran/generated/maxloc0_8_r4.c index 238b8699bac..cebe571ccbe 100644 --- a/libgfortran/generated/maxloc0_8_r4.c +++ b/libgfortran/generated/maxloc0_8_r4.c @@ -63,8 +63,8 @@ maxloc0_8_r4 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_r4 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 maxval; - - maxval = -GFC_REAL_4_HUGE; + GFC_REAL_4 maxval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_r4 (gfc_array_i8 * const restrict retarray, { GFC_REAL_4 maxval; + int fast = 0; - maxval = -GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc0_8_r8.c b/libgfortran/generated/maxloc0_8_r8.c index 16d9a45331a..d33299504ec 100644 --- a/libgfortran/generated/maxloc0_8_r8.c +++ b/libgfortran/generated/maxloc0_8_r8.c @@ -63,8 +63,8 @@ maxloc0_8_r8 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MAXLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MAXLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ maxloc0_8_r8 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 maxval; - - maxval = -GFC_REAL_8_HUGE; + GFC_REAL_8 maxval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mmaxloc0_8_r8 (gfc_array_i8 * const restrict retarray, { GFC_REAL_8 maxval; + int fast = 0; - maxval = -GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/maxloc1_16_i1.c b/libgfortran/generated/maxloc1_16_i1.c index 9be5cdd6d45..5caf976fb77 100644 --- a/libgfortran/generated/maxloc1_16_i1.c +++ b/libgfortran/generated/maxloc1_16_i1.c @@ -85,15 +85,15 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_i16.c b/libgfortran/generated/maxloc1_16_i16.c index 9118f85c73c..7a0f533420c 100644 --- a/libgfortran/generated/maxloc1_16_i16.c +++ b/libgfortran/generated/maxloc1_16_i16.c @@ -85,15 +85,15 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_i2.c b/libgfortran/generated/maxloc1_16_i2.c index 66b24b0fadf..a0a9f16dbcf 100644 --- a/libgfortran/generated/maxloc1_16_i2.c +++ b/libgfortran/generated/maxloc1_16_i2.c @@ -85,15 +85,15 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_i4.c b/libgfortran/generated/maxloc1_16_i4.c index 3f6c952ebe6..5a460ba449b 100644 --- a/libgfortran/generated/maxloc1_16_i4.c +++ b/libgfortran/generated/maxloc1_16_i4.c @@ -85,15 +85,15 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_i8.c b/libgfortran/generated/maxloc1_16_i8.c index 141dc5142ef..e62ca1cada3 100644 --- a/libgfortran/generated/maxloc1_16_i8.c +++ b/libgfortran/generated/maxloc1_16_i8.c @@ -85,15 +85,15 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_r10.c b/libgfortran/generated/maxloc1_16_r10.c index 74bc4d30562..072f7ef2b2c 100644 --- a/libgfortran/generated/maxloc1_16_r10.c +++ b/libgfortran/generated/maxloc1_16_r10.c @@ -85,15 +85,15 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_r16.c b/libgfortran/generated/maxloc1_16_r16.c index cadca8bedb2..d4f13e9db4d 100644 --- a/libgfortran/generated/maxloc1_16_r16.c +++ b/libgfortran/generated/maxloc1_16_r16.c @@ -85,15 +85,15 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_r4.c b/libgfortran/generated/maxloc1_16_r4.c index f2afd83ab32..4010ee41231 100644 --- a/libgfortran/generated/maxloc1_16_r4.c +++ b/libgfortran/generated/maxloc1_16_r4.c @@ -85,15 +85,15 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_16_r8.c b/libgfortran/generated/maxloc1_16_r8.c index 3da10665b72..d837637248f 100644 --- a/libgfortran/generated/maxloc1_16_r8.c +++ b/libgfortran/generated/maxloc1_16_r8.c @@ -85,15 +85,15 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_i1.c b/libgfortran/generated/maxloc1_4_i1.c index 3a76e0ee626..c79018653d0 100644 --- a/libgfortran/generated/maxloc1_4_i1.c +++ b/libgfortran/generated/maxloc1_4_i1.c @@ -85,15 +85,15 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_i16.c b/libgfortran/generated/maxloc1_4_i16.c index 7c3bc2dd3fb..9a5a35dcf5b 100644 --- a/libgfortran/generated/maxloc1_4_i16.c +++ b/libgfortran/generated/maxloc1_4_i16.c @@ -85,15 +85,15 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_i2.c b/libgfortran/generated/maxloc1_4_i2.c index cdcdfa4383a..19710651ee1 100644 --- a/libgfortran/generated/maxloc1_4_i2.c +++ b/libgfortran/generated/maxloc1_4_i2.c @@ -85,15 +85,15 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c index bf60007dd23..5b068face67 100644 --- a/libgfortran/generated/maxloc1_4_i4.c +++ b/libgfortran/generated/maxloc1_4_i4.c @@ -85,15 +85,15 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c index 18edc044d99..209c3680e64 100644 --- a/libgfortran/generated/maxloc1_4_i8.c +++ b/libgfortran/generated/maxloc1_4_i8.c @@ -85,15 +85,15 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_r10.c b/libgfortran/generated/maxloc1_4_r10.c index bae17fe5f36..2f914d75b19 100644 --- a/libgfortran/generated/maxloc1_4_r10.c +++ b/libgfortran/generated/maxloc1_4_r10.c @@ -85,15 +85,15 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_r16.c b/libgfortran/generated/maxloc1_4_r16.c index 811f01c2176..c0fd3e83681 100644 --- a/libgfortran/generated/maxloc1_4_r16.c +++ b/libgfortran/generated/maxloc1_4_r16.c @@ -85,15 +85,15 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c index 065770f1a7a..90e58a0c689 100644 --- a/libgfortran/generated/maxloc1_4_r4.c +++ b/libgfortran/generated/maxloc1_4_r4.c @@ -85,15 +85,15 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c index e0835079345..741fb481e58 100644 --- a/libgfortran/generated/maxloc1_4_r8.c +++ b/libgfortran/generated/maxloc1_4_r8.c @@ -85,15 +85,15 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_i1.c b/libgfortran/generated/maxloc1_8_i1.c index b1d1f0e8dc8..966953727dd 100644 --- a/libgfortran/generated/maxloc1_8_i1.c +++ b/libgfortran/generated/maxloc1_8_i1.c @@ -85,15 +85,15 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 maxval; - maxval = (-GFC_INTEGER_1_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_1 maxval; +#if defined (GFC_INTEGER_1_INFINITY) + maxval = -GFC_INTEGER_1_INFINITY; +#else + maxval = (-GFC_INTEGER_1_HUGE-1); +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_i16.c b/libgfortran/generated/maxloc1_8_i16.c index 3028b2de6fb..fb131d53dbb 100644 --- a/libgfortran/generated/maxloc1_8_i16.c +++ b/libgfortran/generated/maxloc1_8_i16.c @@ -85,15 +85,15 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 maxval; - maxval = (-GFC_INTEGER_16_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_16 maxval; +#if defined (GFC_INTEGER_16_INFINITY) + maxval = -GFC_INTEGER_16_INFINITY; +#else + maxval = (-GFC_INTEGER_16_HUGE-1); +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_i2.c b/libgfortran/generated/maxloc1_8_i2.c index 74d7fb306b4..c13eb68b5a0 100644 --- a/libgfortran/generated/maxloc1_8_i2.c +++ b/libgfortran/generated/maxloc1_8_i2.c @@ -85,15 +85,15 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 maxval; - maxval = (-GFC_INTEGER_2_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_2 maxval; +#if defined (GFC_INTEGER_2_INFINITY) + maxval = -GFC_INTEGER_2_INFINITY; +#else + maxval = (-GFC_INTEGER_2_HUGE-1); +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c index fcf11b8ffbf..412133c0325 100644 --- a/libgfortran/generated/maxloc1_8_i4.c +++ b/libgfortran/generated/maxloc1_8_i4.c @@ -85,15 +85,15 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 maxval; - maxval = (-GFC_INTEGER_4_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_4 maxval; +#if defined (GFC_INTEGER_4_INFINITY) + maxval = -GFC_INTEGER_4_INFINITY; +#else + maxval = (-GFC_INTEGER_4_HUGE-1); +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c index 1210fb12a82..6ddb24d371d 100644 --- a/libgfortran/generated/maxloc1_8_i8.c +++ b/libgfortran/generated/maxloc1_8_i8.c @@ -85,15 +85,15 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 maxval; - maxval = (-GFC_INTEGER_8_HUGE-1); - result = 0; - if (len <= 0) + GFC_INTEGER_8 maxval; +#if defined (GFC_INTEGER_8_INFINITY) + maxval = -GFC_INTEGER_8_INFINITY; +#else + maxval = (-GFC_INTEGER_8_HUGE-1); +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_r10.c b/libgfortran/generated/maxloc1_8_r10.c index e0873d2590e..3ff4ca4cc75 100644 --- a/libgfortran/generated/maxloc1_8_r10.c +++ b/libgfortran/generated/maxloc1_8_r10.c @@ -85,15 +85,15 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 maxval; - maxval = -GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 maxval; +#if defined (GFC_REAL_10_INFINITY) + maxval = -GFC_REAL_10_INFINITY; +#else + maxval = -GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_r16.c b/libgfortran/generated/maxloc1_8_r16.c index 83d84c58ef1..d392bee6b65 100644 --- a/libgfortran/generated/maxloc1_8_r16.c +++ b/libgfortran/generated/maxloc1_8_r16.c @@ -85,15 +85,15 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 maxval; - maxval = -GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 maxval; +#if defined (GFC_REAL_16_INFINITY) + maxval = -GFC_REAL_16_INFINITY; +#else + maxval = -GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c index 94250d30a9d..159fa60503b 100644 --- a/libgfortran/generated/maxloc1_8_r4.c +++ b/libgfortran/generated/maxloc1_8_r4.c @@ -85,15 +85,15 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 maxval; - maxval = -GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 maxval; +#if defined (GFC_REAL_4_INFINITY) + maxval = -GFC_REAL_4_INFINITY; +#else + maxval = -GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c index 4b759782227..858865a974c 100644 --- a/libgfortran/generated/maxloc1_8_r8.c +++ b/libgfortran/generated/maxloc1_8_r8.c @@ -85,15 +85,15 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src > maxval || !result) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src >= maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 maxval; - maxval = -GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 maxval; +#if defined (GFC_REAL_8_INFINITY) + maxval = -GFC_REAL_8_INFINITY; +#else + maxval = -GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ smaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ smaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ smaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_i1.c b/libgfortran/generated/maxval_i1.c index cbffa3021aa..c4f1a32ab4d 100644 --- a/libgfortran/generated/maxval_i1.c +++ b/libgfortran/generated/maxval_i1.c @@ -84,15 +84,15 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, src = base; { - result = (-GFC_INTEGER_1_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_1_INFINITY) + result = -GFC_INTEGER_1_INFINITY; +#else + result = (-GFC_INTEGER_1_HUGE-1); +#endif + if (len <= 0) *dest = (-GFC_INTEGER_1_HUGE-1); else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_1_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray, msrc = mbase; { - result = (-GFC_INTEGER_1_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_1_INFINITY) + result = -GFC_INTEGER_1_INFINITY; +#else + result = (-GFC_INTEGER_1_HUGE-1); +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = (-GFC_INTEGER_1_HUGE-1); else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_INTEGER_1_INFINITY) || defined (GFC_INTEGER_1_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_1_QUIET_NAN : (-GFC_INTEGER_1_HUGE-1); +#else + result = (-GFC_INTEGER_1_HUGE-1); +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_i1 (gfc_array_i1 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_i16.c b/libgfortran/generated/maxval_i16.c index e0e53411e36..493c1decc5e 100644 --- a/libgfortran/generated/maxval_i16.c +++ b/libgfortran/generated/maxval_i16.c @@ -84,15 +84,15 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, src = base; { - result = (-GFC_INTEGER_16_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_16_INFINITY) + result = -GFC_INTEGER_16_INFINITY; +#else + result = (-GFC_INTEGER_16_HUGE-1); +#endif + if (len <= 0) *dest = (-GFC_INTEGER_16_HUGE-1); else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_16_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - result = (-GFC_INTEGER_16_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_16_INFINITY) + result = -GFC_INTEGER_16_INFINITY; +#else + result = (-GFC_INTEGER_16_HUGE-1); +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = (-GFC_INTEGER_16_HUGE-1); else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_INTEGER_16_INFINITY) || defined (GFC_INTEGER_16_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_16_QUIET_NAN : (-GFC_INTEGER_16_HUGE-1); +#else + result = (-GFC_INTEGER_16_HUGE-1); +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_i2.c b/libgfortran/generated/maxval_i2.c index 293a75f57cf..9c82cbb1333 100644 --- a/libgfortran/generated/maxval_i2.c +++ b/libgfortran/generated/maxval_i2.c @@ -84,15 +84,15 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, src = base; { - result = (-GFC_INTEGER_2_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_2_INFINITY) + result = -GFC_INTEGER_2_INFINITY; +#else + result = (-GFC_INTEGER_2_HUGE-1); +#endif + if (len <= 0) *dest = (-GFC_INTEGER_2_HUGE-1); else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_2_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray, msrc = mbase; { - result = (-GFC_INTEGER_2_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_2_INFINITY) + result = -GFC_INTEGER_2_INFINITY; +#else + result = (-GFC_INTEGER_2_HUGE-1); +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = (-GFC_INTEGER_2_HUGE-1); else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_INTEGER_2_INFINITY) || defined (GFC_INTEGER_2_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_2_QUIET_NAN : (-GFC_INTEGER_2_HUGE-1); +#else + result = (-GFC_INTEGER_2_HUGE-1); +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_i2 (gfc_array_i2 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c index 4d105a0d57f..603d414e64b 100644 --- a/libgfortran/generated/maxval_i4.c +++ b/libgfortran/generated/maxval_i4.c @@ -84,15 +84,15 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, src = base; { - result = (-GFC_INTEGER_4_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_4_INFINITY) + result = -GFC_INTEGER_4_INFINITY; +#else + result = (-GFC_INTEGER_4_HUGE-1); +#endif + if (len <= 0) *dest = (-GFC_INTEGER_4_HUGE-1); else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_4_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - result = (-GFC_INTEGER_4_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_4_INFINITY) + result = -GFC_INTEGER_4_INFINITY; +#else + result = (-GFC_INTEGER_4_HUGE-1); +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = (-GFC_INTEGER_4_HUGE-1); else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_INTEGER_4_INFINITY) || defined (GFC_INTEGER_4_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_4_QUIET_NAN : (-GFC_INTEGER_4_HUGE-1); +#else + result = (-GFC_INTEGER_4_HUGE-1); +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c index 2ff17283e79..a979d6647b5 100644 --- a/libgfortran/generated/maxval_i8.c +++ b/libgfortran/generated/maxval_i8.c @@ -84,15 +84,15 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, src = base; { - result = (-GFC_INTEGER_8_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_8_INFINITY) + result = -GFC_INTEGER_8_INFINITY; +#else + result = (-GFC_INTEGER_8_HUGE-1); +#endif + if (len <= 0) *dest = (-GFC_INTEGER_8_HUGE-1); else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_8_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - result = (-GFC_INTEGER_8_HUGE-1); - if (len <= 0) +#if defined (GFC_INTEGER_8_INFINITY) + result = -GFC_INTEGER_8_INFINITY; +#else + result = (-GFC_INTEGER_8_HUGE-1); +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = (-GFC_INTEGER_8_HUGE-1); else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_INTEGER_8_INFINITY) || defined (GFC_INTEGER_8_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_8_QUIET_NAN : (-GFC_INTEGER_8_HUGE-1); +#else + result = (-GFC_INTEGER_8_HUGE-1); +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_r10.c b/libgfortran/generated/maxval_r10.c index 356998b3027..daf0dd8188d 100644 --- a/libgfortran/generated/maxval_r10.c +++ b/libgfortran/generated/maxval_r10.c @@ -84,15 +84,15 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, src = base; { - result = -GFC_REAL_10_HUGE; - if (len <= 0) +#if defined (GFC_REAL_10_INFINITY) + result = -GFC_REAL_10_INFINITY; +#else + result = -GFC_REAL_10_HUGE; +#endif + if (len <= 0) *dest = -GFC_REAL_10_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_10_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray, msrc = mbase; { - result = -GFC_REAL_10_HUGE; - if (len <= 0) +#if defined (GFC_REAL_10_INFINITY) + result = -GFC_REAL_10_INFINITY; +#else + result = -GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = -GFC_REAL_10_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_REAL_10_INFINITY) || defined (GFC_REAL_10_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_10_QUIET_NAN) + result = non_empty_p ? GFC_REAL_10_QUIET_NAN : -GFC_REAL_10_HUGE; +#else + result = -GFC_REAL_10_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_r10 (gfc_array_r10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_r16.c b/libgfortran/generated/maxval_r16.c index cf281085a16..ea1c2e7ac48 100644 --- a/libgfortran/generated/maxval_r16.c +++ b/libgfortran/generated/maxval_r16.c @@ -84,15 +84,15 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, src = base; { - result = -GFC_REAL_16_HUGE; - if (len <= 0) +#if defined (GFC_REAL_16_INFINITY) + result = -GFC_REAL_16_INFINITY; +#else + result = -GFC_REAL_16_HUGE; +#endif + if (len <= 0) *dest = -GFC_REAL_16_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_16_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray, msrc = mbase; { - result = -GFC_REAL_16_HUGE; - if (len <= 0) +#if defined (GFC_REAL_16_INFINITY) + result = -GFC_REAL_16_INFINITY; +#else + result = -GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = -GFC_REAL_16_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_REAL_16_INFINITY) || defined (GFC_REAL_16_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_16_QUIET_NAN) + result = non_empty_p ? GFC_REAL_16_QUIET_NAN : -GFC_REAL_16_HUGE; +#else + result = -GFC_REAL_16_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_r16 (gfc_array_r16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c index b2541a2dc1b..db073303028 100644 --- a/libgfortran/generated/maxval_r4.c +++ b/libgfortran/generated/maxval_r4.c @@ -84,15 +84,15 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, src = base; { - result = -GFC_REAL_4_HUGE; - if (len <= 0) +#if defined (GFC_REAL_4_INFINITY) + result = -GFC_REAL_4_INFINITY; +#else + result = -GFC_REAL_4_HUGE; +#endif + if (len <= 0) *dest = -GFC_REAL_4_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_4_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray, msrc = mbase; { - result = -GFC_REAL_4_HUGE; - if (len <= 0) +#if defined (GFC_REAL_4_INFINITY) + result = -GFC_REAL_4_INFINITY; +#else + result = -GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = -GFC_REAL_4_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_REAL_4_INFINITY) || defined (GFC_REAL_4_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_4_QUIET_NAN) + result = non_empty_p ? GFC_REAL_4_QUIET_NAN : -GFC_REAL_4_HUGE; +#else + result = -GFC_REAL_4_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_r4 (gfc_array_r4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c index 8eb0b8684fb..b6d831b55c6 100644 --- a/libgfortran/generated/maxval_r8.c +++ b/libgfortran/generated/maxval_r8.c @@ -84,15 +84,15 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, src = base; { - result = -GFC_REAL_8_HUGE; - if (len <= 0) +#if defined (GFC_REAL_8_INFINITY) + result = -GFC_REAL_8_INFINITY; +#else + result = -GFC_REAL_8_HUGE; +#endif + if (len <= 0) *dest = -GFC_REAL_8_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src > result) - result = *src; - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_8_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray, msrc = mbase; { - result = -GFC_REAL_8_HUGE; - if (len <= 0) +#if defined (GFC_REAL_8_INFINITY) + result = -GFC_REAL_8_INFINITY; +#else + result = -GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = -GFC_REAL_8_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src > result) - result = *src; - } +#if defined (GFC_REAL_8_INFINITY) || defined (GFC_REAL_8_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_8_QUIET_NAN) + result = non_empty_p ? GFC_REAL_8_QUIET_NAN : -GFC_REAL_8_HUGE; +#else + result = -GFC_REAL_8_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ smaxval_r8 (gfc_array_r8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ smaxval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ smaxval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc0_16_i1.c b/libgfortran/generated/minloc0_16_i1.c index 7a505126bcd..2fbd7609d1e 100644 --- a/libgfortran/generated/minloc0_16_i1.c +++ b/libgfortran/generated/minloc0_16_i1.c @@ -63,8 +63,8 @@ minloc0_16_i1 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_i1 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 minval; - - minval = GFC_INTEGER_1_HUGE; + GFC_INTEGER_1 minval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_i1 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_1 minval; + int fast = 0; - minval = GFC_INTEGER_1_HUGE; - +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_i16.c b/libgfortran/generated/minloc0_16_i16.c index cfb4115b34f..613ad4813be 100644 --- a/libgfortran/generated/minloc0_16_i16.c +++ b/libgfortran/generated/minloc0_16_i16.c @@ -63,8 +63,8 @@ minloc0_16_i16 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_i16 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 minval; - - minval = GFC_INTEGER_16_HUGE; + GFC_INTEGER_16 minval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_i16 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_16 minval; + int fast = 0; - minval = GFC_INTEGER_16_HUGE; - +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_i2.c b/libgfortran/generated/minloc0_16_i2.c index 6dbbfbb5105..7591cd5bda9 100644 --- a/libgfortran/generated/minloc0_16_i2.c +++ b/libgfortran/generated/minloc0_16_i2.c @@ -63,8 +63,8 @@ minloc0_16_i2 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_i2 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 minval; - - minval = GFC_INTEGER_2_HUGE; + GFC_INTEGER_2 minval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_i2 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_2 minval; + int fast = 0; - minval = GFC_INTEGER_2_HUGE; - +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_i4.c b/libgfortran/generated/minloc0_16_i4.c index 811ad1fe324..85601fb3c4f 100644 --- a/libgfortran/generated/minloc0_16_i4.c +++ b/libgfortran/generated/minloc0_16_i4.c @@ -63,8 +63,8 @@ minloc0_16_i4 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_i4 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 minval; - - minval = GFC_INTEGER_4_HUGE; + GFC_INTEGER_4 minval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_i4 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_4 minval; + int fast = 0; - minval = GFC_INTEGER_4_HUGE; - +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_i8.c b/libgfortran/generated/minloc0_16_i8.c index 583f489d30c..88e1ee89dfd 100644 --- a/libgfortran/generated/minloc0_16_i8.c +++ b/libgfortran/generated/minloc0_16_i8.c @@ -63,8 +63,8 @@ minloc0_16_i8 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_i8 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 minval; - - minval = GFC_INTEGER_8_HUGE; + GFC_INTEGER_8 minval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_i8 (gfc_array_i16 * const restrict retarray, { GFC_INTEGER_8 minval; + int fast = 0; - minval = GFC_INTEGER_8_HUGE; - +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_r10.c b/libgfortran/generated/minloc0_16_r10.c index fa29e93e2f5..7bfc7a71e15 100644 --- a/libgfortran/generated/minloc0_16_r10.c +++ b/libgfortran/generated/minloc0_16_r10.c @@ -63,8 +63,8 @@ minloc0_16_r10 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_r10 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 minval; - - minval = GFC_REAL_10_HUGE; + GFC_REAL_10 minval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_r10 (gfc_array_i16 * const restrict retarray, { GFC_REAL_10 minval; + int fast = 0; - minval = GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_r16.c b/libgfortran/generated/minloc0_16_r16.c index 304ca7e95fc..d40885435e1 100644 --- a/libgfortran/generated/minloc0_16_r16.c +++ b/libgfortran/generated/minloc0_16_r16.c @@ -63,8 +63,8 @@ minloc0_16_r16 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_r16 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 minval; - - minval = GFC_REAL_16_HUGE; + GFC_REAL_16 minval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_r16 (gfc_array_i16 * const restrict retarray, { GFC_REAL_16 minval; + int fast = 0; - minval = GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_r4.c b/libgfortran/generated/minloc0_16_r4.c index 0ce5e08a673..6b35a7a9c56 100644 --- a/libgfortran/generated/minloc0_16_r4.c +++ b/libgfortran/generated/minloc0_16_r4.c @@ -63,8 +63,8 @@ minloc0_16_r4 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_r4 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 minval; - - minval = GFC_REAL_4_HUGE; + GFC_REAL_4 minval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_r4 (gfc_array_i16 * const restrict retarray, { GFC_REAL_4 minval; + int fast = 0; - minval = GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_16_r8.c b/libgfortran/generated/minloc0_16_r8.c index 8346be1ff4b..c9ee9bf07c2 100644 --- a/libgfortran/generated/minloc0_16_r8.c +++ b/libgfortran/generated/minloc0_16_r8.c @@ -63,8 +63,8 @@ minloc0_16_r8 (gfc_array_i16 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_16_r8 (gfc_array_i16 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 minval; - - minval = GFC_REAL_8_HUGE; + GFC_REAL_8 minval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_16_r8 (gfc_array_i16 * const restrict retarray, { GFC_REAL_8 minval; + int fast = 0; - minval = GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_i1.c b/libgfortran/generated/minloc0_4_i1.c index 3a0b22ba71a..0187a3d8afd 100644 --- a/libgfortran/generated/minloc0_4_i1.c +++ b/libgfortran/generated/minloc0_4_i1.c @@ -63,8 +63,8 @@ minloc0_4_i1 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_i1 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 minval; - - minval = GFC_INTEGER_1_HUGE; + GFC_INTEGER_1 minval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_i1 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_1 minval; + int fast = 0; - minval = GFC_INTEGER_1_HUGE; - +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_i16.c b/libgfortran/generated/minloc0_4_i16.c index cd947eb6f05..ce3cd2789b4 100644 --- a/libgfortran/generated/minloc0_4_i16.c +++ b/libgfortran/generated/minloc0_4_i16.c @@ -63,8 +63,8 @@ minloc0_4_i16 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_i16 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 minval; - - minval = GFC_INTEGER_16_HUGE; + GFC_INTEGER_16 minval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_i16 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_16 minval; + int fast = 0; - minval = GFC_INTEGER_16_HUGE; - +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_i2.c b/libgfortran/generated/minloc0_4_i2.c index 6d65cfb2421..cedfbf3b5b2 100644 --- a/libgfortran/generated/minloc0_4_i2.c +++ b/libgfortran/generated/minloc0_4_i2.c @@ -63,8 +63,8 @@ minloc0_4_i2 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_i2 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 minval; - - minval = GFC_INTEGER_2_HUGE; + GFC_INTEGER_2 minval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_i2 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_2 minval; + int fast = 0; - minval = GFC_INTEGER_2_HUGE; - +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_i4.c b/libgfortran/generated/minloc0_4_i4.c index 938d2e48208..42211a993cd 100644 --- a/libgfortran/generated/minloc0_4_i4.c +++ b/libgfortran/generated/minloc0_4_i4.c @@ -63,8 +63,8 @@ minloc0_4_i4 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_i4 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 minval; - - minval = GFC_INTEGER_4_HUGE; + GFC_INTEGER_4 minval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_i4 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_4 minval; + int fast = 0; - minval = GFC_INTEGER_4_HUGE; - +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_i8.c b/libgfortran/generated/minloc0_4_i8.c index b64024e45fc..39cc14dd790 100644 --- a/libgfortran/generated/minloc0_4_i8.c +++ b/libgfortran/generated/minloc0_4_i8.c @@ -63,8 +63,8 @@ minloc0_4_i8 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_i8 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 minval; - - minval = GFC_INTEGER_8_HUGE; + GFC_INTEGER_8 minval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_i8 (gfc_array_i4 * const restrict retarray, { GFC_INTEGER_8 minval; + int fast = 0; - minval = GFC_INTEGER_8_HUGE; - +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_r10.c b/libgfortran/generated/minloc0_4_r10.c index e130e21d3c2..9edd1057fb1 100644 --- a/libgfortran/generated/minloc0_4_r10.c +++ b/libgfortran/generated/minloc0_4_r10.c @@ -63,8 +63,8 @@ minloc0_4_r10 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_r10 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 minval; - - minval = GFC_REAL_10_HUGE; + GFC_REAL_10 minval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_r10 (gfc_array_i4 * const restrict retarray, { GFC_REAL_10 minval; + int fast = 0; - minval = GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_r16.c b/libgfortran/generated/minloc0_4_r16.c index 45ccb614ecb..0cb3ee02bf9 100644 --- a/libgfortran/generated/minloc0_4_r16.c +++ b/libgfortran/generated/minloc0_4_r16.c @@ -63,8 +63,8 @@ minloc0_4_r16 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_r16 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 minval; - - minval = GFC_REAL_16_HUGE; + GFC_REAL_16 minval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_r16 (gfc_array_i4 * const restrict retarray, { GFC_REAL_16 minval; + int fast = 0; - minval = GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_r4.c b/libgfortran/generated/minloc0_4_r4.c index 6d8f74e2991..817e61e44d8 100644 --- a/libgfortran/generated/minloc0_4_r4.c +++ b/libgfortran/generated/minloc0_4_r4.c @@ -63,8 +63,8 @@ minloc0_4_r4 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_r4 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 minval; - - minval = GFC_REAL_4_HUGE; + GFC_REAL_4 minval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_r4 (gfc_array_i4 * const restrict retarray, { GFC_REAL_4 minval; + int fast = 0; - minval = GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_4_r8.c b/libgfortran/generated/minloc0_4_r8.c index eb01e685620..84c219b4fea 100644 --- a/libgfortran/generated/minloc0_4_r8.c +++ b/libgfortran/generated/minloc0_4_r8.c @@ -63,8 +63,8 @@ minloc0_4_r8 (gfc_array_i4 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_4_r8 (gfc_array_i4 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 minval; - - minval = GFC_REAL_8_HUGE; + GFC_REAL_8 minval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_4_r8 (gfc_array_i4 * const restrict retarray, { GFC_REAL_8 minval; + int fast = 0; - minval = GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_i1.c b/libgfortran/generated/minloc0_8_i1.c index d4924e48f19..52f4f504f3d 100644 --- a/libgfortran/generated/minloc0_8_i1.c +++ b/libgfortran/generated/minloc0_8_i1.c @@ -63,8 +63,8 @@ minloc0_8_i1 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_i1 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_1 minval; - - minval = GFC_INTEGER_1_HUGE; + GFC_INTEGER_1 minval; +#if defined(GFC_INTEGER_1_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_1_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_i1 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_1 minval; + int fast = 0; - minval = GFC_INTEGER_1_HUGE; - +#if defined(GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_1_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_i16.c b/libgfortran/generated/minloc0_8_i16.c index dad459a898f..980cd7e4a8f 100644 --- a/libgfortran/generated/minloc0_8_i16.c +++ b/libgfortran/generated/minloc0_8_i16.c @@ -63,8 +63,8 @@ minloc0_8_i16 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_i16 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_16 minval; - - minval = GFC_INTEGER_16_HUGE; + GFC_INTEGER_16 minval; +#if defined(GFC_INTEGER_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_i16 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_16 minval; + int fast = 0; - minval = GFC_INTEGER_16_HUGE; - +#if defined(GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_i2.c b/libgfortran/generated/minloc0_8_i2.c index 20cb1f20b9b..26f79d468f9 100644 --- a/libgfortran/generated/minloc0_8_i2.c +++ b/libgfortran/generated/minloc0_8_i2.c @@ -63,8 +63,8 @@ minloc0_8_i2 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_i2 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_2 minval; - - minval = GFC_INTEGER_2_HUGE; + GFC_INTEGER_2 minval; +#if defined(GFC_INTEGER_2_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_2_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_i2 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_2 minval; + int fast = 0; - minval = GFC_INTEGER_2_HUGE; - +#if defined(GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_2_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_i4.c b/libgfortran/generated/minloc0_8_i4.c index ca02f4fe379..87f1927346e 100644 --- a/libgfortran/generated/minloc0_8_i4.c +++ b/libgfortran/generated/minloc0_8_i4.c @@ -63,8 +63,8 @@ minloc0_8_i4 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_i4 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_4 minval; - - minval = GFC_INTEGER_4_HUGE; + GFC_INTEGER_4 minval; +#if defined(GFC_INTEGER_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_i4 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_4 minval; + int fast = 0; - minval = GFC_INTEGER_4_HUGE; - +#if defined(GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_i8.c b/libgfortran/generated/minloc0_8_i8.c index dffaec6861b..73059620302 100644 --- a/libgfortran/generated/minloc0_8_i8.c +++ b/libgfortran/generated/minloc0_8_i8.c @@ -63,8 +63,8 @@ minloc0_8_i8 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_i8 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_INTEGER_8 minval; - - minval = GFC_INTEGER_8_HUGE; + GFC_INTEGER_8 minval; +#if defined(GFC_INTEGER_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_INTEGER_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_i8 (gfc_array_i8 * const restrict retarray, { GFC_INTEGER_8 minval; + int fast = 0; - minval = GFC_INTEGER_8_HUGE; - +#if defined(GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_INTEGER_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_r10.c b/libgfortran/generated/minloc0_8_r10.c index fe31ea91ec4..38ba7f09d5a 100644 --- a/libgfortran/generated/minloc0_8_r10.c +++ b/libgfortran/generated/minloc0_8_r10.c @@ -63,8 +63,8 @@ minloc0_8_r10 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_r10 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_10 minval; - - minval = GFC_REAL_10_HUGE; + GFC_REAL_10 minval; +#if defined(GFC_REAL_10_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_10_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_r10 (gfc_array_i8 * const restrict retarray, { GFC_REAL_10 minval; + int fast = 0; - minval = GFC_REAL_10_HUGE; - +#if defined(GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_10_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_r16.c b/libgfortran/generated/minloc0_8_r16.c index 365403c87f0..29b37f40b94 100644 --- a/libgfortran/generated/minloc0_8_r16.c +++ b/libgfortran/generated/minloc0_8_r16.c @@ -63,8 +63,8 @@ minloc0_8_r16 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_r16 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_16 minval; - - minval = GFC_REAL_16_HUGE; + GFC_REAL_16 minval; +#if defined(GFC_REAL_16_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_16_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_r16 (gfc_array_i8 * const restrict retarray, { GFC_REAL_16 minval; + int fast = 0; - minval = GFC_REAL_16_HUGE; - +#if defined(GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_16_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_r4.c b/libgfortran/generated/minloc0_8_r4.c index 53c89b13f7f..cf4c3b643e2 100644 --- a/libgfortran/generated/minloc0_8_r4.c +++ b/libgfortran/generated/minloc0_8_r4.c @@ -63,8 +63,8 @@ minloc0_8_r4 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_r4 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_4 minval; - - minval = GFC_REAL_4_HUGE; + GFC_REAL_4 minval; +#if defined(GFC_REAL_4_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_4_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_r4 (gfc_array_i8 * const restrict retarray, { GFC_REAL_4 minval; + int fast = 0; - minval = GFC_REAL_4_HUGE; - +#if defined(GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_4_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc0_8_r8.c b/libgfortran/generated/minloc0_8_r8.c index ab553b24005..3c5d3384617 100644 --- a/libgfortran/generated/minloc0_8_r8.c +++ b/libgfortran/generated/minloc0_8_r8.c @@ -63,8 +63,8 @@ minloc0_8_r8 (gfc_array_i8 * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "MINLOC"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "MINLOC"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -87,51 +87,83 @@ minloc0_8_r8 (gfc_array_i8 * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { - GFC_REAL_8 minval; - - minval = GFC_REAL_8_HUGE; + GFC_REAL_8 minval; +#if defined(GFC_REAL_8_QUIET_NAN) + int fast = 0; +#endif +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +#if defined(GFC_REAL_8_QUIET_NAN) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } } @@ -219,50 +251,87 @@ mminloc0_8_r8 (gfc_array_i8 * const restrict retarray, { GFC_REAL_8 minval; + int fast = 0; - minval = GFC_REAL_8_HUGE; - +#if defined(GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ - if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - } - /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined(GFC_REAL_8_QUIET_NAN) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + } + /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } } diff --git a/libgfortran/generated/minloc1_16_i1.c b/libgfortran/generated/minloc1_16_i1.c index 9177230a5ae..98470995ead 100644 --- a/libgfortran/generated/minloc1_16_i1.c +++ b/libgfortran/generated/minloc1_16_i1.c @@ -85,15 +85,15 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_i1 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_i1 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_i1 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_i16.c b/libgfortran/generated/minloc1_16_i16.c index 5ffebe29a48..9d1f9f677b2 100644 --- a/libgfortran/generated/minloc1_16_i16.c +++ b/libgfortran/generated/minloc1_16_i16.c @@ -85,15 +85,15 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_i2.c b/libgfortran/generated/minloc1_16_i2.c index f1110c1b254..35ce55a9003 100644 --- a/libgfortran/generated/minloc1_16_i2.c +++ b/libgfortran/generated/minloc1_16_i2.c @@ -85,15 +85,15 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_i2 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_i2 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_i2 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_i4.c b/libgfortran/generated/minloc1_16_i4.c index 86c0acf5a0c..9b6017b3772 100644 --- a/libgfortran/generated/minloc1_16_i4.c +++ b/libgfortran/generated/minloc1_16_i4.c @@ -85,15 +85,15 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_i4 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_i4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_i4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_i8.c b/libgfortran/generated/minloc1_16_i8.c index 7e965bee56d..8501c5db716 100644 --- a/libgfortran/generated/minloc1_16_i8.c +++ b/libgfortran/generated/minloc1_16_i8.c @@ -85,15 +85,15 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_i8 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_i8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_i8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_r10.c b/libgfortran/generated/minloc1_16_r10.c index e57462634c5..c71129fbf74 100644 --- a/libgfortran/generated/minloc1_16_r10.c +++ b/libgfortran/generated/minloc1_16_r10.c @@ -85,15 +85,15 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_r10 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_r10 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_r10 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_r16.c b/libgfortran/generated/minloc1_16_r16.c index 08815d322f5..f9ca1b79406 100644 --- a/libgfortran/generated/minloc1_16_r16.c +++ b/libgfortran/generated/minloc1_16_r16.c @@ -85,15 +85,15 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_r16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_r16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_r16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_r4.c b/libgfortran/generated/minloc1_16_r4.c index 7f2967d6eb4..3cd44447e52 100644 --- a/libgfortran/generated/minloc1_16_r4.c +++ b/libgfortran/generated/minloc1_16_r4.c @@ -85,15 +85,15 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_r4 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_r4 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_r4 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_16_r8.c b/libgfortran/generated/minloc1_16_r8.c index 4d6fa8b43ee..5e6d77db7b7 100644 --- a/libgfortran/generated/minloc1_16_r8.c +++ b/libgfortran/generated/minloc1_16_r8.c @@ -85,15 +85,15 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, src = base; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_16 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_16)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_16)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_16)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_16_r8 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_16_r8 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_16_r8 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_i1.c b/libgfortran/generated/minloc1_4_i1.c index 107ebea06cd..26d76d1d9da 100644 --- a/libgfortran/generated/minloc1_4_i1.c +++ b/libgfortran/generated/minloc1_4_i1.c @@ -85,15 +85,15 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_i1 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_i1 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_i1 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_i16.c b/libgfortran/generated/minloc1_4_i16.c index b84c52461e7..9f987c334e2 100644 --- a/libgfortran/generated/minloc1_4_i16.c +++ b/libgfortran/generated/minloc1_4_i16.c @@ -85,15 +85,15 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_i16 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_i16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_i16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_i2.c b/libgfortran/generated/minloc1_4_i2.c index 641b15d1d69..5799f6cace7 100644 --- a/libgfortran/generated/minloc1_4_i2.c +++ b/libgfortran/generated/minloc1_4_i2.c @@ -85,15 +85,15 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_i2 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_i2 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_i2 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c index c1daa5771b1..01ca074733c 100644 --- a/libgfortran/generated/minloc1_4_i4.c +++ b/libgfortran/generated/minloc1_4_i4.c @@ -85,15 +85,15 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c index 2229fc49a0d..5c6460c1c4b 100644 --- a/libgfortran/generated/minloc1_4_i8.c +++ b/libgfortran/generated/minloc1_4_i8.c @@ -85,15 +85,15 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_i8 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_i8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_i8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_r10.c b/libgfortran/generated/minloc1_4_r10.c index ade388b399d..20ec151c4bd 100644 --- a/libgfortran/generated/minloc1_4_r10.c +++ b/libgfortran/generated/minloc1_4_r10.c @@ -85,15 +85,15 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_r10 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_r10 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_r10 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_r16.c b/libgfortran/generated/minloc1_4_r16.c index e6cf58be551..800a89dc7dc 100644 --- a/libgfortran/generated/minloc1_4_r16.c +++ b/libgfortran/generated/minloc1_4_r16.c @@ -85,15 +85,15 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_r16 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_r16 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_r16 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c index 6aa23040294..17636618057 100644 --- a/libgfortran/generated/minloc1_4_r4.c +++ b/libgfortran/generated/minloc1_4_r4.c @@ -85,15 +85,15 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_r4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_r4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_r4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c index ccc93f5e00e..085f162072c 100644 --- a/libgfortran/generated/minloc1_4_r8.c +++ b/libgfortran/generated/minloc1_4_r8.c @@ -85,15 +85,15 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, src = base; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_4 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_4)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_4)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_4)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_4_r8 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_4_r8 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_4_r8 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_i1.c b/libgfortran/generated/minloc1_8_i1.c index 86003e572e9..97ed00bcc92 100644 --- a/libgfortran/generated/minloc1_8_i1.c +++ b/libgfortran/generated/minloc1_8_i1.c @@ -85,15 +85,15 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_1 minval; - minval = GFC_INTEGER_1_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_1 minval; +#if defined (GFC_INTEGER_1_INFINITY) + minval = GFC_INTEGER_1_INFINITY; +#else + minval = GFC_INTEGER_1_HUGE; +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_i1 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_i1 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_i1 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_i16.c b/libgfortran/generated/minloc1_8_i16.c index 8dab74cbd1f..79520cd315c 100644 --- a/libgfortran/generated/minloc1_8_i16.c +++ b/libgfortran/generated/minloc1_8_i16.c @@ -85,15 +85,15 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_16 minval; - minval = GFC_INTEGER_16_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_16 minval; +#if defined (GFC_INTEGER_16_INFINITY) + minval = GFC_INTEGER_16_INFINITY; +#else + minval = GFC_INTEGER_16_HUGE; +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_i16 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_i16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_i16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_i2.c b/libgfortran/generated/minloc1_8_i2.c index ba76fc1c269..768c3ed331d 100644 --- a/libgfortran/generated/minloc1_8_i2.c +++ b/libgfortran/generated/minloc1_8_i2.c @@ -85,15 +85,15 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_2 minval; - minval = GFC_INTEGER_2_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_2 minval; +#if defined (GFC_INTEGER_2_INFINITY) + minval = GFC_INTEGER_2_INFINITY; +#else + minval = GFC_INTEGER_2_HUGE; +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_i2 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_i2 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_i2 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c index 03b57de804e..4543a8d6e11 100644 --- a/libgfortran/generated/minloc1_8_i4.c +++ b/libgfortran/generated/minloc1_8_i4.c @@ -85,15 +85,15 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_4 minval; - minval = GFC_INTEGER_4_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_4 minval; +#if defined (GFC_INTEGER_4_INFINITY) + minval = GFC_INTEGER_4_INFINITY; +#else + minval = GFC_INTEGER_4_HUGE; +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_i4 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_i4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_i4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c index dc1c1fff4d2..2cac359266d 100644 --- a/libgfortran/generated/minloc1_8_i8.c +++ b/libgfortran/generated/minloc1_8_i8.c @@ -85,15 +85,15 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_INTEGER_8 minval; - minval = GFC_INTEGER_8_HUGE; - result = 0; - if (len <= 0) + GFC_INTEGER_8 minval; +#if defined (GFC_INTEGER_8_INFINITY) + minval = GFC_INTEGER_8_INFINITY; +#else + minval = GFC_INTEGER_8_HUGE; +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_r10.c b/libgfortran/generated/minloc1_8_r10.c index 15f22542ec2..2a0262fe1cf 100644 --- a/libgfortran/generated/minloc1_8_r10.c +++ b/libgfortran/generated/minloc1_8_r10.c @@ -85,15 +85,15 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_10 minval; - minval = GFC_REAL_10_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_10 minval; +#if defined (GFC_REAL_10_INFINITY) + minval = GFC_REAL_10_INFINITY; +#else + minval = GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_10_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_r10 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_r10 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_r10 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_r16.c b/libgfortran/generated/minloc1_8_r16.c index 64d1b26a7ee..c83d08f3c18 100644 --- a/libgfortran/generated/minloc1_8_r16.c +++ b/libgfortran/generated/minloc1_8_r16.c @@ -85,15 +85,15 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_16 minval; - minval = GFC_REAL_16_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_16 minval; +#if defined (GFC_REAL_16_INFINITY) + minval = GFC_REAL_16_INFINITY; +#else + minval = GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_16_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_r16 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_r16 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_r16 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c index 00977886a97..60608465370 100644 --- a/libgfortran/generated/minloc1_8_r4.c +++ b/libgfortran/generated/minloc1_8_r4.c @@ -85,15 +85,15 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_4 minval; - minval = GFC_REAL_4_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_4 minval; +#if defined (GFC_REAL_4_INFINITY) + minval = GFC_REAL_4_INFINITY; +#else + minval = GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_4_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_r4 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_r4 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_r4 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c index 05359143142..df380f8ba27 100644 --- a/libgfortran/generated/minloc1_8_r8.c +++ b/libgfortran/generated/minloc1_8_r8.c @@ -85,15 +85,15 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -129,7 +129,7 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,22 +143,37 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, src = base; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif + result = 1; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta) { - if (*src < minval || !result) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src <= minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -168,28 +183,28 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -269,15 +284,15 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -314,7 +329,7 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -329,22 +344,50 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - GFC_REAL_8 minval; - minval = GFC_REAL_8_HUGE; - result = 0; - if (len <= 0) + GFC_REAL_8 minval; +#if defined (GFC_REAL_8_INFINITY) + minval = GFC_REAL_8_INFINITY; +#else + minval = GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + GFC_INTEGER_8 result2 = 0; +#endif + result = 0; + if (len <= 0) *dest = 0; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (GFC_INTEGER_8)n + 1; - } - } + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + if (!result2) + result2 = (GFC_INTEGER_8)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + break; + } + } + } +#if defined (GFC_REAL_8_QUIET_NAN) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (GFC_INTEGER_8)n + 1; + } + } *dest = result; } } @@ -355,30 +398,30 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -426,10 +469,10 @@ sminloc1_8_r8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -437,15 +480,15 @@ sminloc1_8_r8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -501,21 +544,21 @@ sminloc1_8_r8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_i1.c b/libgfortran/generated/minval_i1.c index 3f1c0a53571..78ec1c266ad 100644 --- a/libgfortran/generated/minval_i1.c +++ b/libgfortran/generated/minval_i1.c @@ -84,15 +84,15 @@ minval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_i1 (gfc_array_i1 * const restrict retarray, src = base; { - result = GFC_INTEGER_1_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_1_INFINITY) + result = GFC_INTEGER_1_INFINITY; +#else + result = GFC_INTEGER_1_HUGE; +#endif + if (len <= 0) *dest = GFC_INTEGER_1_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_INTEGER_1_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_1_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_i1 (gfc_array_i1 * const restrict retarray, msrc = mbase; { - result = GFC_INTEGER_1_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_1_INFINITY) + result = GFC_INTEGER_1_INFINITY; +#else + result = GFC_INTEGER_1_HUGE; +#endif +#if defined (GFC_INTEGER_1_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_INTEGER_1_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_INTEGER_1_INFINITY) || defined (GFC_INTEGER_1_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_1_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_1_QUIET_NAN : GFC_INTEGER_1_HUGE; +#else + result = GFC_INTEGER_1_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_i1 (gfc_array_i1 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_i16.c b/libgfortran/generated/minval_i16.c index 6d0f20a7ea5..d5ea61b2e4f 100644 --- a/libgfortran/generated/minval_i16.c +++ b/libgfortran/generated/minval_i16.c @@ -84,15 +84,15 @@ minval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_i16 (gfc_array_i16 * const restrict retarray, src = base; { - result = GFC_INTEGER_16_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_16_INFINITY) + result = GFC_INTEGER_16_INFINITY; +#else + result = GFC_INTEGER_16_HUGE; +#endif + if (len <= 0) *dest = GFC_INTEGER_16_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_INTEGER_16_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_16_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_i16 (gfc_array_i16 * const restrict retarray, msrc = mbase; { - result = GFC_INTEGER_16_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_16_INFINITY) + result = GFC_INTEGER_16_INFINITY; +#else + result = GFC_INTEGER_16_HUGE; +#endif +#if defined (GFC_INTEGER_16_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_INTEGER_16_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_INTEGER_16_INFINITY) || defined (GFC_INTEGER_16_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_16_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_16_QUIET_NAN : GFC_INTEGER_16_HUGE; +#else + result = GFC_INTEGER_16_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_i2.c b/libgfortran/generated/minval_i2.c index c09e4535450..f34efb6cc89 100644 --- a/libgfortran/generated/minval_i2.c +++ b/libgfortran/generated/minval_i2.c @@ -84,15 +84,15 @@ minval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_i2 (gfc_array_i2 * const restrict retarray, src = base; { - result = GFC_INTEGER_2_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_2_INFINITY) + result = GFC_INTEGER_2_INFINITY; +#else + result = GFC_INTEGER_2_HUGE; +#endif + if (len <= 0) *dest = GFC_INTEGER_2_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_INTEGER_2_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_2_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_i2 (gfc_array_i2 * const restrict retarray, msrc = mbase; { - result = GFC_INTEGER_2_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_2_INFINITY) + result = GFC_INTEGER_2_INFINITY; +#else + result = GFC_INTEGER_2_HUGE; +#endif +#if defined (GFC_INTEGER_2_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_INTEGER_2_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_INTEGER_2_INFINITY) || defined (GFC_INTEGER_2_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_2_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_2_QUIET_NAN : GFC_INTEGER_2_HUGE; +#else + result = GFC_INTEGER_2_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_i2 (gfc_array_i2 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_i4.c b/libgfortran/generated/minval_i4.c index 72c63705b50..f0cf6991fb7 100644 --- a/libgfortran/generated/minval_i4.c +++ b/libgfortran/generated/minval_i4.c @@ -84,15 +84,15 @@ minval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_i4 (gfc_array_i4 * const restrict retarray, src = base; { - result = GFC_INTEGER_4_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_4_INFINITY) + result = GFC_INTEGER_4_INFINITY; +#else + result = GFC_INTEGER_4_HUGE; +#endif + if (len <= 0) *dest = GFC_INTEGER_4_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_INTEGER_4_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_4_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_i4 (gfc_array_i4 * const restrict retarray, msrc = mbase; { - result = GFC_INTEGER_4_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_4_INFINITY) + result = GFC_INTEGER_4_INFINITY; +#else + result = GFC_INTEGER_4_HUGE; +#endif +#if defined (GFC_INTEGER_4_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_INTEGER_4_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_INTEGER_4_INFINITY) || defined (GFC_INTEGER_4_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_4_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_4_QUIET_NAN : GFC_INTEGER_4_HUGE; +#else + result = GFC_INTEGER_4_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_i8.c b/libgfortran/generated/minval_i8.c index fbdcec9c93b..f1ccca56c37 100644 --- a/libgfortran/generated/minval_i8.c +++ b/libgfortran/generated/minval_i8.c @@ -84,15 +84,15 @@ minval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_i8 (gfc_array_i8 * const restrict retarray, src = base; { - result = GFC_INTEGER_8_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_8_INFINITY) + result = GFC_INTEGER_8_INFINITY; +#else + result = GFC_INTEGER_8_HUGE; +#endif + if (len <= 0) *dest = GFC_INTEGER_8_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_INTEGER_8_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_INTEGER_8_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_i8 (gfc_array_i8 * const restrict retarray, msrc = mbase; { - result = GFC_INTEGER_8_HUGE; - if (len <= 0) +#if defined (GFC_INTEGER_8_INFINITY) + result = GFC_INTEGER_8_INFINITY; +#else + result = GFC_INTEGER_8_HUGE; +#endif +#if defined (GFC_INTEGER_8_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_INTEGER_8_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_INTEGER_8_INFINITY) || defined (GFC_INTEGER_8_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_INTEGER_8_QUIET_NAN) + result = non_empty_p ? GFC_INTEGER_8_QUIET_NAN : GFC_INTEGER_8_HUGE; +#else + result = GFC_INTEGER_8_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_r10.c b/libgfortran/generated/minval_r10.c index 8e1ba756548..b97cac68855 100644 --- a/libgfortran/generated/minval_r10.c +++ b/libgfortran/generated/minval_r10.c @@ -84,15 +84,15 @@ minval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_r10 (gfc_array_r10 * const restrict retarray, src = base; { - result = GFC_REAL_10_HUGE; - if (len <= 0) +#if defined (GFC_REAL_10_INFINITY) + result = GFC_REAL_10_INFINITY; +#else + result = GFC_REAL_10_HUGE; +#endif + if (len <= 0) *dest = GFC_REAL_10_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_REAL_10_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_10_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_r10 (gfc_array_r10 * const restrict retarray, msrc = mbase; { - result = GFC_REAL_10_HUGE; - if (len <= 0) +#if defined (GFC_REAL_10_INFINITY) + result = GFC_REAL_10_INFINITY; +#else + result = GFC_REAL_10_HUGE; +#endif +#if defined (GFC_REAL_10_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_REAL_10_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_REAL_10_INFINITY) || defined (GFC_REAL_10_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_10_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_10_QUIET_NAN) + result = non_empty_p ? GFC_REAL_10_QUIET_NAN : GFC_REAL_10_HUGE; +#else + result = GFC_REAL_10_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_r10 (gfc_array_r10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_r16.c b/libgfortran/generated/minval_r16.c index b028029583c..0c61a3645f7 100644 --- a/libgfortran/generated/minval_r16.c +++ b/libgfortran/generated/minval_r16.c @@ -84,15 +84,15 @@ minval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_r16 (gfc_array_r16 * const restrict retarray, src = base; { - result = GFC_REAL_16_HUGE; - if (len <= 0) +#if defined (GFC_REAL_16_INFINITY) + result = GFC_REAL_16_INFINITY; +#else + result = GFC_REAL_16_HUGE; +#endif + if (len <= 0) *dest = GFC_REAL_16_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_REAL_16_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_16_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_r16 (gfc_array_r16 * const restrict retarray, msrc = mbase; { - result = GFC_REAL_16_HUGE; - if (len <= 0) +#if defined (GFC_REAL_16_INFINITY) + result = GFC_REAL_16_INFINITY; +#else + result = GFC_REAL_16_HUGE; +#endif +#if defined (GFC_REAL_16_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_REAL_16_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_REAL_16_INFINITY) || defined (GFC_REAL_16_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_16_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_16_QUIET_NAN) + result = non_empty_p ? GFC_REAL_16_QUIET_NAN : GFC_REAL_16_HUGE; +#else + result = GFC_REAL_16_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_r16 (gfc_array_r16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_r4.c b/libgfortran/generated/minval_r4.c index d0236848eb1..a860fb0716e 100644 --- a/libgfortran/generated/minval_r4.c +++ b/libgfortran/generated/minval_r4.c @@ -84,15 +84,15 @@ minval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_r4 (gfc_array_r4 * const restrict retarray, src = base; { - result = GFC_REAL_4_HUGE; - if (len <= 0) +#if defined (GFC_REAL_4_INFINITY) + result = GFC_REAL_4_INFINITY; +#else + result = GFC_REAL_4_HUGE; +#endif + if (len <= 0) *dest = GFC_REAL_4_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_REAL_4_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_4_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_r4 (gfc_array_r4 * const restrict retarray, msrc = mbase; { - result = GFC_REAL_4_HUGE; - if (len <= 0) +#if defined (GFC_REAL_4_INFINITY) + result = GFC_REAL_4_INFINITY; +#else + result = GFC_REAL_4_HUGE; +#endif +#if defined (GFC_REAL_4_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_REAL_4_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_REAL_4_INFINITY) || defined (GFC_REAL_4_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_4_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_4_QUIET_NAN) + result = non_empty_p ? GFC_REAL_4_QUIET_NAN : GFC_REAL_4_HUGE; +#else + result = GFC_REAL_4_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_r4 (gfc_array_r4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/minval_r8.c b/libgfortran/generated/minval_r8.c index a86ce9403e0..ebd167b4fa1 100644 --- a/libgfortran/generated/minval_r8.c +++ b/libgfortran/generated/minval_r8.c @@ -84,15 +84,15 @@ minval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ minval_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -142,17 +142,30 @@ minval_r8 (gfc_array_r8 * const restrict retarray, src = base; { - result = GFC_REAL_8_HUGE; - if (len <= 0) +#if defined (GFC_REAL_8_INFINITY) + result = GFC_REAL_8_INFINITY; +#else + result = GFC_REAL_8_HUGE; +#endif + if (len <= 0) *dest = GFC_REAL_8_HUGE; else { for (n = 0; n < len; n++, src += delta) { - if (*src < result) - result = *src; - } +#if defined (GFC_REAL_8_QUIET_NAN) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = GFC_REAL_8_QUIET_NAN; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src; + } *dest = result; } } @@ -162,28 +175,28 @@ minval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -263,15 +276,15 @@ mminval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -308,7 +321,7 @@ mminval_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,17 +336,45 @@ mminval_r8 (gfc_array_r8 * const restrict retarray, msrc = mbase; { - result = GFC_REAL_8_HUGE; - if (len <= 0) +#if defined (GFC_REAL_8_INFINITY) + result = GFC_REAL_8_INFINITY; +#else + result = GFC_REAL_8_HUGE; +#endif +#if defined (GFC_REAL_8_QUIET_NAN) + int non_empty_p = 0; +#endif + if (len <= 0) *dest = GFC_REAL_8_HUGE; else { for (n = 0; n < len; n++, src += delta, msrc += mdelta) { - if (*msrc && *src < result) - result = *src; - } +#if defined (GFC_REAL_8_INFINITY) || defined (GFC_REAL_8_QUIET_NAN) + if (*msrc) + { +#if defined (GFC_REAL_8_QUIET_NAN) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined (GFC_REAL_8_QUIET_NAN) + result = non_empty_p ? GFC_REAL_8_QUIET_NAN : GFC_REAL_8_HUGE; +#else + result = GFC_REAL_8_HUGE; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src; + } *dest = result; } } @@ -344,30 +385,30 @@ mminval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -415,10 +456,10 @@ sminval_r8 (gfc_array_r8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -426,15 +467,15 @@ sminval_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -490,21 +531,21 @@ sminval_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_c10.c b/libgfortran/generated/product_c10.c index 1f834f85d24..cde84b18614 100644 --- a/libgfortran/generated/product_c10.c +++ b/libgfortran/generated/product_c10.c @@ -84,15 +84,15 @@ product_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_c10 (gfc_array_c10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_c10 (gfc_array_c10 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_c10 (gfc_array_c10 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_c10 (gfc_array_c10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_c16.c b/libgfortran/generated/product_c16.c index 20119fae10f..9df23f3a9c4 100644 --- a/libgfortran/generated/product_c16.c +++ b/libgfortran/generated/product_c16.c @@ -84,15 +84,15 @@ product_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_c16 (gfc_array_c16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_c16 (gfc_array_c16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_c16 (gfc_array_c16 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_c16 (gfc_array_c16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_c4.c b/libgfortran/generated/product_c4.c index 231947f34aa..2a7681697fd 100644 --- a/libgfortran/generated/product_c4.c +++ b/libgfortran/generated/product_c4.c @@ -84,15 +84,15 @@ product_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_c4 (gfc_array_c4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_c4 (gfc_array_c4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_c4 (gfc_array_c4 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_c4 (gfc_array_c4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_c8.c b/libgfortran/generated/product_c8.c index e6f8dbbafa1..9be251f92e1 100644 --- a/libgfortran/generated/product_c8.c +++ b/libgfortran/generated/product_c8.c @@ -84,15 +84,15 @@ product_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_c8 (gfc_array_c8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_c8 (gfc_array_c8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_c8 (gfc_array_c8 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_c8 (gfc_array_c8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_i1.c b/libgfortran/generated/product_i1.c index 4f9b5eb3b96..336995f358d 100644 --- a/libgfortran/generated/product_i1.c +++ b/libgfortran/generated/product_i1.c @@ -84,15 +84,15 @@ product_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_i1 (gfc_array_i1 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_i1 (gfc_array_i1 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_i1 (gfc_array_i1 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_i16.c b/libgfortran/generated/product_i16.c index a23a96a8323..51b01e6fd29 100644 --- a/libgfortran/generated/product_i16.c +++ b/libgfortran/generated/product_i16.c @@ -84,15 +84,15 @@ product_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_i16 (gfc_array_i16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_i16 (gfc_array_i16 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_i2.c b/libgfortran/generated/product_i2.c index 40bbe7233e5..7024a120ac8 100644 --- a/libgfortran/generated/product_i2.c +++ b/libgfortran/generated/product_i2.c @@ -84,15 +84,15 @@ product_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_i2 (gfc_array_i2 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_i2 (gfc_array_i2 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_i2 (gfc_array_i2 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_i4.c b/libgfortran/generated/product_i4.c index 0510fca4aba..ccb65f56b7e 100644 --- a/libgfortran/generated/product_i4.c +++ b/libgfortran/generated/product_i4.c @@ -84,15 +84,15 @@ product_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_i4 (gfc_array_i4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_i4 (gfc_array_i4 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_i8.c b/libgfortran/generated/product_i8.c index b9bce58921c..e9a8f890d2e 100644 --- a/libgfortran/generated/product_i8.c +++ b/libgfortran/generated/product_i8.c @@ -84,15 +84,15 @@ product_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_i8 (gfc_array_i8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_i8 (gfc_array_i8 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_r10.c b/libgfortran/generated/product_r10.c index afbf756f544..081c274c421 100644 --- a/libgfortran/generated/product_r10.c +++ b/libgfortran/generated/product_r10.c @@ -84,15 +84,15 @@ product_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_r10 (gfc_array_r10 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_r10 (gfc_array_r10 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_r10 (gfc_array_r10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_r16.c b/libgfortran/generated/product_r16.c index 1b0723ed15a..d1bc0333cc2 100644 --- a/libgfortran/generated/product_r16.c +++ b/libgfortran/generated/product_r16.c @@ -84,15 +84,15 @@ product_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_r16 (gfc_array_r16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_r16 (gfc_array_r16 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_r16 (gfc_array_r16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_r4.c b/libgfortran/generated/product_r4.c index 2f5a8916e45..8228afdef42 100644 --- a/libgfortran/generated/product_r4.c +++ b/libgfortran/generated/product_r4.c @@ -84,15 +84,15 @@ product_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_r4 (gfc_array_r4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_r4 (gfc_array_r4 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_r4 (gfc_array_r4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/product_r8.c b/libgfortran/generated/product_r8.c index 88c49ff85da..825a89f7590 100644 --- a/libgfortran/generated/product_r8.c +++ b/libgfortran/generated/product_r8.c @@ -84,15 +84,15 @@ product_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ product_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ product_r8 (gfc_array_r8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -151,7 +151,7 @@ product_r8 (gfc_array_r8 * const restrict retarray, { result *= *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ product_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray, { result = 1; - if (len <= 0) + if (len <= 0) *dest = 1; else { @@ -332,7 +332,7 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray, if (*msrc) result *= *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ sproduct_r8 (gfc_array_r8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ sproduct_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ sproduct_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_c10.c b/libgfortran/generated/sum_c10.c index 9e32c8636b3..1568e18437c 100644 --- a/libgfortran/generated/sum_c10.c +++ b/libgfortran/generated/sum_c10.c @@ -84,15 +84,15 @@ sum_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_c10 (gfc_array_c10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_c10 (gfc_array_c10 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_c10 (gfc_array_c10 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_c10 (gfc_array_c10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_c10 (gfc_array_c10 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_c10 (gfc_array_c10 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_c10 (gfc_array_c10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_c10 (gfc_array_c10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_c10 (gfc_array_c10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_c16.c b/libgfortran/generated/sum_c16.c index ade7d761ceb..490182768f8 100644 --- a/libgfortran/generated/sum_c16.c +++ b/libgfortran/generated/sum_c16.c @@ -84,15 +84,15 @@ sum_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_c16 (gfc_array_c16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_c16 (gfc_array_c16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_c16 (gfc_array_c16 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_c16 (gfc_array_c16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_c16 (gfc_array_c16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_c16 (gfc_array_c16 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_c16 (gfc_array_c16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_c16 (gfc_array_c16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_c16 (gfc_array_c16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c index ac37cc88ec6..4bd6e428e39 100644 --- a/libgfortran/generated/sum_c4.c +++ b/libgfortran/generated/sum_c4.c @@ -84,15 +84,15 @@ sum_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_c4 (gfc_array_c4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_c4 (gfc_array_c4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_c4 (gfc_array_c4 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_c4 (gfc_array_c4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_c4 (gfc_array_c4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_c4 (gfc_array_c4 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_c4 (gfc_array_c4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_c4 (gfc_array_c4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_c4 (gfc_array_c4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_c8.c b/libgfortran/generated/sum_c8.c index 91db496587f..6512ed2b5a7 100644 --- a/libgfortran/generated/sum_c8.c +++ b/libgfortran/generated/sum_c8.c @@ -84,15 +84,15 @@ sum_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_c8 (gfc_array_c8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_c8 (gfc_array_c8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_c8 (gfc_array_c8 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_COMPLEX_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_c8 (gfc_array_c8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_c8 (gfc_array_c8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_c8 (gfc_array_c8 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_c8 (gfc_array_c8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_c8 (gfc_array_c8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_c8 (gfc_array_c8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_i1.c b/libgfortran/generated/sum_i1.c index b6e10909aa7..29b724d24e2 100644 --- a/libgfortran/generated/sum_i1.c +++ b/libgfortran/generated/sum_i1.c @@ -84,15 +84,15 @@ sum_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_i1 (gfc_array_i1 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_i1 (gfc_array_i1 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_i1 (gfc_array_i1 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_i1 (gfc_array_i1 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_i1 (gfc_array_i1 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_i1 (gfc_array_i1 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_i1 (gfc_array_i1 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_i1 (gfc_array_i1 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_i16.c b/libgfortran/generated/sum_i16.c index 481ef8e51fb..254431358be 100644 --- a/libgfortran/generated/sum_i16.c +++ b/libgfortran/generated/sum_i16.c @@ -84,15 +84,15 @@ sum_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_i16 (gfc_array_i16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_i16 (gfc_array_i16 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_i16 (gfc_array_i16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_i16 (gfc_array_i16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_i16 (gfc_array_i16 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_i16 (gfc_array_i16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_i16 (gfc_array_i16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_i16 (gfc_array_i16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_i2.c b/libgfortran/generated/sum_i2.c index a0d97890d6c..35d3ae05f3a 100644 --- a/libgfortran/generated/sum_i2.c +++ b/libgfortran/generated/sum_i2.c @@ -84,15 +84,15 @@ sum_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_i2 (gfc_array_i2 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_i2 (gfc_array_i2 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_i2 (gfc_array_i2 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_i2 (gfc_array_i2 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_i2 (gfc_array_i2 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_i2 (gfc_array_i2 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_i2 (gfc_array_i2 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_i2 (gfc_array_i2 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_i4.c b/libgfortran/generated/sum_i4.c index 06f2dee4d7b..0d437ff672a 100644 --- a/libgfortran/generated/sum_i4.c +++ b/libgfortran/generated/sum_i4.c @@ -84,15 +84,15 @@ sum_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_i4 (gfc_array_i4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_i4 (gfc_array_i4 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_i4 (gfc_array_i4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_i4 (gfc_array_i4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_i4 (gfc_array_i4 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_i4 (gfc_array_i4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_i4 (gfc_array_i4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_i4 (gfc_array_i4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_i8.c b/libgfortran/generated/sum_i8.c index 9171c4c716e..7a3a443da23 100644 --- a/libgfortran/generated/sum_i8.c +++ b/libgfortran/generated/sum_i8.c @@ -84,15 +84,15 @@ sum_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_i8 (gfc_array_i8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_i8 (gfc_array_i8 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_i8 (gfc_array_i8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_i8 (gfc_array_i8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_i8 (gfc_array_i8 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_i8 (gfc_array_i8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_i8 (gfc_array_i8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_i8 (gfc_array_i8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_r10.c b/libgfortran/generated/sum_r10.c index 8d122129cc7..1386b319de1 100644 --- a/libgfortran/generated/sum_r10.c +++ b/libgfortran/generated/sum_r10.c @@ -84,15 +84,15 @@ sum_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_r10 (gfc_array_r10 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_r10 (gfc_array_r10 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_r10 (gfc_array_r10 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_r10 (gfc_array_r10 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_r10 (gfc_array_r10 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_r10 (gfc_array_r10 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_r10 (gfc_array_r10 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_r10 (gfc_array_r10 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_r16.c b/libgfortran/generated/sum_r16.c index 2cd6150e0f3..56b2cae0e4e 100644 --- a/libgfortran/generated/sum_r16.c +++ b/libgfortran/generated/sum_r16.c @@ -84,15 +84,15 @@ sum_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_r16 (gfc_array_r16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_r16 (gfc_array_r16 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_r16 (gfc_array_r16 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_r16 (gfc_array_r16 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_r16 (gfc_array_r16 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_r16 (gfc_array_r16 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_r16 (gfc_array_r16 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_r16 (gfc_array_r16 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_r4.c b/libgfortran/generated/sum_r4.c index b8a5e68e629..12c0c6948a5 100644 --- a/libgfortran/generated/sum_r4.c +++ b/libgfortran/generated/sum_r4.c @@ -84,15 +84,15 @@ sum_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_r4 (gfc_array_r4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_r4 (gfc_array_r4 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_r4 (gfc_array_r4 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_r4 (gfc_array_r4 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_r4 (gfc_array_r4 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_r4 (gfc_array_r4 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_r4 (gfc_array_r4 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_r4 (gfc_array_r4 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/generated/sum_r8.c b/libgfortran/generated/sum_r8.c index da9cec22372..8f1740b1510 100644 --- a/libgfortran/generated/sum_r8.c +++ b/libgfortran/generated/sum_r8.c @@ -84,15 +84,15 @@ sum_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -128,7 +128,7 @@ sum_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -143,7 +143,7 @@ sum_r8 (gfc_array_r8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -151,7 +151,7 @@ sum_r8 (gfc_array_r8 * const restrict retarray, { result += *src; - } + } *dest = result; } } @@ -161,28 +161,28 @@ sum_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } } @@ -262,15 +262,15 @@ msum_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -307,7 +307,7 @@ msum_r8 (gfc_array_r8 * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -323,7 +323,7 @@ msum_r8 (gfc_array_r8 * const restrict retarray, { result = 0; - if (len <= 0) + if (len <= 0) *dest = 0; else { @@ -332,7 +332,7 @@ msum_r8 (gfc_array_r8 * const restrict retarray, if (*msrc) result += *src; - } + } *dest = result; } } @@ -343,30 +343,30 @@ msum_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } } @@ -414,10 +414,10 @@ ssum_r8 (gfc_array_r8 * const restrict retarray, { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -425,15 +425,15 @@ ssum_r8 (gfc_array_r8 * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -489,21 +489,21 @@ ssum_r8 (gfc_array_r8 * const restrict retarray, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } } diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h index acb02c413b2..a2e200274f5 100644 --- a/libgfortran/libgfortran.h +++ b/libgfortran/libgfortran.h @@ -294,6 +294,36 @@ internal_proto(big_endian); (GFC_INTEGER_16)((((GFC_UINTEGER_16)1) << 127) - 1) #endif +/* M{IN,AX}{LOC,VAL} need also infinities and NaNs if supported. */ + +#ifdef __FLT_HAS_INFINITY__ +# define GFC_REAL_4_INFINITY __builtin_inff () +#endif +#ifdef __DBL_HAS_INFINITY__ +# define GFC_REAL_8_INFINITY __builtin_inf () +#endif +#ifdef __LDBL_HAS_INFINITY__ +# ifdef HAVE_GFC_REAL_10 +# define GFC_REAL_10_INFINITY __builtin_infl () +# endif +# ifdef HAVE_GFC_REAL_16 +# define GFC_REAL_16_INFINITY __builtin_infl () +# endif +#endif +#ifdef __FLT_HAS_QUIET_NAN__ +# define GFC_REAL_4_QUIET_NAN __builtin_nanf ("") +#endif +#ifdef __DBL_HAS_QUIET_NAN__ +# define GFC_REAL_8_QUIET_NAN __builtin_nan ("") +#endif +#ifdef __LDBL_HAS_QUIET_NAN__ +# ifdef HAVE_GFC_REAL_10 +# define GFC_REAL_10_QUIET_NAN __builtin_nanl ("") +# endif +# ifdef HAVE_GFC_REAL_16 +# define GFC_REAL_16_QUIET_NAN __builtin_nanl ("") +# endif +#endif typedef struct descriptor_dimension { diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4 index d86d298a3af..14e501c67fe 100644 --- a/libgfortran/m4/iforeach.m4 +++ b/libgfortran/m4/iforeach.m4 @@ -35,8 +35,8 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, else { if (unlikely (compile_options.bounds_check)) - bounds_iforeach_return ((array_t *) retarray, (array_t *) array, - "u_name"); + bounds_iforeach_return ((array_t *) retarray, (array_t *) array, + "u_name"); } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); @@ -59,43 +59,45 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - dest[n * dstride] = 0; + dest[n * dstride] = 1; { ')dnl define(START_FOREACH_BLOCK, ` while (base) { - { - /* Implementation start. */ + do + { + /* Implementation start. */ ')dnl define(FINISH_FOREACH_FUNCTION, -` /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; +` /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + } + } + while (count[n] == extent[n]); } } }')dnl @@ -184,36 +186,37 @@ void ')dnl define(START_MASKED_FOREACH_BLOCK, `START_FOREACH_BLOCK')dnl define(FINISH_MASKED_FOREACH_FUNCTION, -` /* Implementation end. */ - } - /* Advance to the next element. */ - count[0]++; - base += sstride[0]; - mbase += mstride[0]; +` /* Implementation end. */ + /* Advance to the next element. */ + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); n = 0; - while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the loop. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - } - } + do + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the loop. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + } + } + while (count[n] == extent[n]); } } }')dnl diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4 index 66b1d98b1ad..3c01ae8fe71 100644 --- a/libgfortran/m4/ifunction.m4 +++ b/libgfortran/m4/ifunction.m4 @@ -72,15 +72,15 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) + { + if (n == 0) str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -116,7 +116,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - len = 0; + len = 0; } base = array->data; @@ -131,7 +131,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, { ')dnl define(START_ARRAY_BLOCK, -` if (len <= 0) +` if (len <= 0) *dest = '$1`; else { @@ -139,7 +139,7 @@ define(START_ARRAY_BLOCK, { ')dnl define(FINISH_ARRAY_FUNCTION, - ` } +` } *dest = result; } } @@ -149,28 +149,28 @@ define(FINISH_ARRAY_FUNCTION, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ continue_loop = 0; break; - } - else - { - count[n]++; - base += sstride[n]; - dest += dstride[n]; - } - } + } + else + { + count[n]++; + base += sstride[n]; + dest += dstride[n]; + } + } } }')dnl define(START_MASKED_ARRAY_FUNCTION, @@ -250,15 +250,15 @@ void size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } alloc_size = sizeof (rtype_name) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; @@ -295,7 +295,7 @@ void count[n] = 0; dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); if (extent[n] <= 0) - return; + return; } dest = retarray->data; @@ -311,7 +311,7 @@ void { ')dnl define(START_MASKED_ARRAY_BLOCK, -` if (len <= 0) +` if (len <= 0) *dest = '$1`; else { @@ -319,7 +319,7 @@ define(START_MASKED_ARRAY_BLOCK, { ')dnl define(FINISH_MASKED_ARRAY_FUNCTION, -` } +` } *dest = result; } } @@ -330,30 +330,30 @@ define(FINISH_MASKED_ARRAY_FUNCTION, dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { - /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - base -= sstride[n] * extent[n]; - mbase -= mstride[n] * extent[n]; - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) - { - /* Break out of the look. */ - base = NULL; - break; - } - else - { - count[n]++; - base += sstride[n]; - mbase += mstride[n]; - dest += dstride[n]; - } - } + { + /* When we get to the end of a dimension, reset it and increment + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + base -= sstride[n] * extent[n]; + mbase -= mstride[n] * extent[n]; + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) + { + /* Break out of the look. */ + base = NULL; + break; + } + else + { + count[n]++; + base += sstride[n]; + mbase += mstride[n]; + dest += dstride[n]; + } + } } }')dnl define(SCALAR_ARRAY_FUNCTION, @@ -401,10 +401,10 @@ void { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1); extent[n] = - GFC_DESCRIPTOR_EXTENT(array,n + 1); + GFC_DESCRIPTOR_EXTENT(array,n + 1); if (extent[n] <= 0) - extent[n] = 0; + extent[n] = 0; } if (retarray->data == NULL) @@ -412,15 +412,15 @@ void size_t alloc_size, str; for (n = 0; n < rank; n++) - { - if (n == 0) - str = 1; - else - str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; + { + if (n == 0) + str = 1; + else + str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1]; GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str); - } + } retarray->offset = 0; retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank; @@ -476,21 +476,21 @@ void dest += dstride[0]; n = 0; while (count[n] == extent[n]) - { + { /* When we get to the end of a dimension, reset it and increment - the next dimension. */ - count[n] = 0; - /* We could precalculate these products, but this is a less - frequently used path so probably not worth it. */ - dest -= dstride[n] * extent[n]; - n++; - if (n == rank) + the next dimension. */ + count[n] = 0; + /* We could precalculate these products, but this is a less + frequently used path so probably not worth it. */ + dest -= dstride[n] * extent[n]; + n++; + if (n == rank) return; - else - { - count[n]++; - dest += dstride[n]; - } + else + { + count[n]++; + dest += dstride[n]; + } } } }')dnl diff --git a/libgfortran/m4/iparm.m4 b/libgfortran/m4/iparm.m4 index 51ee40d049d..4ff62474107 100644 --- a/libgfortran/m4/iparm.m4 +++ b/libgfortran/m4/iparm.m4 @@ -29,6 +29,8 @@ define(rtype_qual,`_'rtype_kind)dnl ')dnl define(atype_max, atype_name`_HUGE')dnl define(atype_min,ifelse(regexp(file, `_\(.\)[0-9]*\.c$', `\1'),`i',`(-'atype_max`-1)',`-'atype_max))dnl +define(atype_inf, atype_name`_INFINITY')dnl +define(atype_nan, atype_name`_QUIET_NAN')dnl define(name, regexp(regexp(file, `[^/]*$', `\&'), `^\([^_]*\)_', `\1'))dnl define(`upcase', `translit(`$*', `a-z', `A-Z')')dnl define(`u_name',`regexp(upcase(name),`\([A-Z]*\)',`\1')')dnl diff --git a/libgfortran/m4/maxloc0.m4 b/libgfortran/m4/maxloc0.m4 index ce56ab44d14..aef7b9b8dc7 100644 --- a/libgfortran/m4/maxloc0.m4 +++ b/libgfortran/m4/maxloc0.m4 @@ -34,28 +34,93 @@ include(iforeach.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' FOREACH_FUNCTION( -` atype_name maxval; +` atype_name maxval; +#if defined('atype_nan`) + int fast = 0; +#endif - maxval = atype_min;' -, -` if (*base > maxval || !dest[0]) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - }') +#if defined('atype_inf`) + maxval = -atype_inf; +#else + maxval = atype_min; +#endif', +`#if defined('atype_nan`) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base >= maxval) + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + }') MASKED_FOREACH_FUNCTION( ` atype_name maxval; + int fast = 0; - maxval = atype_min;' -, -` if (*mbase && (*base > maxval || !dest[0])) - { - maxval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - }') +#if defined('atype_inf`) + maxval = -atype_inf; +#else + maxval = atype_min; +#endif', +` } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined('atype_nan`) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base >= maxval) +#endif + { + fast = 1; + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base > maxval) + { + maxval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + }') SCALAR_FOREACH_FUNCTION(`0') #endif diff --git a/libgfortran/m4/maxloc1.m4 b/libgfortran/m4/maxloc1.m4 index 2910384cc48..84b5a35c5c4 100644 --- a/libgfortran/m4/maxloc1.m4 +++ b/libgfortran/m4/maxloc1.m4 @@ -34,24 +34,67 @@ include(ifunction.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' ARRAY_FUNCTION(0, -` atype_name maxval; - maxval = atype_min; - result = 0;', -` if (*src > maxval || !result) - { - maxval = *src; - result = (rtype_name)n + 1; - }') +` atype_name maxval; +#if defined ('atype_inf`) + maxval = -atype_inf; +#else + maxval = atype_min; +#endif + result = 1;', +`#if defined ('atype_nan`) + if (*src >= maxval) + { + maxval = *src; + result = (rtype_name)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src > maxval) + { + maxval = *src; + result = (rtype_name)n + 1; + }') MASKED_ARRAY_FUNCTION(0, -` atype_name maxval; - maxval = atype_min; - result = 0;', -` if (*msrc && (*src > maxval || !result)) - { - maxval = *src; - result = (rtype_name)n + 1; - }') +` atype_name maxval; +#if defined ('atype_inf`) + maxval = -atype_inf; +#else + maxval = atype_min; +#endif +#if defined ('atype_nan`) + rtype_name result2 = 0; +#endif + result = 0;', +` if (*msrc) + { +#if defined ('atype_nan`) + if (!result2) + result2 = (rtype_name)n + 1; + if (*src >= maxval) +#endif + { + maxval = *src; + result = (rtype_name)n + 1; + break; + } + } + } +#if defined ('atype_nan`) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src > maxval) + { + maxval = *src; + result = (rtype_name)n + 1; + }') SCALAR_ARRAY_FUNCTION(0) diff --git a/libgfortran/m4/maxval.m4 b/libgfortran/m4/maxval.m4 index 1fd64a02bd9..7557eb130a1 100644 --- a/libgfortran/m4/maxval.m4 +++ b/libgfortran/m4/maxval.m4 @@ -33,14 +33,55 @@ include(ifunction.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' ARRAY_FUNCTION(atype_min, -` result = atype_min;', -` if (*src > result) - result = *src;') +`#if defined ('atype_inf`) + result = -atype_inf; +#else + result = atype_min; +#endif', +`#if defined ('atype_nan`) + if (*src >= result) + break; + } + if (unlikely (n >= len)) + result = atype_nan; + else for (; n < len; n++, src += delta) + { +#endif + if (*src > result) + result = *src;') MASKED_ARRAY_FUNCTION(atype_min, -` result = atype_min;', -` if (*msrc && *src > result) - result = *src;') +`#if defined ('atype_inf`) + result = -atype_inf; +#else + result = atype_min; +#endif +#if defined ('atype_nan`) + int non_empty_p = 0; +#endif', +`#if defined ('atype_inf`) || defined ('atype_nan`) + if (*msrc) + { +#if defined ('atype_nan`) + non_empty_p = 1; + if (*src >= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined ('atype_nan`) + result = non_empty_p ? atype_nan : atype_min; +#else + result = atype_min; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src > result) + result = *src;') SCALAR_ARRAY_FUNCTION(atype_min) diff --git a/libgfortran/m4/minloc0.m4 b/libgfortran/m4/minloc0.m4 index 45b6e90880a..1345f2df472 100644 --- a/libgfortran/m4/minloc0.m4 +++ b/libgfortran/m4/minloc0.m4 @@ -34,28 +34,93 @@ include(iforeach.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' FOREACH_FUNCTION( -` atype_name minval; +` atype_name minval; +#if defined('atype_nan`) + int fast = 0; +#endif - minval = atype_max;' -, -` if (*base < minval || !dest[0]) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - }') +#if defined('atype_inf`) + minval = atype_inf; +#else + minval = atype_max; +#endif', +`#if defined('atype_nan`) + } + while (0); + if (unlikely (!fast)) + { + do + { + if (*base <= minval) + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + base += sstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { +#endif + if (*base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + }') MASKED_FOREACH_FUNCTION( ` atype_name minval; + int fast = 0; - minval = atype_max;' -, -` if (*mbase && (*base < minval || !dest[0])) - { - minval = *base; - for (n = 0; n < rank; n++) - dest[n * dstride] = count[n] + 1; - }') +#if defined('atype_inf`) + minval = atype_inf; +#else + minval = atype_max; +#endif', +` } + while (0); + if (unlikely (!fast)) + { + do + { + if (*mbase) + { +#if defined('atype_nan`) + if (unlikely (dest[0] == 0)) + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + if (*base <= minval) +#endif + { + fast = 1; + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + break; + } + } + base += sstride[0]; + mbase += mstride[0]; + } + while (++count[0] != extent[0]); + if (likely (fast)) + continue; + } + else do + { + if (*mbase && *base < minval) + { + minval = *base; + for (n = 0; n < rank; n++) + dest[n * dstride] = count[n] + 1; + }') SCALAR_FOREACH_FUNCTION(`0') #endif diff --git a/libgfortran/m4/minloc1.m4 b/libgfortran/m4/minloc1.m4 index 905619a3896..6fa5e69ccc7 100644 --- a/libgfortran/m4/minloc1.m4 +++ b/libgfortran/m4/minloc1.m4 @@ -34,24 +34,67 @@ include(ifunction.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' ARRAY_FUNCTION(0, -` atype_name minval; - minval = atype_max; - result = 0;', -` if (*src < minval || !result) - { - minval = *src; - result = (rtype_name)n + 1; - }') +` atype_name minval; +#if defined ('atype_inf`) + minval = atype_inf; +#else + minval = atype_max; +#endif + result = 1;', +`#if defined ('atype_nan`) + if (*src <= minval) + { + minval = *src; + result = (rtype_name)n + 1; + break; + } + } + for (; n < len; n++, src += delta) + { +#endif + if (*src < minval) + { + minval = *src; + result = (rtype_name)n + 1; + }') MASKED_ARRAY_FUNCTION(0, -` atype_name minval; - minval = atype_max; - result = 0;', -` if (*msrc && (*src < minval || !result)) - { - minval = *src; - result = (rtype_name)n + 1; - }') +` atype_name minval; +#if defined ('atype_inf`) + minval = atype_inf; +#else + minval = atype_max; +#endif +#if defined ('atype_nan`) + rtype_name result2 = 0; +#endif + result = 0;', +` if (*msrc) + { +#if defined ('atype_nan`) + if (!result2) + result2 = (rtype_name)n + 1; + if (*src <= minval) +#endif + { + minval = *src; + result = (rtype_name)n + 1; + break; + } + } + } +#if defined ('atype_nan`) + if (unlikely (n >= len)) + result = result2; + else +#endif + for (; n < len; n++, src += delta, msrc += mdelta) + { + if (*msrc && *src < minval) + { + minval = *src; + result = (rtype_name)n + 1; + }') SCALAR_ARRAY_FUNCTION(0) diff --git a/libgfortran/m4/minval.m4 b/libgfortran/m4/minval.m4 index 9b8be5bc0ff..3acae2eaa88 100644 --- a/libgfortran/m4/minval.m4 +++ b/libgfortran/m4/minval.m4 @@ -33,14 +33,55 @@ include(ifunction.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)' ARRAY_FUNCTION(atype_max, -` result = atype_max;', -` if (*src < result) - result = *src;') +`#if defined ('atype_inf`) + result = atype_inf; +#else + result = atype_max; +#endif', +`#if defined ('atype_nan`) + if (*src <= result) + break; + } + if (unlikely (n >= len)) + result = atype_nan; + else for (; n < len; n++, src += delta) + { +#endif + if (*src < result) + result = *src;') MASKED_ARRAY_FUNCTION(atype_max, -` result = atype_max;', -` if (*msrc && *src < result) - result = *src;') +`#if defined ('atype_inf`) + result = atype_inf; +#else + result = atype_max; +#endif +#if defined ('atype_nan`) + int non_empty_p = 0; +#endif', +`#if defined ('atype_inf`) || defined ('atype_nan`) + if (*msrc) + { +#if defined ('atype_nan`) + non_empty_p = 1; + if (*src <= result) +#endif + break; + } + } + if (unlikely (n >= len)) + { +#if defined ('atype_nan`) + result = non_empty_p ? atype_nan : atype_max; +#else + result = atype_max; +#endif + } + else for (; n < len; n++, src += delta, msrc += mdelta) + { +#endif + if (*msrc && *src < result) + result = *src;') SCALAR_ARRAY_FUNCTION(atype_max) |