From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22192 invoked by alias); 25 Feb 2016 15:35:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 22169 invoked by uid 89); 25 Feb 2016 15:35:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_PASS autolearn=ham version=3.3.2 spammy=intervals X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Thu, 25 Feb 2016 15:35:48 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 075B9AC9E for ; Thu, 25 Feb 2016 15:35:45 +0000 (UTC) Resent-From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Resent-To: GCC Patches Resent-Date: Thu, 25 Feb 2016 16:35:44 +0100 Resent-Message-ID: <56CF1F50.1030205@suse.cz> Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 Message-Id: <72723331ee9c98cde2389c110e20cac6c08a631c.1456409352.git.mliska@suse.cz> In-Reply-To: References: From: marxin Date: Thu, 25 Feb 2016 15:35:00 -0000 Subject: [PATCH 1/4] Replace ENABLE_CHECKING macro with flag_checking in HSA To: gcc-patches@gcc.gnu.org X-IsSubscribed: yes X-SW-Source: 2016-02/txt/msg01733.txt.bz2 gcc/ChangeLog: 2016-02-24 Martin Liska * hsa-gen.c (generate_hsa): Replace ENABLE_CHECKING macro with flag_checking. * hsa-regalloc.c (linear_scan_regalloc): Likewise. --- gcc/hsa-gen.c | 25 +++++++++++++------------ gcc/hsa-regalloc.c | 7 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gcc/hsa-gen.c b/gcc/hsa-gen.c index 28e8b6f..8e2144c 100644 --- a/gcc/hsa-gen.c +++ b/gcc/hsa-gen.c @@ -6091,21 +6091,22 @@ generate_hsa (bool kernel) s->m_gridified_kernel_p); } -#ifdef ENABLE_CHECKING - for (unsigned i = 0; i < hsa_cfun->m_ssa_map.length (); i++) - if (hsa_cfun->m_ssa_map[i]) - hsa_cfun->m_ssa_map[i]->verify_ssa (); - - basic_block bb; - FOR_EACH_BB_FN (bb, cfun) + if (flag_checking) { - hsa_bb *hbb = hsa_bb_for_bb (bb); + for (unsigned i = 0; i < hsa_cfun->m_ssa_map.length (); i++) + if (hsa_cfun->m_ssa_map[i]) + hsa_cfun->m_ssa_map[i]->verify_ssa (); - for (hsa_insn_basic *insn = hbb->m_first_insn; insn; insn = insn->m_next) - insn->verify (); - } + basic_block bb; + FOR_EACH_BB_FN (bb, cfun) + { + hsa_bb *hbb = hsa_bb_for_bb (bb); -#endif + for (hsa_insn_basic *insn = hbb->m_first_insn; insn; + insn = insn->m_next) + insn->verify (); + } + } hsa_regalloc (); hsa_brig_emit_function (); diff --git a/gcc/hsa-regalloc.c b/gcc/hsa-regalloc.c index f8e83ecf..9437132 100644 --- a/gcc/hsa-regalloc.c +++ b/gcc/hsa-regalloc.c @@ -580,10 +580,9 @@ linear_scan_regalloc (struct m_reg_class_desc *classes) /* Sort all intervals by increasing start point. */ gcc_assert (ind2reg.length () == (size_t) hsa_cfun->m_reg_count); -#ifdef ENABLE_CHECKING - for (unsigned i = 0; i < ind2reg.length (); i++) - gcc_assert (ind2reg[i]); -#endif + if (flag_checking) + for (unsigned i = 0; i < ind2reg.length (); i++) + gcc_assert (ind2reg[i]); ind2reg.qsort (cmp_begin); for (i = 0; i < 4; i++) -- 2.7.0