[committed] PR80158 cleanup (alternate interpretations)

Message ID	58b003c4-4c04-922f-89cd-bb79f3c197fc@linux.vnet.ibm.com
State	New
Headers	show Return-Path: <gcc-patches-return-450775-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:date:mime-version:content-type :content-transfer-encoding:message-id; q=dns; s=default; b=apwGT jyGCSHGa+MnODnWEYypFXxV7u/c39m6BZqqCa5twztOr+GdjJmlVVHQIR7EEgE8v sJ8i4d6tIUqSx1q0UB+1yFsMg/3zenZdbV5gXhEqUQIJG/AF5gHgyJG2wn0iB3/c Qsb/5susLIPJ24Ud3JMS1fw+CgrFS1sscC6OpI= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Gateway: Authorized Use Only! Violators will be prosecuted for <gcc-patches@gcc.gnu.org> from <wschmidt@linux.vnet.ibm.com>; Wed, 29 Mar 2017 09:00:04 -0400 Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 29 Mar 2017 09:00:02 -0400 To: GCC Patches <gcc-patches@gcc.gnu.org> Cc: Richard Biener <richard.guenther@gmail.com> From: Bill Schmidt <wschmidt@linux.vnet.ibm.com> Subject: [PATCH, committed] PR80158 cleanup (alternate interpretations) Date: Wed, 29 Mar 2017 08:00:01 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Message-Id: <58b003c4-4c04-922f-89cd-bb79f3c197fc@linux.vnet.ibm.com>

Message ID

58b003c4-4c04-922f-89cd-bb79f3c197fc@linux.vnet.ibm.com

State

New

Headers

DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:to:cc
	:from:subject:date:mime-version:content-type
	:content-transfer-encoding:message-id; q=dns; s=default; b=apwGT
	jyGCSHGa+MnODnWEYypFXxV7u/c39m6BZqqCa5twztOr+GdjJmlVVHQIR7EEgE8v
	sJ8i4d6tIUqSx1q0UB+1yFsMg/3zenZdbV5gXhEqUQIJG/AF5gHgyJG2wn0iB3/c
	Qsb/5susLIPJ24Ud3JMS1fw+CgrFS1sscC6OpI=
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Richard Biener <richard.guenther@gmail.com>
From: Bill Schmidt <wschmidt@linux.vnet.ibm.com>
Subject: [PATCH, committed] PR80158 cleanup (alternate interpretations)
Date: Wed, 29 Mar 2017 08:00:01 -0500
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12;
	rv:45.0) Gecko/20100101 Thunderbird/45.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Message-Id: <58b003c4-4c04-922f-89cd-bb79f3c197fc@linux.vnet.ibm.com>

Commit Message

Bill Schmidt March 29, 2017, 1 p.m. UTC

Hi,

The fix for PR80158 is technically correct, but not "future-proof" in the
sense that someday we may implement more than one alternate interpretation
for a strength reduction candidate.  This patch cleans that up.

Bootstrapped on powerpc64le-unknown-linux-gnu with no regressions,
committed.

Thanks,
Bill


2017-03-29  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	PR tree-optimization/80158
	* gimple-ssa-strength-reduction.c (replace_mult_candidate):
	Handle possible future case of more than one alternate
	interpretation.
	(replace_rhs_if_not_dup): Likewise.
	(replace_one_candidate): Likewise.

Index: gcc/gimple-ssa-strength-reduction.c
===================================================================
--- gcc/gimple-ssa-strength-reduction.c	(revision 246554)
+++ gcc/gimple-ssa-strength-reduction.c	(working copy)
@@ -2086,11 +2086,15 @@  replace_mult_candidate (slsr_cand_t c, tree basis_
 	  tree lhs = gimple_assign_lhs (c->cand_stmt);
 	  gassign *copy_stmt = gimple_build_assign (lhs, basis_name);
 	  gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
+	  slsr_cand_t cc = c;
 	  gimple_set_location (copy_stmt, gimple_location (c->cand_stmt));
 	  gsi_replace (&gsi, copy_stmt, false);
 	  c->cand_stmt = copy_stmt;
-	  if (c->next_interp)
-	    lookup_cand (c->next_interp)->cand_stmt = copy_stmt;
+	  while (cc->next_interp)
+	    {
+	      cc = lookup_cand (cc->next_interp);
+	      cc->cand_stmt = copy_stmt;
+	    }
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    stmt_to_print = copy_stmt;
 	}
@@ -2116,12 +2120,16 @@  replace_mult_candidate (slsr_cand_t c, tree basis_
 	  else
 	    {
 	      gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
+	      slsr_cand_t cc = c;
 	      gimple_assign_set_rhs_with_ops (&gsi, code,
 					      basis_name, bump_tree);
 	      update_stmt (gsi_stmt (gsi));
               c->cand_stmt = gsi_stmt (gsi);
-	      if (c->next_interp)
-		lookup_cand (c->next_interp)->cand_stmt = gsi_stmt (gsi);
+	      while (cc->next_interp)
+		{
+		  cc = lookup_cand (cc->next_interp);
+		  cc->cand_stmt = gsi_stmt (gsi);
+		}
 	      if (dump_file && (dump_flags & TDF_DETAILS))
 		stmt_to_print = gsi_stmt (gsi);
 	    }
@@ -3406,11 +3414,15 @@  replace_rhs_if_not_dup (enum tree_code new_code, t
 	      || !operand_equal_p (new_rhs2, old_rhs1, 0))))
     {
       gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
+      slsr_cand_t cc = c;
       gimple_assign_set_rhs_with_ops (&gsi, new_code, new_rhs1, new_rhs2);
       update_stmt (gsi_stmt (gsi));
       c->cand_stmt = gsi_stmt (gsi);
-      if (c->next_interp)
-	lookup_cand (c->next_interp)->cand_stmt = gsi_stmt (gsi);
+      while (cc->next_interp)
+	{
+	  cc = lookup_cand (cc->next_interp);
+	  cc->cand_stmt = gsi_stmt (gsi);
+	}
 
       if (dump_file && (dump_flags & TDF_DETAILS))
 	return gsi_stmt (gsi);
@@ -3514,11 +3526,15 @@  replace_one_candidate (slsr_cand_t c, unsigned i,
 	  || !operand_equal_p (rhs2, orig_rhs2, 0))
 	{
 	  gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
+	  slsr_cand_t cc = c;
 	  gimple_assign_set_rhs_with_ops (&gsi, MINUS_EXPR, basis_name, rhs2);
 	  update_stmt (gsi_stmt (gsi));
           c->cand_stmt = gsi_stmt (gsi);
-	  if (c->next_interp)
-	    lookup_cand (c->next_interp)->cand_stmt = gsi_stmt (gsi);
+	  while (cc->next_interp)
+	    {
+	      cc = lookup_cand (cc->next_interp);
+	      cc->cand_stmt = gsi_stmt (gsi);
+	    }
 
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    stmt_to_print = gsi_stmt (gsi);
@@ -3537,11 +3553,15 @@  replace_one_candidate (slsr_cand_t c, unsigned i,
 	{
 	  gassign *copy_stmt = gimple_build_assign (lhs, basis_name);
 	  gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
+	  slsr_cand_t cc = c;
 	  gimple_set_location (copy_stmt, gimple_location (c->cand_stmt));
 	  gsi_replace (&gsi, copy_stmt, false);
 	  c->cand_stmt = copy_stmt;
-	  if (c->next_interp)
-	    lookup_cand (c->next_interp)->cand_stmt = copy_stmt;
+	  while (cc->next_interp)
+	    {
+	      cc = lookup_cand (cc->next_interp);
+	      cc->cand_stmt = copy_stmt;
+	    }
 
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    stmt_to_print = copy_stmt;
@@ -3550,11 +3570,15 @@  replace_one_candidate (slsr_cand_t c, unsigned i,
 	{
 	  gimple_stmt_iterator gsi = gsi_for_stmt (c->cand_stmt);
 	  gassign *cast_stmt = gimple_build_assign (lhs, NOP_EXPR, basis_name);
+	  slsr_cand_t cc = c;
 	  gimple_set_location (cast_stmt, gimple_location (c->cand_stmt));
 	  gsi_replace (&gsi, cast_stmt, false);
 	  c->cand_stmt = cast_stmt;
-	  if (c->next_interp)
-	    lookup_cand (c->next_interp)->cand_stmt = cast_stmt;
+	  while (cc->next_interp)
+	    {
+	      cc = lookup_cand (cc->next_interp);
+	      cc->cand_stmt = cast_stmt;
+	    }
 
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    stmt_to_print = cast_stmt;