Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Tue, Dec 16, 2014 at 4:42 PM, Bin.Cheng amker.ch...@gmail.com wrote: On Thu, Dec 11, 2014 at 8:08 PM, Richard Biener richard.guent...@gmail.com wrote: On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Hi, I further refined the patch. Specifically, I factored out common code, improved comments, and restricted new code in several ways, for example, now iv_ca_replace runs exactly one time for each find_optimal_iv_set; iv_ca_replace only tries to replace one candidate in IVS each time and makes quick return if lower cost set is found; most importantly, iv_ca_replace now checks ALWAYS_PRUNE_CAND_SET_BOUND. The patch is simplified with these changes. As for compilation time, IVOPT isn't regressed obviously for the overloaded case I created, also regression in llvm compilation time benchmarks is gone. I think we could adapt data structure in IVOPT to make it faster, for example, record information in candidate about which uses are represented by each cand, sort candidates by cost for each iv use. I may do some refactor in next stage1. Bootstrap on x86_64, test ongoing. So OK if no regressions? Thanks, bin 2014-12-17 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (cheaper_cost_with_cand): New function. (iv_ca_replace): New function. (try_improve_iv_set): New parameter try_replace_p. Break local optimal fixed-point by calling iv_ca_replace. (find_optimal_iv_set_1): Pass new argument to try_improve_iv_set. gcc/testsuite/ChangeLog 2014-12-17 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test. Index: gcc/testsuite/gcc.target/aarch64/pr62178.c === --- gcc/testsuite/gcc.target/aarch64/pr62178.c (revision 0) +++ gcc/testsuite/gcc.target/aarch64/pr62178.c (revision 0) @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options -O3 } */ + +int a[30 +1][30 +1], b[30 +1][30 +1], r[30 +1][30 +1]; + +void foo (void) { + int i, j, k; + + for ( i = 1; i = 30; i++ ) +for ( j = 1; j = 30; j++ ) { + r[i][j] = 0; + for(k = 1; k = 30; k++ ) +r[i][j] += a[i][k]*b[k][j]; +} +} + +/* { dg-final { scan-assembler ld1r\\t\{v\[0-9\]+\.} } */ Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 218200) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5862,6
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Wed, Dec 17, 2014 at 10:47 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Tue, Dec 16, 2014 at 4:42 PM, Bin.Cheng amker.ch...@gmail.com wrote: On Thu, Dec 11, 2014 at 8:08 PM, Richard Biener richard.guent...@gmail.com wrote: On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Hi, I further refined the patch. Specifically, I factored out common code, improved comments, and restricted new code in several ways, for example, now iv_ca_replace runs exactly one time for each find_optimal_iv_set; iv_ca_replace only tries to replace one candidate in IVS each time and makes quick return if lower cost set is found; most importantly, iv_ca_replace now checks ALWAYS_PRUNE_CAND_SET_BOUND. The patch is simplified with these changes. As for compilation time, IVOPT isn't regressed obviously for the overloaded case I created, also regression in llvm compilation time benchmarks is gone. I think we could adapt data structure in IVOPT to make it faster, for example, record information in candidate about which uses are represented by each cand, sort candidates by cost for each iv use. I may do some refactor in next stage1. Yes, I agree. A similar thing is to use affine combinations throughout them to avoid going into/out of that representation all the time (I think I've suggested that elsewhere). Bootstrap on x86_64, test ongoing. So OK if no regressions? Ok. Thanks, Richard. Thanks, bin 2014-12-17 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (cheaper_cost_with_cand): New function. (iv_ca_replace): New function. (try_improve_iv_set): New parameter try_replace_p. Break local optimal fixed-point by calling iv_ca_replace. (find_optimal_iv_set_1): Pass new argument to try_improve_iv_set. gcc/testsuite/ChangeLog 2014-12-17 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Thu, Dec 11, 2014 at 8:08 PM, Richard Biener richard.guent...@gmail.com wrote: On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Hi Jeff Richard, I updated patch according to your review comments. Is this version looks good? I didn't find cases in PR47344 which exercising IVOPT, but I produced one case from PR53852 which runs ivopt for ~17% of total time (28s). This patch does increase IVOPT time to 18%. Unfortunately, I tried the other restriction, it doesn't work as well as this one on spec2k6, if I understood the method correctly. Hi Sebastian, Thanks for help! I managed to run llvm compilation time tests successfully as you suggested. Case Multisource/Benchmarks/mafft/pairlocalalign is regressed but I can't reproduce it in cmd. The running time of compilation of pairlocalalign.c is too small comparing to the results. I also tried to invoke it by using RunSafely.sh but no lucky either. So any documentation on this? Thanks very much! Thanks, bin 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (cheaper_cost_with_cand): New function. (iv_ca_replace): New function. (try_improve_iv_set): New parameter try_replace_p. Replace candidates in IVS by calling iv_ca_replace. (find_optimal_iv_set_1): Pass new argument to try_improve_iv_set. gcc/testsuite/ChangeLog 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test. Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 218200) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5862,6 +5862,127 @@ iv_ca_prune (struct ivopts_data *data, struct iv_c return best_cost; } +/* Check if CAND_IDX is a candidate other than OLD_CAND and has + cheaper local cost for USE than BEST_CP. Return pointer to + the corresponding cost_pair, otherwise just return BEST_CP. */ + +static struct cost_pair* +cheaper_cost_with_cand (struct ivopts_data *data, struct iv_use *use, + unsigned int cand_idx, struct iv_cand *old_cand, + struct cost_pair *best_cp) +{ + struct iv_cand *cand; + struct cost_pair *cp; + + gcc_assert (old_cand != NULL); + if (cand_idx == old_cand-id) +return best_cp; + + cand = iv_cand (data, cand_idx); + cp = get_use_iv_cost (data, use, cand); + if (cp != NULL + (best_cp == NULL ||
Fwd: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
CCing Sebastian. Thanks, bin -- Forwarded message -- From: Bin.Cheng amker.ch...@gmail.com Date: Tue, Dec 16, 2014 at 4:42 PM Subject: Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try. To: Richard Biener richard.guent...@gmail.com Cc: Bin Cheng bin.ch...@arm.com, GCC Patches gcc-patches@gcc.gnu.org, Zdenek Dvorak o...@ucw.cz On Thu, Dec 11, 2014 at 8:08 PM, Richard Biener richard.guent...@gmail.com wrote: On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Hi Jeff Richard, I updated patch according to your review comments. Is this version looks good? I didn't find cases in PR47344 which exercising IVOPT, but I produced one case from PR53852 which runs ivopt for ~17% of total time (28s). This patch does increase IVOPT time to 18%. Unfortunately, I tried the other restriction, it doesn't work as well as this one on spec2k6, if I understood the method correctly. Hi Sebastian, Thanks for help! I managed to run llvm compilation time tests successfully as you suggested. Case Multisource/Benchmarks/mafft/pairlocalalign is regressed but I can't reproduce it in cmd. The running time of compilation of pairlocalalign.c is too small comparing to the results. I also tried to invoke it by using RunSafely.sh but no lucky either. So any documentation on this? Thanks very much! Thanks, bin 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (cheaper_cost_with_cand): New function. (iv_ca_replace): New function. (try_improve_iv_set): New parameter try_replace_p. Replace candidates in IVS by calling iv_ca_replace. (find_optimal_iv_set_1): Pass new argument to try_improve_iv_set. gcc/testsuite/ChangeLog 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test. Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 218200) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5862,6 +5862,127 @@ iv_ca_prune (struct ivopts_data *data, struct iv_c return best_cost; } +/* Check if CAND_IDX is a candidate other than OLD_CAND and has + cheaper local cost for USE than BEST_CP. Return pointer to + the corresponding cost_pair, otherwise just return BEST_CP. */ + +static struct cost_pair* +cheaper_cost_with_cand (struct ivopts_data *data, struct iv_use *use, + unsigned int
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
Please ignore this one, I will further refine it. Sorry for disturbing! Thanks, bin On Tue, Dec 16, 2014 at 4:42 PM, Bin.Cheng amker.ch...@gmail.com wrote: On Thu, Dec 11, 2014 at 8:08 PM, Richard Biener richard.guent...@gmail.com wrote: On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Hi Jeff Richard, I updated patch according to your review comments. Is this version looks good? I didn't find cases in PR47344 which exercising IVOPT, but I produced one case from PR53852 which runs ivopt for ~17% of total time (28s). This patch does increase IVOPT time to 18%. Unfortunately, I tried the other restriction, it doesn't work as well as this one on spec2k6, if I understood the method correctly. Hi Sebastian, Thanks for help! I managed to run llvm compilation time tests successfully as you suggested. Case Multisource/Benchmarks/mafft/pairlocalalign is regressed but I can't reproduce it in cmd. The running time of compilation of pairlocalalign.c is too small comparing to the results. I also tried to invoke it by using RunSafely.sh but no lucky either. So any documentation on this? Thanks very much! Thanks, bin 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (cheaper_cost_with_cand): New function. (iv_ca_replace): New function. (try_improve_iv_set): New parameter try_replace_p. Replace candidates in IVS by calling iv_ca_replace. (find_optimal_iv_set_1): Pass new argument to try_improve_iv_set. gcc/testsuite/ChangeLog 2014-12-16 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: Fwd: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
Bin.Cheng wrote: Multisource/Benchmarks/mafft/pairlocalalign is regressed but I can't reproduce it in cmd. The running time of compilation of pairlocalalign.c is too small comparing to the results. I also tried to invoke it by using RunSafely.sh but no lucky either. So any documentation on this? Thanks very much! There is not much documentation on running the llvm test-suite. Here is how I do rerun a single benchmark: In the build directory, if it is clean, i.e., you have just configure'd, you can run make clean and that will traverse all the directories and create them if they do not exist. If you have already run make TEST=simple you do not have to run make clean as you already have all the directories under the build dir. Once you have the benchmark dir in the build dir, just do: $ cd Multisource/Benchmarks/mafft/pairlocalalign $ make clean $ make TEST=simple [... all other variables as mentioned before ...] this way you will only run that specific benchmark. If you need to see which commands RunSafely.sh is running, I would suggest you add some echo $CMD or set -x in there. I think by default you do have the compiler commands. Sebastian
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
Bin.Cheng wrote: do we have some compilation time benchmarks for GCC? I'm using the llvm test-suite to see compile time differences: $ git clone http://llvm.org/git/test-suite.git /path/to/test-suite $ /path/to/test-suite/configure --without-llvmsrc --without-llvmobj --with-externals=/path/to/spec $ make -k TEST=simple TARGET_LLVMGCC=/path/to/gcc TARGET_CXX=/path/to/g++ TARGET_CC=/path/to/gcc TARGET_LLVMGXX=/path/to/g++ CC_UNDER_TEST_IS_GCC=1 TARGET_FLAGS= USE_REFERENCE_OUTPUT=1 CC_UNDER_TEST_TARGET_IS_AARCH64=1 OPTFLAGS=-O3 LLC_OPTFLAGS=-O3 ENABLE_OPTIMIZED=1 ARCH=AArch64 ENABLE_HASHED_PROGRAM_OUTPUT=1 DISABLE_JIT=1 report report.simple.csv $ head -1 report.simple.csv Program,CC,CC_Time,CC_Real_Time,Exec,Exec_Time,Exec_Real_Time $ awk -F, '{print $1, $3 }' report.simple.csv Here is how to get benchmark code size: $ make -k TEST=codesize TARGET_LLVMGCC=/path/to/gcc TARGET_CXX=/path/to/g++ TARGET_CC=/path/to/gcc TARGET_LLVMGXX=/path/to/g++ TARGET_FLAGS= USE_REFERENCE_OUTPUT=1 CC_UNDER_TEST_TARGET_IS_AARCH64=1 CC_UNDER_TEST_IS_CLANG=1 OPTFLAGS=-O3 LLC_OPTFLAGS=-O3 ENABLE_OPTIMIZED=1 ARCH=AArch64 ENABLE_HASHED_PROGRAM_OUTPUT=1 DISABLE_JIT=1 2/dev/null | grep ^size: test.codesize.txt
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? BTW, do we have some compilation time benchmarks for GCC? Thanks, bin + for (i = 0; i n_iv_cands (data); i++) + { ... + iv_ca_replace (data, ivs, cand, act_delta, tmp_delta); ... and +static void +iv_ca_replace (struct ivopts_data *data, struct iv_ca *ivs, + struct iv_cand *cand, struct iv_ca_delta *act_delta, + struct iv_ca_delta **delta) +{ ... + for (i = 0; i ivs-upto; i++) +{ ... + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { possibly cubic if ivs-upto is of similar value. I wonder if it is possible to restrict this to the single IV with the largest delta? After all we are iterating try_improve_iv_set. Alternatively move the handling out of iteration completey, thus into the caller of try_improve_iv_set? Note that compile-time issues always arise in auto-generated code, not during GCC bootstrap. Richard. 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Thu, Dec 11, 2014 at 5:56 PM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? By +90%, I mean 90% from the 6% improved loops, not the total loop number... BTW, do we have some compilation time benchmarks for GCC? Thanks, bin + for (i = 0; i n_iv_cands (data); i++) + { ... + iv_ca_replace (data, ivs, cand, act_delta, tmp_delta); ... and +static void +iv_ca_replace (struct ivopts_data *data, struct iv_ca *ivs, + struct iv_cand *cand, struct iv_ca_delta *act_delta, + struct iv_ca_delta **delta) +{ ... + for (i = 0; i ivs-upto; i++) +{ ... + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { possibly cubic if ivs-upto is of similar value. I wonder if it is possible to restrict this to the single IV with the largest delta? After all we are iterating try_improve_iv_set. Alternatively move the handling out of iteration completey, thus into the caller of try_improve_iv_set? Note that compile-time issues always arise in auto-generated code, not during GCC bootstrap. Richard. 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Thu, Dec 11, 2014 at 10:56 AM, Bin.Cheng amker.ch...@gmail.com wrote: On Wed, Dec 10, 2014 at 9:47 PM, Richard Biener richard.guent...@gmail.com wrote: On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): Yes, I worried about that too, that's why I measured the bootstrap time. One way is restrict this procedure one time for each loop. I already tried that and it can capture +90% loops. Is this sounds reasonable? Yes. That's my suggestion to handle it in the caller of try_improve_iv_set? BTW, do we have some compilation time benchmarks for GCC? There are various testcases linked from PR47344, I don't remember any particular one putting load on IVOPTs (but I do remember seeing IVOPTs in the ~25% area in -ftime-report for some testcases). Thanks, Richard. Thanks, bin + for (i = 0; i n_iv_cands (data); i++) + { ... + iv_ca_replace (data, ivs, cand, act_delta, tmp_delta); ... and +static void +iv_ca_replace (struct ivopts_data *data, struct iv_ca *ivs, + struct iv_cand *cand, struct iv_ca_delta *act_delta, + struct iv_ca_delta **delta) +{ ... + for (i = 0; i ivs-upto; i++) +{ ... + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { possibly cubic if ivs-upto is of similar value. I wonder if it is possible to restrict this to the single IV with the largest delta? After all we are iterating try_improve_iv_set. Alternatively move the handling out of iteration completey, thus into the caller of try_improve_iv_set? Note that compile-time issues always arise in auto-generated code, not during GCC bootstrap. Richard. 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Fri, Dec 5, 2014 at 1:15 PM, Bin Cheng bin.ch...@arm.com wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? The algorithm seems to be quadratic in the number of IV candidates (at least): + for (i = 0; i n_iv_cands (data); i++) + { ... + iv_ca_replace (data, ivs, cand, act_delta, tmp_delta); ... and +static void +iv_ca_replace (struct ivopts_data *data, struct iv_ca *ivs, + struct iv_cand *cand, struct iv_ca_delta *act_delta, + struct iv_ca_delta **delta) +{ ... + for (i = 0; i ivs-upto; i++) +{ ... + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { possibly cubic if ivs-upto is of similar value. I wonder if it is possible to restrict this to the single IV with the largest delta? After all we are iterating try_improve_iv_set. Alternatively move the handling out of iteration completey, thus into the caller of try_improve_iv_set? Note that compile-time issues always arise in auto-generated code, not during GCC bootstrap. Richard. 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On 12/05/14 05:15, Bin Cheng wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? 2014-12-03 Bin chengbin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin chengbin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test. pr62178-20141202.txt Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 217828) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5718,6 +5718,85 @@ iv_ca_extend (struct ivopts_data *data, struct iv_ return cost; } +/* Try replacing candidates in IVS which are recorded by list ACT_DELTA to + lower cost candidates. CAND is the one won't be replaced. Replacement + of candidate is recorded in list DELTA. */ Is this better written as: Try replacing candidates in IVS with IVs related to CAND (which is not changed) if doing so lowers the IV cost. ACT_DELTA is the recorded list of candidates. Replacement of candidate is recorded in list DELTA. ? + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } + else + { + EXECUTE_IF_SET_IN_BITMAP (use-related_cands, 0, j, bi) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } The loop bodies here are duplicated. Can you factor them into a function so that this looks something like if (data-consider_all_candidates) { for (...) refactored_code (some arguments) } else { EXECUTE_IF_SET_IN_BITMAP (...) refactored_code (some arguments) @@ -6042,8 +6121,50 @@ try_improve_iv_set (struct ivopts_data *data, stru /* Try removing the candidates from the set instead. */ best_cost = iv_ca_prune (data, ivs, NULL, best_delta); - /* Nothing more we can do. */ if (!best_delta) + { + /* So far candidate selecting algorithm tends to choose fewer IVs +so that it can handle cases in which loops have many variables +but the best choice is often to use only one general biv. One +weakness is it can't handle opposite cases, in which different +candidates should be chosen with respect to each use. To solve +the problem, we replace candidate of some uses with lower cost +one, thus general algorithm can have a chance to find optimal +set for these cases. */ So, in essence we've computed a best cost with minimal IVs and you're using that result as an initial state
Re: [PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
On Wed, Dec 10, 2014 at 6:58 AM, Jeff Law l...@redhat.com wrote: On 12/05/14 05:15, Bin Cheng wrote: Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? 2014-12-03 Bin chengbin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin chengbin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test. pr62178-20141202.txt Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 217828) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5718,6 +5718,85 @@ iv_ca_extend (struct ivopts_data *data, struct iv_ return cost; } +/* Try replacing candidates in IVS which are recorded by list ACT_DELTA to + lower cost candidates. CAND is the one won't be replaced. Replacement + of candidate is recorded in list DELTA. */ Thanks for the review. Is this better written as: Try replacing candidates in IVS with IVs related to CAND (which is not changed) if doing so lowers the IV cost. ACT_DELTA is the recorded list of candidates. Replacement of candidate is recorded in list DELTA. ? Will refine that. + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } + else + { + EXECUTE_IF_SET_IN_BITMAP (use-related_cands, 0, j, bi) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } The loop bodies here are duplicated. Can you factor them into a function so that this looks something like if (data-consider_all_candidates) { for (...) refactored_code (some arguments) } else { EXECUTE_IF_SET_IN_BITMAP (...) refactored_code (some arguments) Will do that. @@ -6042,8 +6121,50 @@ try_improve_iv_set (struct ivopts_data *data, stru /* Try removing the candidates from the set instead. */ best_cost = iv_ca_prune (data, ivs, NULL, best_delta); - /* Nothing more we can do. */ if (!best_delta) + { + /* So far candidate selecting algorithm tends to choose fewer IVs +so that it can handle cases in which loops have many variables +but the best choice is often to use only one general biv. One +weakness is it can't handle opposite cases, in which different +candidates should be chosen with respect to each use. To solve +the problem, we replace candidate of
[PATCH PR62178]Improve candidate selecting in IVOPT, 2nd try.
Hi, Though PR62178 is hidden by recent cost change in aarch64 backend, the ivopt issue still exists. Current candidate selecting algorithm tends to select fewer candidates given below reasons: 1) to better handle loops with many induction uses but the best choice is one generic basic induction variable; 2) to keep compilation time low. One fundamental weakness of the strategy is the opposite situation can't be handled properly sometimes. For these cases the best choice is each induction variable has its own candidate. This patch fixes the problem by shuffling candidate set after fix-point is reached by current implementation. The reason why this strategy works is it replaces candidate set by selecting local optimal candidate for some induction uses, and the new candidate set (has lower cost) is exact what we want in the mentioned case. Instrumentation data shows this can find better candidates set for ~6% loops in spec2006 on x86_64, and ~4% on aarch64. This patch actually is extension to the first version patch posted at https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02620.html, that only adds another selecting pass with special seed set (more or less like the shuffled set in this patch). Data also confirms this patch can find optimal sets for most loops found by the first one, as well as optimal sets for many new loops. Bootstrap and test on x86_64, no regression on benchmarks. Bootstrap and test on aarch64. Since this patch only selects candidate set with lower cost, any regressions revealed are latent bugs of other components in GCC. I also collected GCC bootstrap time on x86_64, no regression either. Is this OK? 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * tree-ssa-loop-ivopts.c (iv_ca_replace): New function. (try_improve_iv_set): Shuffle candidates set in order to handle case in which candidate wrto each iv use should be selected. gcc/testsuite/ChangeLog 2014-12-03 Bin Cheng bin.ch...@arm.com PR tree-optimization/62178 * gcc.target/aarch64/pr62178.c: New test.Index: gcc/tree-ssa-loop-ivopts.c === --- gcc/tree-ssa-loop-ivopts.c (revision 217828) +++ gcc/tree-ssa-loop-ivopts.c (working copy) @@ -5718,6 +5718,85 @@ iv_ca_extend (struct ivopts_data *data, struct iv_ return cost; } +/* Try replacing candidates in IVS which are recorded by list ACT_DELTA to + lower cost candidates. CAND is the one won't be replaced. Replacement + of candidate is recorded in list DELTA. */ + +static void +iv_ca_replace (struct ivopts_data *data, struct iv_ca *ivs, + struct iv_cand *cand, struct iv_ca_delta *act_delta, + struct iv_ca_delta **delta) +{ + unsigned int i, j; + bitmap_iterator bi; + struct iv_use *use; + struct iv_cand *cnd; + bool should_replace; + struct iv_ca_delta *act; + struct cost_pair *old_cp, *best_cp = NULL, *cp; + + *delta = NULL; + for (i = 0; i ivs-upto; i++) +{ + use = iv_use (data, i); + + old_cp = iv_ca_cand_for_use (ivs, use); + if (old_cp-cand == cand) + continue; + + should_replace = false; + for (act = act_delta; act; act = act-next_change) + if (old_cp-cand == act-old_cp-cand) + { + should_replace = true; + break; + } + if (!should_replace) + continue; + + best_cp = NULL; + if (data-consider_all_candidates) + { + for (j = 0; j n_iv_cands (data); j++) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } + else + { + EXECUTE_IF_SET_IN_BITMAP (use-related_cands, 0, j, bi) + { + if (j == old_cp-cand-id) + continue; + + cnd = iv_cand (data, j); + cp = get_use_iv_cost (data, use, cnd); + if (!cp) + continue; + + if (best_cp == NULL || cheaper_cost_pair (cp, best_cp)) + best_cp = cp; + } + } + + if (!best_cp) + continue; + + *delta = iv_ca_delta_add (use, old_cp, best_cp, *delta); +} + + return; +} + /* Try narrowing set IVS by removing CAND. Return the cost of the new set and store the differences in DELTA. START is the candidate with which we start narrowing. */ @@ -6042,8 +6121,50 @@ try_improve_iv_set (struct ivopts_data *data, stru /* Try removing the candidates from the set instead. */ best_cost = iv_ca_prune (data, ivs, NULL, best_delta); - /* Nothing more we can do. */ if (!best_delta) + { + /* So far candidate selecting algorithm tends to choose fewer IVs +so that it can handle cases in