From patchwork Fri Jun 10 03:00:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 99825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 28177B6FFC for ; Fri, 10 Jun 2011 13:00:27 +1000 (EST) Received: (qmail 18037 invoked by alias); 10 Jun 2011 03:00:26 -0000 Received: (qmail 18021 invoked by uid 22791); 10 Jun 2011 03:00:25 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,TW_CP X-Spam-Check-By: sourceware.org Received: from dair.pair.com (HELO dair.pair.com) (209.68.1.49) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Fri, 10 Jun 2011 03:00:10 +0000 Received: (qmail 6628 invoked by uid 20157); 10 Jun 2011 03:00:09 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 10 Jun 2011 03:00:09 -0000 Date: Thu, 9 Jun 2011 23:00:09 -0400 (EDT) From: Hans-Peter Nilsson To: Vladimir Makarov cc: gcc-patches@gcc.gnu.org Subject: Re: FORBIDDEN_INC_DEC_CLASSES in ira-costs.c In-Reply-To: <4DF0EF39.5020409@redhat.com> Message-ID: References: <4DF0EF39.5020409@redhat.com> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On Thu, 9 Jun 2011, Vladimir Makarov wrote: > On 06/08/2011 12:37 PM, Hans-Peter Nilsson wrote: > > There's a lot of dead code inside the obsolete (removed in 2009) > > and nowhere else set #ifdef FORBIDDEN_INC_DEC_CLASSES. > > Remove and poison? > > > Yes, I believe so. > > I'd say borderline obvious, but maybe there's instead reason to > > reinstate it, if that code is tested and supposed to be live. > I can not remember a reason to save it. A big part of ira-costs.c was > inherited from old reglcasses.c before the macro was removed. Probably > therefore it occurred again. > > Thanks for finding this. I'd really appreciate if you submit a patch removing > this. I'll try to give it a quick review. Tested by adding a #define FORBIDDEN_INC_DEC_CLASSES xyzzy to cris.h and observing (1) without poison, build dies because of references to undefined forbidden_inc_dec_class (ira-costs.c being the sole "referer") and (2) with poison, compilation dies at first compilation including cris.h due to the poisoning, (3) without the #define-dummy but with poison, compilation dies in ira-costs.c on first reference to FORBIDDEN_INC_DEC_CLASSES due to the poisoning, so you don't have to trust me on my word that I managed to remove them all. :) Thus, except for the comment adjustments and formatting, the removal is mechanical and self-checking. ...and no warnings this time! Ok? * ira-costs.c: Remove #ifdefs on dead FORBIDDEN_INC_DEC_CLASSES. Adjust comments. * system.h (FORBIDDEN_INC_DEC_CLASSES): Poison. brgds, H-P Index: system.h =================================================================== --- system.h (revision 174865) +++ system.h (working copy) @@ -826,7 +826,8 @@ extern void fancy_abort (const char *, i FUNCTION_ARG_BOUNDARY MUST_USE_SJLJ_EXCEPTIONS US_SOFTWARE_GOFAST \ USING_SVR4_H SVR4_ASM_SPEC FUNCTION_ARG FUNCTION_ARG_ADVANCE \ FUNCTION_INCOMING_ARG IRA_COVER_CLASSES TARGET_VERSION \ - MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS + MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS \ + FORBIDDEN_INC_DEC_CLASSES /* Hooks that are no longer used. */ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \ Index: ira-costs.c =================================================================== --- ira-costs.c (revision 174878) +++ ira-costs.c (working copy) @@ -46,15 +46,9 @@ static bool pseudo_classes_defined_p = f /* TRUE if we work with allocnos. Otherwise we work with pseudos. */ static bool allocno_p; -/* Number of elements in arrays `in_inc_dec' and `costs'. */ +/* Number of elements in array `costs'. */ static int cost_elements_num; -#ifdef FORBIDDEN_INC_DEC_CLASSES -/* Indexed by n, is TRUE if allocno or pseudo with number N is used in - an auto-inc or auto-dec context. */ -static bool *in_inc_dec; -#endif - /* The `costs' struct records the cost of using hard registers of each class considered for the calculation and of using memory for each allocno or pseudo. */ @@ -1135,13 +1129,7 @@ record_address_regs (enum machine_mode m case PRE_DEC: /* Double the importance of an allocno that is incremented or decremented, since it would take two extra insns if it ends - up in the wrong place. If the operand is a pseudo-register, - show it is being used in an INC_DEC context. */ -#ifdef FORBIDDEN_INC_DEC_CLASSES - if (REG_P (XEXP (x, 0)) - && REGNO (XEXP (x, 0)) >= FIRST_PSEUDO_REGISTER) - in_inc_dec[COST_INDEX (REGNO (XEXP (x, 0)))] = true; -#endif + up in the wrong place. */ record_address_regs (mode, XEXP (x, 0), 0, code, SCRATCH, 2 * scale); break; @@ -1380,9 +1368,6 @@ print_allocno_costs (FILE *f) { rclass = cost_classes[k]; if (contains_reg_of_mode[rclass][PSEUDO_REGNO_MODE (regno)] -#ifdef FORBIDDEN_INC_DEC_CLASSES - && (! in_inc_dec[i] || ! forbidden_inc_dec_class[rclass]) -#endif #ifdef CANNOT_CHANGE_MODE_CLASS && ! invalid_mode_change_p (regno, (enum reg_class) rclass) #endif @@ -1425,9 +1410,6 @@ print_pseudo_costs (FILE *f) { rclass = cost_classes[k]; if (contains_reg_of_mode[rclass][PSEUDO_REGNO_MODE (regno)] -#ifdef FORBIDDEN_INC_DEC_CLASSES - && (! in_inc_dec[regno] || ! forbidden_inc_dec_class[rclass]) -#endif #ifdef CANNOT_CHANGE_MODE_CLASS && ! invalid_mode_change_p (regno, (enum reg_class) rclass) #endif @@ -1477,9 +1459,6 @@ find_costs_and_classes (FILE *dump_file) enum reg_class *regno_best_class; init_recog (); -#ifdef FORBIDDEN_INC_DEC_CLASSES - in_inc_dec = ira_allocate (sizeof (bool) * cost_elements_num); -#endif /* FORBIDDEN_INC_DEC_CLASSES */ regno_best_class = (enum reg_class *) ira_allocate (max_reg_num () * sizeof (enum reg_class)); @@ -1544,9 +1523,6 @@ find_costs_and_classes (FILE *dump_file) /* Zero out our accumulation of the cost of each class for each allocno. */ memset (costs, 0, cost_elements_num * struct_costs_size); -#ifdef FORBIDDEN_INC_DEC_CLASSES - memset (in_inc_dec, 0, cost_elements_num * sizeof (bool)); -#endif if (allocno_p) { @@ -1578,9 +1554,6 @@ find_costs_and_classes (FILE *dump_file) ira_loop_tree_node_t parent; int best_cost, allocno_cost; enum reg_class best, alt_class; -#ifdef FORBIDDEN_INC_DEC_CLASSES - int inc_dec_p = false; -#endif cost_classes_t cost_classes_ptr = regno_cost_classes[i]; enum reg_class *cost_classes = cost_classes_ptr->classes; int *i_costs = temp_costs->cost; @@ -1591,9 +1564,6 @@ find_costs_and_classes (FILE *dump_file) { if (regno_reg_rtx[i] == NULL_RTX) continue; -#ifdef FORBIDDEN_INC_DEC_CLASSES - inc_dec_p = in_inc_dec[i]; -#endif memcpy (temp_costs, COSTS (costs, i), struct_costs_size); i_mem_cost = temp_costs->mem_cost; } @@ -1659,10 +1629,6 @@ find_costs_and_classes (FILE *dump_file) i_mem_cost = INT_MAX; else i_mem_cost += add_cost; -#ifdef FORBIDDEN_INC_DEC_CLASSES - if (in_inc_dec[a_num]) - inc_dec_p = true; -#endif } } if (equiv_savings < 0) @@ -1685,9 +1651,6 @@ find_costs_and_classes (FILE *dump_file) /* Ignore classes that are too small for this operand or invalid for an operand that was auto-incremented. */ if (! contains_reg_of_mode[rclass][PSEUDO_REGNO_MODE (i)] -#ifdef FORBIDDEN_INC_DEC_CLASSES - || (inc_dec_p && forbidden_inc_dec_class[rclass]) -#endif #ifdef CANNOT_CHANGE_MODE_CLASS || invalid_mode_change_p (i, (enum reg_class) rclass) #endif @@ -1764,9 +1727,6 @@ find_costs_and_classes (FILE *dump_file) operand or invalid for an operand that was auto-incremented. */ if (! contains_reg_of_mode[rclass][PSEUDO_REGNO_MODE (i)] -#ifdef FORBIDDEN_INC_DEC_CLASSES - || (inc_dec_p && forbidden_inc_dec_class[rclass]) -#endif #ifdef CANNOT_CHANGE_MODE_CLASS || invalid_mode_change_p (i, (enum reg_class) rclass) #endif @@ -1813,9 +1773,6 @@ find_costs_and_classes (FILE *dump_file) } } ira_free (regno_best_class); -#ifdef FORBIDDEN_INC_DEC_CLASSES - ira_free (in_inc_dec); -#endif }