diff options
| author | Dominik Vogt <vogt@linux.vnet.ibm.com> | 2017-01-30 09:54:58 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2017-01-30 09:54:58 +0000 |
| commit | ab4be5d1be0007a26492a98d268075d43a01b1f0 (patch) | |
| tree | 973b26c4fb5459bea5adc825ff0ae128e955e518 | |
| parent | 6687d58dbc006e5300976b79b753a9525b19dd01 (diff) | |
| download | gcc-ab4be5d1be0007a26492a98d268075d43a01b1f0.zip gcc-ab4be5d1be0007a26492a98d268075d43a01b1f0.tar.gz gcc-ab4be5d1be0007a26492a98d268075d43a01b1f0.tar.bz2 | |
S/390: PR target/79240: Fix assertion in s390_extzv_shift_ok.
2017-01-30 Dominik Vogt <vogt@linux.vnet.ibm.com>
PR target/79240
* config/s390/s390.md ("*r<noxa>sbg_<mode>_srl_bitmask")
("*r<noxa>sbg_<mode>_sll_bitmask")
("*extzv_<mode>_srl<clobbercc_or_nocc>")
("*extzv_<mode>_sll<clobbercc_or_nocc>"):
Use contiguous_bitmask_nowrap_operand.
2017-01-30 Dominik Vogt <vogt@linux.vnet.ibm.com>
PR target/79240
* gcc.target/s390/pr79240.c: New test.
From-SVN: r245022
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/s390/s390.md | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/s390/pr79240.c | 11 |
4 files changed, 29 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 535647a..30b0785 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-01-30 Dominik Vogt <vogt@linux.vnet.ibm.com> + + PR target/79240 + * config/s390/s390.md ("*r<noxa>sbg_<mode>_srl_bitmask") + ("*r<noxa>sbg_<mode>_sll_bitmask") + ("*extzv_<mode>_srl<clobbercc_or_nocc>") + ("*extzv_<mode>_sll<clobbercc_or_nocc>"): + Use contiguous_bitmask_nowrap_operand. + 2017-01-29 Bill Schmidt <wschmidt@linux.vnet.ibm.com> PR target/79268 diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 3135175..e47c2e9 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -4127,7 +4127,7 @@ (lshiftrt:GPR (match_operand:GPR 1 "nonimmediate_operand" "d") (match_operand:GPR 3 "nonzero_shift_count_operand" "")) - (match_operand:GPR 2 "contiguous_bitmask_operand" "")) + (match_operand:GPR 2 "contiguous_bitmask_nowrap_operand" "")) (match_operand:GPR 4 "nonimmediate_operand" "0"))) (clobber (reg:CC CC_REGNUM))] "TARGET_Z10 @@ -4143,7 +4143,7 @@ (ashift:GPR (match_operand:GPR 1 "nonimmediate_operand" "d") (match_operand:GPR 3 "nonzero_shift_count_operand" "")) - (match_operand:GPR 2 "contiguous_bitmask_operand" "")) + (match_operand:GPR 2 "contiguous_bitmask_nowrap_operand" "")) (match_operand:GPR 4 "nonimmediate_operand" "0"))) (clobber (reg:CC CC_REGNUM))] "TARGET_Z10 @@ -7191,7 +7191,7 @@ (and:GPR (lshiftrt:GPR (match_operand:GPR 1 "register_operand" "d") (match_operand:GPR 2 "nonzero_shift_count_operand" "")) - (match_operand:GPR 3 "contiguous_bitmask_operand" "")))] + (match_operand:GPR 3 "contiguous_bitmask_nowrap_operand" "")))] "<z10_or_zEC12_cond> /* Note that even for the SImode pattern, the rotate is always DImode. */ && s390_extzv_shift_ok (<bitsize>, -INTVAL (operands[2]), @@ -7205,7 +7205,7 @@ (and:GPR (ashift:GPR (match_operand:GPR 1 "register_operand" "d") (match_operand:GPR 2 "nonzero_shift_count_operand" "")) - (match_operand:GPR 3 "contiguous_bitmask_operand" "")))] + (match_operand:GPR 3 "contiguous_bitmask_nowrap_operand" "")))] "<z10_or_zEC12_cond> && s390_extzv_shift_ok (<bitsize>, INTVAL (operands[2]), INTVAL (operands[3]))" diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 84b4544..f93fc0c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-01-30 Dominik Vogt <vogt@linux.vnet.ibm.com> + + PR target/79240 + * gcc.target/s390/pr79240.c: New test. + 2017-01-29 Bill Schmidt <wschmidt@linux.vnet.ibm.com> PR target/79268 diff --git a/gcc/testsuite/gcc.target/s390/pr79240.c b/gcc/testsuite/gcc.target/s390/pr79240.c new file mode 100644 index 0000000..bd8f72f --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/pr79240.c @@ -0,0 +1,11 @@ +/* This testcase checks that s390_extzv_shift_ok does not cause an assertion + failure. */ + +/* { dg-do compile } */ +/* { dg-options "-w -march=z196 -mtune=zEC12 -m64 -mzarch -O2" } */ + +int +foo (int a) +{ + return sizeof (int) * a + 16 - a * sizeof (int) % 16; +} |