| Message ID | 48369cc7-884d-9eef-2e16-9bc2bfe825f1@gjlay.de |
|---|---|
| State | New |
| Headers | show |
| Series | [avr] Fix PR109650 wrong code | expand |
Here is a revised version of the patch. The difference to the previous one is that it adds some combine patterns for *cbranch insns that were lost in the PR92729 transition. The post-reload part of the patterns were still there. The new patterns are slightly more general in that they also handle fixed-point modes. Apart from that, the patch behaves the same: Am 15.05.23 um 20:05 schrieb Georg-Johann Lay: > This patch fixes a wrong-code bug in the wake of PR92729, the transition > that turned the AVR backend from cc0 to CCmode. In cc0, the insn that > uses cc0 like a conditional branch always follows the cc0 setter, which > is no more the case with CCmode where set and use of REG_CC might be in > different basic blocks. > > This patch removes the machine-dependent reorg pass in avr_reorg entirely. > > It is replaced by a new, AVR specific mini-pass that runs prior to > split2. Canonicalization of comparisons away from the "difficult" > codes GT[U] and LE[U] is now mostly performed by implementing > TARGET_CANONICALIZE_COMPARISON. > > Moreover: > > * Text peephole conditions get "dead_or_set_regno_p (*, REG_CC)" as > needed. > > * RTL peephole conditions get "peep2_regno_dead_p (*, REG_CC)" as > needed. > > * Conditional branches no more clobber REG_CC. > > * insn output for compares looks ahead to determine the branch mode in > use. This needs also "dead_or_set_regno_p (*, REG_CC)". > > * Add RTL peepholes for decrement-and-branch detection. > > Finally, it fixes some of the many indentation glitches left over from > PR92729. > > Ok? > > I'd also backport this one because all of v12+ is affected by the wrong > code. Johann -- gcc/ PR target/109650 PR target/97279 * config/avr/avr-passes.def (avr_pass_ifelse): Insert new pass. * config/avr/avr.cc (avr_pass_ifelse): New RTL pass. (avr_pass_data_ifelse): New pass_data for it. (make_avr_pass_ifelse, avr_redundant_compare, avr_cbranch_cost) (avr_canonicalize_comparison, avr_out_plus_set_ZN) (avr_out_cmp_ext): New functions. (compare_condtition): Make sure REG_CC dies in the branch insn. (avr_rtx_costs_1): Add computation of cbranch costs. (avr_adjust_insn_length) [ADJUST_LEN_ADD_SET_ZN, ADJUST_LEN_CMP_ZEXT]: [ADJUST_LEN_CMP_SEXT]Handle them. (TARGET_CANONICALIZE_COMPARISON): New define. (avr_simplify_comparison_p, compare_diff_p, avr_compare_pattern) (avr_reorg_remove_redundant_compare, avr_reorg): Remove functions. (TARGET_MACHINE_DEPENDENT_REORG): Remove define. * avr-protos.h (avr_simplify_comparison_p): Remove proto. (make_avr_pass_ifelse, avr_out_plus_set_ZN, cc_reg_rtx) (avr_out_cmp_zext): New Protos * config/avr/avr.md (branch, difficult_branch): Don't split insns. (*cbranchhi.zero-extend.0", *cbranchhi.zero-extend.1") (*swapped_tst<mode>, *add.for.eqne.<mode>): New insns. (*cbranch<mode>4): Rename to cbranch<mode>4_insn. (define_peephole): Add dead_or_set_regno_p(insn,REG_CC) as needed. (define_deephole2): Add peep2_regno_dead_p(*,REG_CC) as needed. Add new RTL peepholes for decrement-and-branch and *swapped_tst<mode>. Rework signtest-and-branch peepholes for *sbrx_branch<mode>. (adjust_len) [add_set_ZN, cmp_zext]: New. (QIPSI): New mode iterator. (ALLs1, ALLs2, ALLs4, ALLs234): New mode iterators. (gelt): New code iterator. (gelt_eqne): New code attribute. (rvbranch, *rvbranch, difficult_rvbranch, *difficult_rvbranch) (branch_unspec, *negated_tst<mode>, *reversed_tst<mode>) (*cmpqi_sign_extend): Remove insns. (define_c_enum "unspec") [UNSPEC_IDENTITY]: Remove. * config/avr/avr-dimode.md (cbranch<mode>4): Canonicalize comparisons. * config/avr/predicates.md (scratch_or_d_register_operand): New. * config/avr/contraints.md (Yxx): New constraint. gcc/testsuite/ PR target/109650 * config/avr/torture/pr109650-1.c: New test. * config/avr/torture/pr109650-2.c: New test.
...Ok, and now with the patch attached... Here is a revised version of the patch. The difference to the previous one is that it adds some combine patterns for *cbranch insns that were lost in the PR92729 transition. The post-reload part of the patterns were still there. The new patterns are slightly more general in that they also handle fixed-point modes. Apart from that, the patch behaves the same: Am 15.05.23 um 20:05 schrieb Georg-Johann Lay: > This patch fixes a wrong-code bug in the wake of PR92729, the transition > that turned the AVR backend from cc0 to CCmode. In cc0, the insn that > uses cc0 like a conditional branch always follows the cc0 setter, which > is no more the case with CCmode where set and use of REG_CC might be in > different basic blocks. > > This patch removes the machine-dependent reorg pass in avr_reorg entirely. > > It is replaced by a new, AVR specific mini-pass that runs prior to > split2. Canonicalization of comparisons away from the "difficult" > codes GT[U] and LE[U] is now mostly performed by implementing > TARGET_CANONICALIZE_COMPARISON. > > Moreover: > > * Text peephole conditions get "dead_or_set_regno_p (*, REG_CC)" as > needed. > > * RTL peephole conditions get "peep2_regno_dead_p (*, REG_CC)" as > needed. > > * Conditional branches no more clobber REG_CC. > > * insn output for compares looks ahead to determine the branch mode in > use. This needs also "dead_or_set_regno_p (*, REG_CC)". > > * Add RTL peepholes for decrement-and-branch detection. > > Finally, it fixes some of the many indentation glitches left over from > PR92729. > > Ok? > > I'd also backport this one because all of v12+ is affected by the wrong > code. Johann -- gcc/ PR target/109650 PR target/92729 * config/avr/avr-passes.def (avr_pass_ifelse): Insert new pass. * config/avr/avr.cc (avr_pass_ifelse): New RTL pass. (avr_pass_data_ifelse): New pass_data for it. (make_avr_pass_ifelse, avr_redundant_compare, avr_cbranch_cost) (avr_canonicalize_comparison, avr_out_plus_set_ZN) (avr_out_cmp_ext): New functions. (compare_condtition): Make sure REG_CC dies in the branch insn. (avr_rtx_costs_1): Add computation of cbranch costs. (avr_adjust_insn_length) [ADJUST_LEN_ADD_SET_ZN, ADJUST_LEN_CMP_ZEXT]: [ADJUST_LEN_CMP_SEXT]Handle them. (TARGET_CANONICALIZE_COMPARISON): New define. (avr_simplify_comparison_p, compare_diff_p, avr_compare_pattern) (avr_reorg_remove_redundant_compare, avr_reorg): Remove functions. (TARGET_MACHINE_DEPENDENT_REORG): Remove define. * avr-protos.h (avr_simplify_comparison_p): Remove proto. (make_avr_pass_ifelse, avr_out_plus_set_ZN, cc_reg_rtx) (avr_out_cmp_zext): New Protos * config/avr/avr.md (branch, difficult_branch): Don't split insns. (*cbranchhi.zero-extend.0", *cbranchhi.zero-extend.1") (*swapped_tst<mode>, *add.for.eqne.<mode>): New insns. (*cbranch<mode>4): Rename to cbranch<mode>4_insn. (define_peephole): Add dead_or_set_regno_p(insn,REG_CC) as needed. (define_deephole2): Add peep2_regno_dead_p(*,REG_CC) as needed. Add new RTL peepholes for decrement-and-branch and *swapped_tst<mode>. Rework signtest-and-branch peepholes for *sbrx_branch<mode>. (adjust_len) [add_set_ZN, cmp_zext]: New. (QIPSI): New mode iterator. (ALLs1, ALLs2, ALLs4, ALLs234): New mode iterators. (gelt): New code iterator. (gelt_eqne): New code attribute. (rvbranch, *rvbranch, difficult_rvbranch, *difficult_rvbranch) (branch_unspec, *negated_tst<mode>, *reversed_tst<mode>) (*cmpqi_sign_extend): Remove insns. (define_c_enum "unspec") [UNSPEC_IDENTITY]: Remove. * config/avr/avr-dimode.md (cbranch<mode>4): Canonicalize comparisons. * config/avr/predicates.md (scratch_or_d_register_operand): New. * config/avr/contraints.md (Yxx): New constraint. gcc/testsuite/ PR target/109650 * config/avr/torture/pr109650-1.c: New test. * config/avr/torture/pr109650-2.c: New test.
Ping #1 for: https://gcc.gnu.org/pipermail/gcc-patches/2023-May/618976.html https://gcc.gnu.org/pipermail/gcc-patches/attachments/20230519/9536bf8c/attachment-0001.bin Johann Am 19.05.23 um 10:49 schrieb Georg-Johann Lay: > > Here is a revised version of the patch. The difference to the > previous one is that it adds some combine patterns for *cbranch > insns that were lost in the PR92729 transition. The post-reload > part of the patterns were still there. The new patterns are > slightly more general in that they also handle fixed-point modes. > > Apart from that, the patch behaves the same: > > Am 15.05.23 um 20:05 schrieb Georg-Johann Lay: >> This patch fixes a wrong-code bug in the wake of PR92729, the transition >> that turned the AVR backend from cc0 to CCmode. In cc0, the insn that >> uses cc0 like a conditional branch always follows the cc0 setter, which >> is no more the case with CCmode where set and use of REG_CC might be in >> different basic blocks. >> >> This patch removes the machine-dependent reorg pass in avr_reorg >> entirely. >> >> It is replaced by a new, AVR specific mini-pass that runs prior to >> split2. Canonicalization of comparisons away from the "difficult" >> codes GT[U] and LE[U] is now mostly performed by implementing >> TARGET_CANONICALIZE_COMPARISON. >> >> Moreover: >> >> * Text peephole conditions get "dead_or_set_regno_p (*, REG_CC)" as >> needed. >> >> * RTL peephole conditions get "peep2_regno_dead_p (*, REG_CC)" as >> needed. >> >> * Conditional branches no more clobber REG_CC. >> >> * insn output for compares looks ahead to determine the branch mode in >> use. This needs also "dead_or_set_regno_p (*, REG_CC)". >> >> * Add RTL peepholes for decrement-and-branch detection. >> >> Finally, it fixes some of the many indentation glitches left over from >> PR92729. >> >> Ok? >> >> I'd also backport this one because all of v12+ is affected by the >> wrong code. > > Johann > > -- > > gcc/ > PR target/109650 > PR target/92729 > > * config/avr/avr-passes.def (avr_pass_ifelse): Insert new pass. > * config/avr/avr.cc (avr_pass_ifelse): New RTL pass. > (avr_pass_data_ifelse): New pass_data for it. > (make_avr_pass_ifelse, avr_redundant_compare, avr_cbranch_cost) > (avr_canonicalize_comparison, avr_out_plus_set_ZN) > (avr_out_cmp_ext): New functions. > (compare_condtition): Make sure REG_CC dies in the branch insn. > (avr_rtx_costs_1): Add computation of cbranch costs. > (avr_adjust_insn_length) [ADJUST_LEN_ADD_SET_ZN, ADJUST_LEN_CMP_ZEXT]: > [ADJUST_LEN_CMP_SEXT]Handle them. > (TARGET_CANONICALIZE_COMPARISON): New define. > (avr_simplify_comparison_p, compare_diff_p, avr_compare_pattern) > (avr_reorg_remove_redundant_compare, avr_reorg): Remove functions. > (TARGET_MACHINE_DEPENDENT_REORG): Remove define. > > * avr-protos.h (avr_simplify_comparison_p): Remove proto. > (make_avr_pass_ifelse, avr_out_plus_set_ZN, cc_reg_rtx) > (avr_out_cmp_zext): New Protos > > * config/avr/avr.md (branch, difficult_branch): Don't split insns. > (*cbranchhi.zero-extend.0", *cbranchhi.zero-extend.1") > (*swapped_tst<mode>, *add.for.eqne.<mode>): New insns. > (*cbranch<mode>4): Rename to cbranch<mode>4_insn. > (define_peephole): Add dead_or_set_regno_p(insn,REG_CC) as needed. > (define_deephole2): Add peep2_regno_dead_p(*,REG_CC) as needed. > Add new RTL peepholes for decrement-and-branch and *swapped_tst<mode>. > Rework signtest-and-branch peepholes for *sbrx_branch<mode>. > (adjust_len) [add_set_ZN, cmp_zext]: New. > (QIPSI): New mode iterator. > (ALLs1, ALLs2, ALLs4, ALLs234): New mode iterators. > (gelt): New code iterator. > (gelt_eqne): New code attribute. > (rvbranch, *rvbranch, difficult_rvbranch, *difficult_rvbranch) > (branch_unspec, *negated_tst<mode>, *reversed_tst<mode>) > (*cmpqi_sign_extend): Remove insns. > (define_c_enum "unspec") [UNSPEC_IDENTITY]: Remove. > > * config/avr/avr-dimode.md (cbranch<mode>4): Canonicalize comparisons. > * config/avr/predicates.md (scratch_or_d_register_operand): New. > * config/avr/contraints.md (Yxx): New constraint. > > gcc/testsuite/ > PR target/109650 > * config/avr/torture/pr109650-1.c: New test. > * config/avr/torture/pr109650-2.c: New test.
Ping #2 for: https://gcc.gnu.org/pipermail/gcc-patches/2023-May/618976.html https://gcc.gnu.org/pipermail/gcc-patches/attachments/20230519/9536bf8c/attachment-0001.bin Ping #1: https://gcc.gnu.org/pipermail/gcc-patches/2023-May/620098.html Johann Am 19.05.23 um 10:49 schrieb Georg-Johann Lay: > > Here is a revised version of the patch. The difference to the > previous one is that it adds some combine patterns for *cbranch > insns that were lost in the PR92729 transition. The post-reload > part of the patterns were still there. The new patterns are > slightly more general in that they also handle fixed-point modes. > > Apart from that, the patch behaves the same: > > Am 15.05.23 um 20:05 schrieb Georg-Johann Lay: >> This patch fixes a wrong-code bug in the wake of PR92729, the transition >> that turned the AVR backend from cc0 to CCmode. In cc0, the insn that >> uses cc0 like a conditional branch always follows the cc0 setter, which >> is no more the case with CCmode where set and use of REG_CC might be in >> different basic blocks. >> >> This patch removes the machine-dependent reorg pass in avr_reorg >> entirely. >> >> It is replaced by a new, AVR specific mini-pass that runs prior to >> split2. Canonicalization of comparisons away from the "difficult" >> codes GT[U] and LE[U] is now mostly performed by implementing >> TARGET_CANONICALIZE_COMPARISON. >> >> Moreover: >> >> * Text peephole conditions get "dead_or_set_regno_p (*, REG_CC)" as >> needed. >> >> * RTL peephole conditions get "peep2_regno_dead_p (*, REG_CC)" as >> needed. >> >> * Conditional branches no more clobber REG_CC. >> >> * insn output for compares looks ahead to determine the branch mode in >> use. This needs also "dead_or_set_regno_p (*, REG_CC)". >> >> * Add RTL peepholes for decrement-and-branch detection. >> >> Finally, it fixes some of the many indentation glitches left over from >> PR92729. >> >> Ok? >> >> I'd also backport this one because all of v12+ is affected by the >> wrong code. > > Johann > > -- > > gcc/ > PR target/109650 > PR target/92729 > > * config/avr/avr-passes.def (avr_pass_ifelse): Insert new pass. > * config/avr/avr.cc (avr_pass_ifelse): New RTL pass. > (avr_pass_data_ifelse): New pass_data for it. > (make_avr_pass_ifelse, avr_redundant_compare, avr_cbranch_cost) > (avr_canonicalize_comparison, avr_out_plus_set_ZN) > (avr_out_cmp_ext): New functions. > (compare_condtition): Make sure REG_CC dies in the branch insn. > (avr_rtx_costs_1): Add computation of cbranch costs. > (avr_adjust_insn_length) [ADJUST_LEN_ADD_SET_ZN, ADJUST_LEN_CMP_ZEXT]: > [ADJUST_LEN_CMP_SEXT]Handle them. > (TARGET_CANONICALIZE_COMPARISON): New define. > (avr_simplify_comparison_p, compare_diff_p, avr_compare_pattern) > (avr_reorg_remove_redundant_compare, avr_reorg): Remove functions. > (TARGET_MACHINE_DEPENDENT_REORG): Remove define. > > * avr-protos.h (avr_simplify_comparison_p): Remove proto. > (make_avr_pass_ifelse, avr_out_plus_set_ZN, cc_reg_rtx) > (avr_out_cmp_zext): New Protos > > * config/avr/avr.md (branch, difficult_branch): Don't split insns. > (*cbranchhi.zero-extend.0", *cbranchhi.zero-extend.1") > (*swapped_tst<mode>, *add.for.eqne.<mode>): New insns. > (*cbranch<mode>4): Rename to cbranch<mode>4_insn. > (define_peephole): Add dead_or_set_regno_p(insn,REG_CC) as needed. > (define_deephole2): Add peep2_regno_dead_p(*,REG_CC) as needed. > Add new RTL peepholes for decrement-and-branch and *swapped_tst<mode>. > Rework signtest-and-branch peepholes for *sbrx_branch<mode>. > (adjust_len) [add_set_ZN, cmp_zext]: New. > (QIPSI): New mode iterator. > (ALLs1, ALLs2, ALLs4, ALLs234): New mode iterators. > (gelt): New code iterator. > (gelt_eqne): New code attribute. > (rvbranch, *rvbranch, difficult_rvbranch, *difficult_rvbranch) > (branch_unspec, *negated_tst<mode>, *reversed_tst<mode>) > (*cmpqi_sign_extend): Remove insns. > (define_c_enum "unspec") [UNSPEC_IDENTITY]: Remove. > > * config/avr/avr-dimode.md (cbranch<mode>4): Canonicalize comparisons. > * config/avr/predicates.md (scratch_or_d_register_operand): New. > * config/avr/contraints.md (Yxx): New constraint. > > gcc/testsuite/ > PR target/109650 > * config/avr/torture/pr109650-1.c: New test. > * config/avr/torture/pr109650-2.c: New test.
On 5/19/23 02:49, Georg-Johann Lay wrote: > Subject: > Re: [patch,avr] Fix PR109650 wrong code > From: > Georg-Johann Lay <avr@gjlay.de> > Date: > 5/19/23, 02:49 > > To: > gcc-patches@gcc.gnu.org > CC: > Jeff Law <jeffreyalaw@gmail.com>, Denis Chertykov <chertykov@gmail.com>, > Senthil Kumar Selvaraj <SenthilKumar.Selvaraj@microchip.com> > > > ...Ok, and now with the patch attached... > > Here is a revised version of the patch. The difference to the > previous one is that it adds some combine patterns for *cbranch > insns that were lost in the PR92729 transition. The post-reload > part of the patterns were still there. The new patterns are > slightly more general in that they also handle fixed-point modes. > > Apart from that, the patch behaves the same: > > Am 15.05.23 um 20:05 schrieb Georg-Johann Lay: >> This patch fixes a wrong-code bug in the wake of PR92729, the transition >> that turned the AVR backend from cc0 to CCmode. In cc0, the insn that >> uses cc0 like a conditional branch always follows the cc0 setter, which >> is no more the case with CCmode where set and use of REG_CC might be in >> different basic blocks. >> >> This patch removes the machine-dependent reorg pass in avr_reorg >> entirely. >> >> It is replaced by a new, AVR specific mini-pass that runs prior to >> split2. Canonicalization of comparisons away from the "difficult" >> codes GT[U] and LE[U] is now mostly performed by implementing >> TARGET_CANONICALIZE_COMPARISON. >> >> Moreover: >> >> * Text peephole conditions get "dead_or_set_regno_p (*, REG_CC)" as >> needed. >> >> * RTL peephole conditions get "peep2_regno_dead_p (*, REG_CC)" as >> needed. >> >> * Conditional branches no more clobber REG_CC. >> >> * insn output for compares looks ahead to determine the branch mode in >> use. This needs also "dead_or_set_regno_p (*, REG_CC)". >> >> * Add RTL peepholes for decrement-and-branch detection. >> >> Finally, it fixes some of the many indentation glitches left over from >> PR92729. >> >> Ok? >> >> I'd also backport this one because all of v12+ is affected by the >> wrong code. > > Johann > > -- > > gcc/ > PR target/109650 > PR target/92729 > > * config/avr/avr-passes.def (avr_pass_ifelse): Insert new pass. > * config/avr/avr.cc (avr_pass_ifelse): New RTL pass. > (avr_pass_data_ifelse): New pass_data for it. > (make_avr_pass_ifelse, avr_redundant_compare, avr_cbranch_cost) > (avr_canonicalize_comparison, avr_out_plus_set_ZN) > (avr_out_cmp_ext): New functions. > (compare_condtition): Make sure REG_CC dies in the branch insn. > (avr_rtx_costs_1): Add computation of cbranch costs. > (avr_adjust_insn_length) [ADJUST_LEN_ADD_SET_ZN, ADJUST_LEN_CMP_ZEXT]: > [ADJUST_LEN_CMP_SEXT]Handle them. > (TARGET_CANONICALIZE_COMPARISON): New define. > (avr_simplify_comparison_p, compare_diff_p, avr_compare_pattern) > (avr_reorg_remove_redundant_compare, avr_reorg): Remove functions. > (TARGET_MACHINE_DEPENDENT_REORG): Remove define. > > * avr-protos.h (avr_simplify_comparison_p): Remove proto. > (make_avr_pass_ifelse, avr_out_plus_set_ZN, cc_reg_rtx) > (avr_out_cmp_zext): New Protos > > * config/avr/avr.md (branch, difficult_branch): Don't split insns. > (*cbranchhi.zero-extend.0", *cbranchhi.zero-extend.1") > (*swapped_tst<mode>, *add.for.eqne.<mode>): New insns. > (*cbranch<mode>4): Rename to cbranch<mode>4_insn. > (define_peephole): Add dead_or_set_regno_p(insn,REG_CC) as needed. > (define_deephole2): Add peep2_regno_dead_p(*,REG_CC) as needed. > Add new RTL peepholes for decrement-and-branch and *swapped_tst<mode>. > Rework signtest-and-branch peepholes for *sbrx_branch<mode>. > (adjust_len) [add_set_ZN, cmp_zext]: New. > (QIPSI): New mode iterator. > (ALLs1, ALLs2, ALLs4, ALLs234): New mode iterators. > (gelt): New code iterator. > (gelt_eqne): New code attribute. > (rvbranch, *rvbranch, difficult_rvbranch, *difficult_rvbranch) > (branch_unspec, *negated_tst<mode>, *reversed_tst<mode>) > (*cmpqi_sign_extend): Remove insns. > (define_c_enum "unspec") [UNSPEC_IDENTITY]: Remove. > > * config/avr/avr-dimode.md (cbranch<mode>4): Canonicalize comparisons. > * config/avr/predicates.md (scratch_or_d_register_operand): New. > * config/avr/contraints.md (Yxx): New constraint. > > gcc/testsuite/ > PR target/109650 > * config/avr/torture/pr109650-1.c: New test. > * config/avr/torture/pr109650-2.c: New test. So I did a cursory review and didn't see anything obviously wrong. Given we haven't heard from Denis in a while I'll go ahead and ACK. More importantly how do we want to handle things going forward? I don't think my involvement in avr specific changes would bring any significant value and I don't expect to hear from Denis. I could propose you as the maintainer of the avr port to the steering committee, but I wouldn't do that without knowing its a task you want to take on. Jeff
diff --git a/gcc/testsuite/gcc.target/avr/torture/pr109650-1.c b/gcc/testsuite/gcc.target/avr/torture/pr109650-1.c new file mode 100644 index 00000000000..9030db00fde --- /dev/null +++ b/gcc/testsuite/gcc.target/avr/torture/pr109650-1.c @@ -0,0 +1,63 @@ +/* { dg-do run } */ +/* { dg-options { -std=c99 } } */ + +typedef _Bool bool; +typedef __UINT8_TYPE__ uint8_t; + +static inline __attribute__((__always_inline__)) +bool func1a (bool p1, uint8_t p2) +{ + if (p1) + return p2 <= 8; + return p2 <= 2; +} + +__attribute__((__noinline__, __noclone__)) +bool func1b (bool p1, uint8_t p2) +{ + return func1a (p1, p2); +} + +static inline __attribute__((__always_inline__)) +bool func2a (bool p1, unsigned p2) +{ + if (p1) + return p2 <= 8; + return p2 <= 2; +} + +__attribute__((__noinline__, __noclone__)) +bool func2b (bool p1, unsigned p2) +{ + return func2a (p1, p2); +} + +void test1 (void) +{ + if (func1a (0, 1) != func1b (0, 1)) __builtin_abort(); + if (func1a (0, 2) != func1b (0, 2)) __builtin_abort(); + if (func1a (0, 3) != func1b (0, 3)) __builtin_abort(); + + if (func1a (1, 7) != func1b (1, 7)) __builtin_abort(); + if (func1a (1, 8) != func1b (1, 8)) __builtin_abort(); + if (func1a (1, 9) != func1b (1, 9)) __builtin_abort(); +} + +void test2 (void) +{ + if (func2a (0, 1) != func2b (0, 1)) __builtin_abort(); + if (func2a (0, 2) != func2b (0, 2)) __builtin_abort(); + if (func2a (0, 3) != func2b (0, 3)) __builtin_abort(); + + if (func2a (1, 7) != func2b (1, 7)) __builtin_abort(); + if (func2a (1, 8) != func2b (1, 8)) __builtin_abort(); + if (func2a (1, 9) != func2b (1, 9)) __builtin_abort(); +} + +int main (void) +{ + test1(); + test2(); + + __builtin_exit (0); +}