diff --git a/gcc/expr.cc b/gcc/expr.cc index 7197996..d130c4f 100644 --- a/gcc/expr.cc +++ b/gcc/expr.cc @@ -8931,6 +8931,53 @@ expand_expr_divmod (tree_code code, machine_mode mode, tree treeop0, return expand_divmod (mod_p, code, mode, op0, op1, target, unsignedp); } +/* Expand VEC_COND_EXPR TARGET = OP0 ? OP1 : OP2 as a sequence of + logical operations, typically (OP0 & OP1) | (~OP0 & OP2). */ + +static rtx +expand_vec_cond_expr (machine_mode mode, rtx op0, rtx op1, rtx op2, + rtx target) +{ + if (rtx_equal_p (op1, op2)) + return op1; + + if (op0 == CONST0_RTX (GET_MODE (op0))) + return op2; + if (vector_all_ones_operand (op0, GET_MODE (op0))) + return op1; + + if (mode != GET_MODE (op0)) + op0 = convert_modes (mode, GET_MODE (op0), op0, true); + + if (op2 == CONST0_RTX (mode)) + { + if (vector_all_ones_operand (op1, mode)) + return op0; + return expand_simple_binop (mode, AND, op0, op1, + target, 1, OPTAB_DIRECT); + } + else if (op1 == CONST0_RTX (mode)) + { + rtx tmp = expand_simple_unop (mode, NOT, op0, target, 1); + if (vector_all_ones_operand (op2, mode)) + return tmp; + return expand_simple_binop (mode, AND, tmp, op2, + target, 1, OPTAB_DIRECT); + } + else if (vector_all_ones_operand (op1, mode)) + return expand_simple_binop (mode, IOR, op0, op2, + target, 1, OPTAB_DIRECT); + + rtx tmp1 = expand_simple_binop (mode, XOR, op1, op2, + NULL_RTX, 1, OPTAB_DIRECT); + rtx tmp2 = expand_simple_binop (mode, AND, op0, tmp1, + NULL_RTX, 1, OPTAB_DIRECT); + return expand_simple_binop (mode, XOR, tmp2, op2, + target, 1, OPTAB_DIRECT); +} + +/* sepops variant of expand_expr_real. */ + rtx expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, enum expand_modifier modifier) @@ -10302,6 +10349,12 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, expand_operands (treeop0, treeop1, NULL_RTX, &op0, &op1, modifier); return expand_vec_series_expr (mode, op0, op1, target); + case VEC_COND_EXPR: + op0 = expand_expr (treeop0, NULL_RTX, VOIDmode, modifier); + op1 = expand_expr (treeop1, NULL_RTX, VOIDmode, modifier); + op2 = expand_expr (treeop2, NULL_RTX, VOIDmode, modifier); + return expand_vec_cond_expr (mode, op0, op1, op2, target); + case BIT_INSERT_EXPR: { unsigned bitpos = tree_to_uhwi (treeop2); diff --git a/gcc/gimple-isel.cc b/gcc/gimple-isel.cc index 44d086d..62b8ba7 100644 --- a/gcc/gimple-isel.cc +++ b/gcc/gimple-isel.cc @@ -279,10 +279,11 @@ gimple_expand_vec_cond_expr (struct function *fun, gimple_stmt_iterator *gsi, } gcc_assert (VECTOR_BOOLEAN_TYPE_P (TREE_TYPE (op0)) - && can_compute_op0 - && (get_vcond_mask_icode (mode, TYPE_MODE (TREE_TYPE (op0))) - != CODE_FOR_nothing)); - return gimple_build_call_internal (IFN_VCOND_MASK, 3, op0, op1, op2); + && can_compute_op0); + if (get_vcond_mask_icode (mode, TYPE_MODE (TREE_TYPE (op0))) + != CODE_FOR_nothing) + return gimple_build_call_internal (IFN_VCOND_MASK, 3, op0, op1, op2); + return NULL; } tree tcode_tree = build_int_cst (integer_type_node, tcode); diff --git a/gcc/testsuite/gcc.target/i386/pr105668.c b/gcc/testsuite/gcc.target/i386/pr105668.c new file mode 100644 index 0000000..359c2b6 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr105668.c @@ -0,0 +1,16 @@ +/* { dg-do compile { target { ! ia32 } } } */ +/* { dg-options "-O -ftracer -fno-tree-fre" } */ + +typedef __int128 __attribute__((__vector_size__ (16))) V; + +int i; + +V +foo (_Complex float f) +{ + (void) __builtin_atanhf (i); + V v = i != (V) { }; + i ^= f && 8; + v %= 5; + return v; +}