Hi!

Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk as
obvious.

2020-02-25  Jakub Jelinek  <ja...@redhat.com>

        PR other/93912
        * config/sh/sh.c (expand_cbranchdi4): Fix comment typo, probablity
        -> probability.
        * cfghooks.c (verify_flow_info): Likewise.
        * predict.c (combine_predictions_for_bb): Likewise.
        * bb-reorder.c (connect_better_edge_p): Likewise.  Fix comment typo,
        sucessor -> successor.
        (find_traces_1_round): Fix comment typo, destinarion -> destination.
        * omp-expand.c (expand_oacc_for): Fix comment typo, sucessors ->
        successors.
        * tree-ssa-loop-ch.c (should_duplicate_loop_header_p): Fix dump
        message typo, sucessors -> successors.
c/
        * gimple-parser.c (c_parser_gimple_parse_bb_spec_edge_probability):
        Rename last argument from probablity to probability.

--- gcc/config/sh/sh.c.jj       2020-02-10 09:12:58.356988625 +0100
+++ gcc/config/sh/sh.c  2020-02-25 11:04:54.779223657 +0100
@@ -2108,7 +2108,7 @@ expand_cbranchdi4 (rtx *operands, enum r
       lsw_taken = EQ;
       if (prob.initialized_p ())
        {
-         /* FIXME: This is not optimal.  We do not really know the probablity
+         /* FIXME: This is not optimal.  We do not really know the probability
             that values differ by MCW only, but we should probably distribute
             probabilities more evenly.  */
          msw_skip_prob = rev_prob;
--- gcc/cfghooks.c.jj   2020-01-12 11:54:36.216416381 +0100
+++ gcc/cfghooks.c      2020-02-25 11:05:09.112012979 +0100
@@ -153,7 +153,7 @@ verify_flow_info (void)
          err = 1;
        }
       /* FIXME: Graphite and SLJL and target code still tends to produce
-        edges with no probablity.  */
+        edges with no probability.  */
       if (profile_status_for_fn (cfun) >= PROFILE_GUESSED
           && !bb->count.initialized_p () && !flag_graphite && 0)
        {
@@ -170,7 +170,7 @@ verify_flow_info (void)
              err = 1;
            }
          /* FIXME: Graphite and SLJL and target code still tends to produce
-            edges with no probablity.  */
+            edges with no probability.  */
          if (profile_status_for_fn (cfun) >= PROFILE_GUESSED
              && !e->probability.initialized_p () && !flag_graphite && 0)
            {
--- gcc/predict.c.jj    2020-01-17 09:31:28.671194108 +0100
+++ gcc/predict.c       2020-02-25 11:04:59.704151265 +0100
@@ -1367,7 +1367,7 @@ combine_predictions_for_bb (basic_block
 
 
   /* If we have only one successor which is unknown, we can compute missing
-     probablity.  */
+     probability.  */
   if (nunknown == 1)
     {
       profile_probability prob = profile_probability::always ();
--- gcc/bb-reorder.c.jj 2020-01-12 11:54:36.192416743 +0100
+++ gcc/bb-reorder.c    2020-02-25 11:11:58.549002324 +0100
@@ -592,7 +592,7 @@ find_traces_1_round (int branch_th, prof
          /* If the best destination has multiple successors or predecessors,
             don't allow it to be added when optimizing for size.  This makes
             sure predecessors with smaller index are handled before the best
-            destinarion.  It breaks long trace and reduces long jumps.
+            destination.  It breaks long trace and reduces long jumps.
 
             Take if-then-else as an example.
                A
@@ -1023,8 +1023,8 @@ connect_better_edge_p (const_edge e, boo
       e_index = e->src->index;
 
       /* We are looking for predecessor, so probabilities are not that
-        informative.  We do not want to connect A to B becuse A has
-        only one sucessor (probablity is 100%) while there is edge
+        informative.  We do not want to connect A to B because A has
+        only one successor (probability is 100%) while there is edge
         A' to B where probability is 90% but which is much more frequent.  */
       if (e->count () > cur_best_edge->count ())
        /* The edge has higher probability than the temporary best edge.  */
--- gcc/omp-expand.c.jj 2020-01-12 11:54:36.686409290 +0100
+++ gcc/omp-expand.c    2020-02-25 11:14:23.133880357 +0100
@@ -6029,8 +6029,8 @@ expand_oacc_for (struct omp_region *regi
   basic_block cont_bb = region->cont; /* BB ending in OMP_CONTINUE  */
   basic_block bottom_bb = NULL;
 
-  /* entry_bb has two sucessors; the branch edge is to the exit
-     block,  fallthrough edge to body.  */
+  /* entry_bb has two successors; the branch edge is to the exit
+     block, fallthrough edge to body.  */
   gcc_assert (EDGE_COUNT (entry_bb->succs) == 2
              && BRANCH_EDGE (entry_bb)->dest == exit_bb);
 
--- gcc/tree-ssa-loop-ch.c.jj   2020-01-12 11:54:38.504381862 +0100
+++ gcc/tree-ssa-loop-ch.c      2020-02-25 11:12:55.764162615 +0100
@@ -83,7 +83,7 @@ should_duplicate_loop_header_p (basic_bl
     {
       if (dump_file && (dump_flags & TDF_DETAILS))
        fprintf (dump_file,
-                "  Not duplicating bb %i: both sucessors are in loop.\n",
+                "  Not duplicating bb %i: both successors are in loop.\n",
                 loop->num);
       return false;
     }
--- gcc/c/gimple-parser.c.jj    2020-01-12 11:54:36.213416426 +0100
+++ gcc/c/gimple-parser.c       2020-02-25 11:05:39.101572175 +0100
@@ -149,12 +149,13 @@ static bool
 c_parser_gimple_parse_bb_spec_edge_probability (tree val,
                                                gimple_parser &parser,
                                                int *index,
-                                               profile_probability *probablity)
+                                               profile_probability
+                                               *probability)
 {
   bool return_p = c_parser_gimple_parse_bb_spec (val, index);
   if (return_p)
     {
-      *probablity = profile_probability::uninitialized ();
+      *probability = profile_probability::uninitialized ();
       /* Parse frequency if provided.  */
       if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
        {
@@ -188,7 +189,7 @@ c_parser_gimple_parse_bb_spec_edge_proba
            }
 
          unsigned int value = TREE_INT_CST_LOW (f);
-         *probablity = profile_probability (value, quality);
+         *probability = profile_probability (value, quality);
 
          c_parser_consume_token (parser);
          if (!c_parser_require (parser, CPP_CLOSE_PAREN, "expected %<)%>"))

        Jakub

Reply via email to