From: Matthias Braun <matze@braunis.de>
Date: Thu, 24 Feb 2011 18:41:52 +0000 (+0100)
Subject: generalize bittest pattern
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=4de55c57832b163156f32f6c4715353ee33bce0a;p=libfirm

generalize bittest pattern
---

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 0ea0a0083..b9d93b726 100644
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -2012,8 +2012,9 @@ static ir_node *get_flags_node_cmp(ir_node *node, ia32_condition_code_t *cc_out)
 
 	/* check for bit-test */
 	if (ia32_cg_config.use_bt
-			&& (pnc == pn_Cmp_Lg || pnc == pn_Cmp_Eq || pnc == pn_Cmp_Ne
-				|| pnc == pn_Cmp_Ue)) {
+			&& (pnc == pn_Cmp_Eq
+			    || (mode_is_signed(mode) && pnc == pn_Cmp_Lg)
+				|| (!mode_is_signed(mode) && (pnc & pn_Cmp_Ge) == pn_Cmp_Gt))) {
 		ir_node *l = get_Cmp_left(cmp);
 		ir_node *r = get_Cmp_right(cmp);
 		if (is_And(l)) {
diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index 0775c9290..a34c03a81 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -4035,23 +4035,6 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj)
 					DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
 				}
 			}
-			/* Cmp(And(1bit, val), 1bit) "bit-testing" can be replaced
-			 * by the simpler Cmp(And(1bit), val), 0) negated pnc */
-			if (is_And(left)) {
-				ir_node *and0 = get_And_left(left);
-				ir_node *and1 = get_And_right(left);
-				if (and1 == right) {
-					ir_node *tmp = and0;
-					and0 = and1;
-					and1 = tmp;
-				}
-				if (and0 == right && is_single_bit(and0)) {
-					ir_graph *irg = get_irn_irg(n);
-					proj_nr = get_negated_pnc(proj_nr, mode);
-					right = create_zero_const(irg, mode);
-					changed |= 1;
-				}
-			}
 
 			if (is_And(left) && is_Const(right)) {
 				ir_node *ll = get_binop_left(left);
@@ -4088,6 +4071,26 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj)
 		}  /* mode_is_int(...) */
 	}  /* proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg */
 
+	/* Cmp(And(1bit, val), 1bit) "bit-testing" can be replaced
+	 * by the simpler Cmp(And(1bit), val), 0) negated pnc */
+	if (mode_is_int(mode) && is_And(left) && (proj_nr == pn_Cmp_Eq
+			|| (mode_is_signed(mode) && proj_nr == pn_Cmp_Lg)
+			|| (!mode_is_signed(mode) && (proj_nr & pn_Cmp_Le) == pn_Cmp_Lt))) {
+		ir_node *and0 = get_And_left(left);
+		ir_node *and1 = get_And_right(left);
+		if (and1 == right) {
+			ir_node *tmp = and0;
+			and0 = and1;
+			and1 = tmp;
+		}
+		if (and0 == right && is_single_bit(and0)) {
+			ir_graph *irg = get_irn_irg(n);
+			proj_nr = proj_nr == pn_Cmp_Eq ? pn_Cmp_Lg : pn_Cmp_Eq;
+			right = create_zero_const(irg, mode);
+			changed |= 1;
+		}
+	}
+
 	/* replace mode_b compares with ands/ors */
 	if (get_irn_mode(left) == mode_b) {
 		ir_node  *block = get_nodes_block(n);