Skip to content

R
riscv-gcc-1
Commit ec9b602c by Jakub Jelinek Committed by Jakub Jelinek
Options

re PR target/93141 (Missed optimization : Use of adc when checking overflow) 

	PR target/93141
	* config/i386/i386.md (subv<mode>4): Use SWIDWI iterator instead of
	SWI.  Use <general_hilo_operand> instead of <general_operand>.  Use
	CONST_SCALAR_INT_P instead of CONST_INT_P.
	(*subv<mode>4_1): Rename to ...
	(subv<mode>4_1): ... this.
	(*subv<dwi>4_doubleword, *addv<dwi>4_doubleword_1): New
	define_insn_and_split patterns.
	(*subv<mode>4_overflow_1, *addv<mode>4_overflow_2): New define_insn
	patterns.

	* gcc.target/i386/pr93141-1.c: Add tests with constants that have MSB
	of the low half of the constant set.
	* gcc.target/i386/pr93141-2.c: New test.

From-SVN: r280029
parent b9c84e95
Showing with 308 additions and 15 deletions
gcc/ChangeLog
2020-01-09 Jakub Jelinek <jakub@redhat.com>
PR target/93141
* config/i386/i386.md (subv<mode>4): Use SWIDWI iterator instead of
SWI. Use <general_hilo_operand> instead of <general_operand>. Use
CONST_SCALAR_INT_P instead of CONST_INT_P.
(*subv<mode>4_1): Rename to ...
(subv<mode>4_1): ... this.
(*subv<dwi>4_doubleword, *addv<dwi>4_doubleword_1): New
define_insn_and_split patterns.
(*subv<mode>4_overflow_1, *addv<mode>4_overflow_2): New define_insn
patterns.
2020-01-08 David Malcolm <dmalcolm@redhat.com> 2020-01-08 David Malcolm <dmalcolm@redhat.com>
* vec.c (class selftest::count_dtor): New class. * vec.c (class selftest::count_dtor): New class.
......
gcc/config/i386/i386.md
...@@ -6569,16 +6569,17 @@ ...@@ -6569,16 +6569,17 @@
;; Subtract with jump on overflow. ;; Subtract with jump on overflow.
(define_expand "subv<mode>4" (define_expand "subv<mode>4"
[(parallel [(set (reg:CCO FLAGS_REG) [(parallel [(set (reg:CCO FLAGS_REG)
(eq:CCO (minus:<DWI> (eq:CCO
(sign_extend:<DWI> (minus:<DWI>
(match_operand:SWI 1 "nonimmediate_operand")) (sign_extend:<DWI>
(match_dup 4)) (match_operand:SWIDWI 1 "nonimmediate_operand"))
(sign_extend:<DWI> (match_dup 4))
(minus:SWI (match_dup 1) (sign_extend:<DWI>
(match_operand:SWI 2 (minus:SWIDWI (match_dup 1)
"<general_operand>"))))) (match_operand:SWIDWI 2
(set (match_operand:SWI 0 "register_operand") "<general_hilo_operand>")))))
(minus:SWI (match_dup 1) (match_dup 2)))]) (set (match_operand:SWIDWI 0 "register_operand")
(minus:SWIDWI (match_dup 1) (match_dup 2)))])
(set (pc) (if_then_else (set (pc) (if_then_else
(eq (reg:CCO FLAGS_REG) (const_int 0)) (eq (reg:CCO FLAGS_REG) (const_int 0))
(label_ref (match_operand 3)) (label_ref (match_operand 3))
...@@ -6586,7 +6587,7 @@ ...@@ -6586,7 +6587,7 @@
"" ""
{ {
ix86_fixup_binary_operands_no_copy (MINUS, <MODE>mode, operands); ix86_fixup_binary_operands_no_copy (MINUS, <MODE>mode, operands);
if (CONST_INT_P (operands[2])) if (CONST_SCALAR_INT_P (operands[2]))
operands[4] = operands[2]; operands[4] = operands[2];
else else
operands[4] = gen_rtx_SIGN_EXTEND (<DWI>mode, operands[2]); operands[4] = gen_rtx_SIGN_EXTEND (<DWI>mode, operands[2]);
...@@ -6608,7 +6609,7 @@ ...@@ -6608,7 +6609,7 @@
[(set_attr "type" "alu") [(set_attr "type" "alu")
(set_attr "mode" "<MODE>")]) (set_attr "mode" "<MODE>")])
(define_insn "*subv<mode>4_1" (define_insn "subv<mode>4_1"
[(set (reg:CCO FLAGS_REG) [(set (reg:CCO FLAGS_REG)
(eq:CCO (minus:<DWI> (eq:CCO (minus:<DWI>
(sign_extend:<DWI> (sign_extend:<DWI>
...@@ -6633,6 +6634,162 @@ ...@@ -6633,6 +6634,162 @@
(const_string "4")] (const_string "4")]
(const_string "<MODE_SIZE>")))]) (const_string "<MODE_SIZE>")))])
(define_insn_and_split "*subv<dwi>4_doubleword"
[(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<QWI>
(sign_extend:<QWI>
(match_operand:<DWI> 1 "nonimmediate_operand" "0,0"))
(sign_extend:<QWI>
(match_operand:<DWI> 2 "x86_64_hilo_general_operand" "r<di>,o")))
(sign_extend:<QWI>
(minus:<DWI> (match_dup 1) (match_dup 2)))))
(set (match_operand:<DWI> 0 "nonimmediate_operand" "=ro,r")
(minus:<DWI> (match_dup 1) (match_dup 2)))]
"ix86_binary_operator_ok (MINUS, <MODE>mode, operands)"
"#"
"reload_completed"
[(parallel [(set (reg:CC FLAGS_REG)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(minus:DWIH (match_dup 1) (match_dup 2)))])
(parallel [(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<DWI>
(minus:<DWI>
(sign_extend:<DWI> (match_dup 4))
(ltu:<DWI> (reg:CC FLAGS_REG) (const_int 0)))
(sign_extend:<DWI> (match_dup 5)))
(sign_extend:<DWI>
(minus:DWIH
(minus:DWIH
(match_dup 4)
(ltu:DWIH (reg:CC FLAGS_REG) (const_int 0)))
(match_dup 5)))))
(set (match_dup 3)
(minus:DWIH
(minus:DWIH
(match_dup 4)
(ltu:DWIH (reg:CC FLAGS_REG) (const_int 0)))
(match_dup 5)))])]
{
split_double_mode (<DWI>mode, &operands[0], 3, &operands[0], &operands[3]);
})
(define_insn_and_split "*subv<dwi>4_doubleword_1"
[(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<QWI>
(sign_extend:<QWI>
(match_operand:<DWI> 1 "nonimmediate_operand" "0"))
(match_operand:<QWI> 3 "const_scalar_int_operand" ""))
(sign_extend:<QWI>
(minus:<DWI>
(match_dup 1)
(match_operand:<DWI> 2 "x86_64_hilo_general_operand" "<di>")))))
(set (match_operand:<DWI> 0 "nonimmediate_operand" "=ro")
(minus:<DWI> (match_dup 1) (match_dup 2)))]
"ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
&& CONST_SCALAR_INT_P (operands[2])
&& rtx_equal_p (operands[2], operands[3])"
"#"
"reload_completed"
[(parallel [(set (reg:CC FLAGS_REG)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(minus:DWIH (match_dup 1) (match_dup 2)))])
(parallel [(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<DWI>
(minus:<DWI>
(sign_extend:<DWI> (match_dup 4))
(ltu:<DWI> (reg:CC FLAGS_REG) (const_int 0)))
(match_dup 5))
(sign_extend:<DWI>
(minus:DWIH
(minus:DWIH
(match_dup 4)
(ltu:DWIH (reg:CC FLAGS_REG) (const_int 0)))
(match_dup 5)))))
(set (match_dup 3)
(minus:DWIH
(minus:DWIH
(match_dup 4)
(ltu:DWIH (reg:CC FLAGS_REG) (const_int 0)))
(match_dup 5)))])]
{
split_double_mode (<DWI>mode, &operands[0], 3, &operands[0], &operands[3]);
if (operands[2] == const0_rtx)
{
emit_insn (gen_subv<mode>4_1 (operands[3], operands[4], operands[5],
operands[5]));
DONE;
}
})
(define_insn "*subv<mode>4_overflow_1"
[(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<DWI>
(minus:<DWI>
(sign_extend:<DWI>
(match_operand:SWI 1 "nonimmediate_operand" "%0,0"))
(match_operator:<DWI> 4 "ix86_carry_flag_operator"
[(match_operand 3 "flags_reg_operand") (const_int 0)]))
(sign_extend:<DWI>
(match_operand:SWI 2 "<general_sext_operand>" "rWe,m")))
(sign_extend:<DWI>
(minus:SWI
(minus:SWI
(match_dup 1)
(match_operator:SWI 5 "ix86_carry_flag_operator"
[(match_dup 3) (const_int 0)]))
(match_dup 2)))))
(set (match_operand:SWI 0 "nonimmediate_operand" "=rm,r")
(minus:SWI
(minus:SWI
(match_dup 1)
(match_op_dup 5 [(match_dup 3) (const_int 0)]))
(match_dup 2)))]
"ix86_binary_operator_ok (MINUS, <MODE>mode, operands)"
"sbb{<imodesuffix>}\t{%2, %0|%0, %2}"
[(set_attr "type" "alu")
(set_attr "mode" "<MODE>")])
(define_insn "*subv<mode>4_overflow_2"
[(set (reg:CCO FLAGS_REG)
(eq:CCO
(minus:<DWI>
(minus:<DWI>
(sign_extend:<DWI>
(match_operand:SWI 1 "nonimmediate_operand" "%0"))
(match_operator:<DWI> 4 "ix86_carry_flag_operator"
[(match_operand 3 "flags_reg_operand") (const_int 0)]))
(match_operand:<DWI> 6 "const_int_operand" ""))
(sign_extend:<DWI>
(minus:SWI
(minus:SWI
(match_dup 1)
(match_operator:SWI 5 "ix86_carry_flag_operator"
[(match_dup 3) (const_int 0)]))
(match_operand:SWI 2 "x86_64_immediate_operand" "e")))))
(set (match_operand:SWI 0 "nonimmediate_operand" "=rm")
(minus:SWI
(minus:SWI
(match_dup 1)
(match_op_dup 5 [(match_dup 3) (const_int 0)]))
(match_dup 2)))]
"ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
&& CONST_INT_P (operands[2])
&& INTVAL (operands[2]) == INTVAL (operands[6])"
"sbb{<imodesuffix>}\t{%2, %0|%0, %2}"
[(set_attr "type" "alu")
(set_attr "mode" "<MODE>")
(set (attr "length_immediate")
(if_then_else (match_test "IN_RANGE (INTVAL (operands[2]), -128, 127)")
(const_string "1")
(const_string "4")))])
(define_expand "usubv<mode>4" (define_expand "usubv<mode>4"
[(parallel [(set (reg:CC FLAGS_REG) [(parallel [(set (reg:CC FLAGS_REG)
(compare:CC (compare:CC
......
gcc/testsuite/ChangeLog
2020-01-09 Jakub Jelinek <jakub@redhat.com>
PR target/93141
* gcc.target/i386/pr93141-1.c: Add tests with constants that have MSB
of the low half of the constant set.
* gcc.target/i386/pr93141-2.c: New test.
2020-01-08 Jeff Law <law@redhat.com> 2020-01-08 Jeff Law <law@redhat.com>
* gcc.dg/Wstringop-overflow-27.c: Make testnames unique. * gcc.dg/Wstringop-overflow-27.c: Make testnames unique.
......
gcc/testsuite/gcc.target/i386/pr93141-1.c
...@@ -2,15 +2,17 @@ ...@@ -2,15 +2,17 @@
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-O2 -masm=att" } */ /* { dg-options "-O2 -masm=att" } */
/* { dg-final { scan-assembler-not "cmp\[lq]\t" } } */ /* { dg-final { scan-assembler-not "cmp\[lq]\t" } } */
/* { dg-final { scan-assembler-times "setc\t%" 3 } } */ /* { dg-final { scan-assembler-times "setc\t%" 5 } } */
/* { dg-final { scan-assembler-times "seto\t%" 5 } } */ /* { dg-final { scan-assembler-times "seto\t%" 7 } } */
/* { dg-final { scan-assembler-times "adc\[lq]\t" 5 } } */ /* { dg-final { scan-assembler-times "adc\[lq]\t" 9 } } */
#ifdef __x86_64__ #ifdef __x86_64__
typedef unsigned __int128 U; typedef unsigned __int128 U;
typedef unsigned long long HU;
typedef signed __int128 S; typedef signed __int128 S;
#else #else
typedef unsigned long long U; typedef unsigned long long U;
typedef unsigned int HU;
typedef signed long long S; typedef signed long long S;
#endif #endif
int o; int o;
...@@ -81,3 +83,39 @@ garply (S x) ...@@ -81,3 +83,39 @@ garply (S x)
| (S) 0xbeedead, &z); | (S) 0xbeedead, &z);
return z; return z;
} }
S
waldo (S x)
{
S z;
o = __builtin_add_overflow (x, (S) ((((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2))
| -(HU) 0xbeedead), &z);
return z;
}
S
fred (S x)
{
S z;
o = __builtin_add_overflow (x, (S) ((-(((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2)))
| -(HU) 0xbeedead), &z);
return z;
}
U
plugh (U x)
{
U z;
o = __builtin_add_overflow (x, (U) ((((U) 0xdeadbee) << (sizeof (U) * __CHAR_BIT__ / 2))
| -(HU) 0xbeedead), &z);
return z;
}
U
xyzzy (U x)
{
U z;
o = __builtin_add_overflow (x, (U) ((-(((U) 0xdeadbee) << (sizeof (U) * __CHAR_BIT__ / 2)))
| -(HU) 0xbeedead), &z);
return z;
}
gcc/testsuite/gcc.target/i386/pr93141-2.c 0 → 100644
/* PR target/93141 */
/* { dg-do compile } */
/* { dg-options "-O2 -masm=att" } */
/* { dg-final { scan-assembler-not "cmp\[lq]\t" } } */
/* { dg-final { scan-assembler-not "adc\[lq]\t" } } */
/* { dg-final { scan-assembler-times "seto\t%" 7 } } */
/* { dg-final { scan-assembler-times "sbb\[lq]\t" 5 } } */
#ifdef __x86_64__
typedef unsigned __int128 U;
typedef unsigned long long HU;
typedef signed __int128 S;
#else
typedef unsigned long long U;
typedef signed int HU;
typedef signed long long S;
#endif
int o;
S
qux (S x, S y)
{
S z;
o = __builtin_sub_overflow (x, y, &z);
return z;
}
S
quux (S x)
{
S z;
o = __builtin_sub_overflow (x, ((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2), &z);
return z;
}
S
corge (S x)
{
S z;
o = __builtin_sub_overflow (x, (((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2))
| (S) 0xbeedead, &z);
return z;
}
S
grault (S x)
{
S z;
o = __builtin_sub_overflow (x, -((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2), &z);
return z;
}
S
garply (S x)
{
S z;
o = __builtin_sub_overflow (x, (-(((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2)))
| (S) 0xbeedead, &z);
return z;
}
S
waldo (S x)
{
S z;
o = __builtin_sub_overflow (x, (S) ((((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2))
| -(HU) 0xbeedead), &z);
return z;
}
S
fred (S x)
{
S z;
o = __builtin_sub_overflow (x, (S) ((-(((S) 0xdeadbee) << (sizeof (S) * __CHAR_BIT__ / 2)))
| -(HU) 0xbeedead), &z);
return z;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment