From patchwork Thu Oct 15 05:44:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kugan Vivekanandarajah X-Patchwork-Id: 530503 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 808FE1402B9 for ; Thu, 15 Oct 2015 16:45:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=djivyNoj; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=mASvyZKLmOXAkFHnL XQ9gyhHMWs0ZbvbJRdWpc2fMEcyGzI3jYrNf6UvzroF4LZ1Vcee8rr0cBHSqx8Ii 6b0X6CfUYfGVO9JzMXBrwA1UF29sIViv4gNgKqCecSWcfTq2FpXgKqBNgFnzqWJm aaOiwPLf5QB8Qx5vc6KU3QQNGk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=lgcfwu4V0I9p0szyD4NFHiX dFHo=; b=djivyNojxJylwKg6EeXFKqs8J3OTzM7RqY5ghVW+CvJdNIGhz6GHUyJ Jv80rVgOuGiF8RdOF6Yf4BwlF25Yy0JAvxsVlQoZ19P383O2yy0Cf9wcDsn8rAZf gQA9l+tVDGIoHwzCYovmnzxpDcXgMDOIgpOxEFHo+t4FB7yLN658= Received: (qmail 100948 invoked by alias); 15 Oct 2015 05:45:17 -0000 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 Received: (qmail 100521 invoked by uid 89); 15 Oct 2015 05:45:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f50.google.com Received: from mail-pa0-f50.google.com (HELO mail-pa0-f50.google.com) (209.85.220.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 15 Oct 2015 05:45:07 +0000 Received: by pacao1 with SMTP id ao1so12017460pac.2 for ; Wed, 14 Oct 2015 22:45:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type; bh=qCevwoJJD2SpsrtBd7guIT+LTrNqTGwQeJMtr70W/cA=; b=lFNm6657IKJIuqVB5sa+nY+YfqmUXFOoqoiodu3XYTmCFpB77cE2tSJRQMvgToKiUf tVmqQJ4+7/jJsc6uGSX/b/Xc/Td6cIZMejd+sldJ/Ti8F/TYgmnWd/to+0jSMRg/SrRb hn3INqsa1bpINH2Vvz1zQrExMluCPaRMP5SxC5NIjGjAdAb8MwvRYVQTMc9qMRel5QRl yfF4S0o/cQ+i9hKJrB7DeJRCJ9VdX7kffCmOjEE21Z4yaxgNypilT+UYuJDKoyVgRJ1m 2hNTdv7dx5pqFilvkAtUARaIzctZkXWcomi2kIihAZGCnKUJbY3H7lK3DYZhcE6CR+bc JMAQ== X-Gm-Message-State: ALoCoQmaih9Sd81yM+6DyyiG5NoVxtUDDRNaNt/04kJJo1+dAHmZ25OVUbpQ0gfeL40kbkbVDgJm X-Received: by 10.66.146.4 with SMTP id sy4mr7947723pab.79.1444887905584; Wed, 14 Oct 2015 22:45:05 -0700 (PDT) Received: from [10.1.1.5] (58-6-183-210.dyn.iinet.net.au. [58.6.183.210]) by smtp.googlemail.com with ESMTPSA id ci2sm12858506pbc.66.2015.10.14.22.45.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2015 22:45:04 -0700 (PDT) Subject: Re: [5/7] Allow gimple debug stmt in widen mode To: Richard Biener References: <55ECFC2A.7050908@linaro.org> <55ECFE08.8060405@linaro.org> <55EE2523.6000209@linaro.org> Cc: Michael Matz , "gcc-patches@gcc.gnu.org" From: Kugan Message-ID: <561F3D5B.4060709@linaro.org> Date: Thu, 15 Oct 2015 16:44:59 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: X-IsSubscribed: yes On 15/09/15 22:57, Richard Biener wrote: > On Tue, Sep 8, 2015 at 2:00 AM, Kugan wrote: >> >> Thanks for the review. >> >> On 07/09/15 23:20, Michael Matz wrote: >>> Hi, >>> >>> On Mon, 7 Sep 2015, Kugan wrote: >>> >>>> Allow GIMPLE_DEBUG with values in promoted register. >>> >>> Patch does much more. >>> >> >> Oops sorry. Copy and paste mistake. >> >> gcc/ChangeLog: >> >> 2015-09-07 Kugan Vivekanandarajah >> >> * cfgexpand.c (expand_debug_locations): Remove assert as now we are >> also allowing values in promoted register. >> * gimple-ssa-type-promote.c (fixup_uses): Allow GIMPLE_DEBUG to bind >> values in promoted register. >> * rtl.h (wi::int_traits ::decompose): Accept zero extended value >> also. >> >> >>>> gcc/ChangeLog: >>>> >>>> 2015-09-07 Kugan Vivekanandarajah >>>> >>>> * expr.c (expand_expr_real_1): Set proper SUNREG_PROMOTED_MODE for >>>> SSA_NAME that was set by GIMPLE_CALL and assigned to another >>>> SSA_NAME of same type. >>> >>> ChangeLog doesn't match patch, and patch contains dubious changes: >>> >>>> --- a/gcc/cfgexpand.c >>>> +++ b/gcc/cfgexpand.c >>>> @@ -5240,7 +5240,6 @@ expand_debug_locations (void) >>>> tree value = (tree)INSN_VAR_LOCATION_LOC (insn); >>>> rtx val; >>>> rtx_insn *prev_insn, *insn2; >>>> - machine_mode mode; >>>> >>>> if (value == NULL_TREE) >>>> val = NULL_RTX; >>>> @@ -5275,16 +5274,6 @@ expand_debug_locations (void) >>>> >>>> if (!val) >>>> val = gen_rtx_UNKNOWN_VAR_LOC (); >>>> - else >>>> - { >>>> - mode = GET_MODE (INSN_VAR_LOCATION (insn)); >>>> - >>>> - gcc_assert (mode == GET_MODE (val) >>>> - || (GET_MODE (val) == VOIDmode >>>> - && (CONST_SCALAR_INT_P (val) >>>> - || GET_CODE (val) == CONST_FIXED >>>> - || GET_CODE (val) == LABEL_REF))); >>>> - } >>>> >>>> INSN_VAR_LOCATION_LOC (insn) = val; >>>> prev_insn = PREV_INSN (insn); >>> >>> So it seems that the modes of the values location and the value itself >>> don't have to match anymore, which seems dubious when considering how a >>> debugger should load the value in question from the given location. So, >>> how is it supposed to work? >> >> For example (simplified test-case from creduce): >> >> fn1() { >> char a = fn1; >> return a; >> } >> >> --- test.c.142t.veclower21 2015-09-07 23:47:26.362201640 +0000 >> +++ test.c.143t.promotion 2015-09-07 23:47:26.362201640 +0000 >> @@ -5,13 +5,18 @@ >> { >> char a; >> long int fn1.0_1; >> + unsigned int _2; >> int _3; >> + unsigned int _5; >> + char _6; >> >> : >> fn1.0_1 = (long int) fn1; >> - a_2 = (char) fn1.0_1; >> - # DEBUG a => a_2 >> - _3 = (int) a_2; >> + _5 = (unsigned int) fn1.0_1; >> + _2 = _5 & 255; >> + # DEBUG a => _2 >> + _6 = (char) _2; >> + _3 = (int) _6; >> return _3; >> >> } >> >> Please see that DEBUG now points to _2 which is a promoted mode. I am >> assuming that the debugger would load required precision from promoted >> register. May be I am missing the details but how else we can handle >> this? Any suggestions? > > I would have expected the DEBUG insn to be adjusted as > > # DEBUG a => (char)_2 Thanks for the review. Please find the attached patch that attempts to do this. I have also tested a version of this patch with gdb testsuite. As Michael wanted, I have also removed the changes in rtl.h and promoting constants in GIMPLE_DEBUG. > Btw, why do we have > >> + _6 = (char) _2; >> + _3 = (int) _6; > > ? I'd have expected > > unsigned int _6 = SEXT <_2, 8> > _3 = (int) _6; > return _3; I am looking into it. > > see my other mail about promotion of PARM_DECLs and RESULT_DECLs -- we should > promote those as well. > Just to be sure, are you referring to https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00244.html where you wanted an IPA pass to perform this. This is one of my dodo after this. Please let me know if you wanted here is a different issue. Thanks, Kuganb From 7cbcca8ebd03f60e16a55da4af3fc573f98d4086 Mon Sep 17 00:00:00 2001 From: Kugan Vivekanandarajah Date: Tue, 1 Sep 2015 08:40:40 +1000 Subject: [PATCH 5/7] debug stmt in widen mode --- gcc/cfgexpand.c | 11 ------- gcc/gimple-ssa-type-promote.c | 77 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 14 deletions(-) diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 357710b..be43f46 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -5234,7 +5234,6 @@ expand_debug_locations (void) tree value = (tree)INSN_VAR_LOCATION_LOC (insn); rtx val; rtx_insn *prev_insn, *insn2; - machine_mode mode; if (value == NULL_TREE) val = NULL_RTX; @@ -5269,16 +5268,6 @@ expand_debug_locations (void) if (!val) val = gen_rtx_UNKNOWN_VAR_LOC (); - else - { - mode = GET_MODE (INSN_VAR_LOCATION (insn)); - - gcc_assert (mode == GET_MODE (val) - || (GET_MODE (val) == VOIDmode - && (CONST_SCALAR_INT_P (val) - || GET_CODE (val) == CONST_FIXED - || GET_CODE (val) == LABEL_REF))); - } INSN_VAR_LOCATION_LOC (insn) = val; prev_insn = PREV_INSN (insn); diff --git a/gcc/gimple-ssa-type-promote.c b/gcc/gimple-ssa-type-promote.c index 513d20d..4034203 100644 --- a/gcc/gimple-ssa-type-promote.c +++ b/gcc/gimple-ssa-type-promote.c @@ -585,10 +585,81 @@ fixup_uses (tree use, tree promoted_type, tree old_type) { case GIMPLE_DEBUG: { - gsi = gsi_for_stmt (stmt); - gsi_remove (&gsi, true); - break; + tree op, new_op = NULL_TREE; + gdebug *copy = NULL, *gs = as_a (stmt); + enum tree_code code; + + switch (gs->subcode) + { + case GIMPLE_DEBUG_BIND: + op = gimple_debug_bind_get_value (gs); + break; + case GIMPLE_DEBUG_SOURCE_BIND: + op = gimple_debug_source_bind_get_value (gs); + break; + default: + gcc_unreachable (); + } + + switch (TREE_CODE_CLASS (TREE_CODE (op))) + { + case tcc_exceptional: + case tcc_unary: + { + /* Convert DEBUG stmt of the form: + # DEBUG a => _2 + to + # DEBUG a => (char)_2 */ + new_op = build1 (CONVERT_EXPR, old_type, use); + break; + } + case tcc_binary: + code = TREE_CODE (op); + /* Convert the INTEGER_CST in tcc_binary to promoted_type, + if the expression is of kind that will be promoted. */ + if (code == LROTATE_EXPR + || code == RROTATE_EXPR + || code == COMPLEX_EXPR) + break; + else + { + tree op0 = TREE_OPERAND (op, 0); + tree op1 = TREE_OPERAND (op, 1); + if (TREE_CODE (op0) == INTEGER_CST) + op0 = convert_int_cst (promoted_type, op0, SIGNED); + if (TREE_CODE (op1) == INTEGER_CST) + op1 = convert_int_cst (promoted_type, op1, SIGNED); + new_op = build2 (TREE_CODE (op), promoted_type, op0, op1); + break; + } + default: + break; + } + + if (new_op) + { + if (gimple_debug_bind_p (stmt)) + { + copy = gimple_build_debug_bind + (gimple_debug_bind_get_var (stmt), + new_op, + stmt); + } + if (gimple_debug_source_bind_p (stmt)) + { + copy = gimple_build_debug_source_bind + (gimple_debug_source_bind_get_var (stmt), new_op, + stmt); + } + + if (copy) + { + gsi = gsi_for_stmt (stmt); + gsi_replace (&gsi, copy, false); + } + } } + break; case GIMPLE_ASM: case GIMPLE_CALL: -- 1.9.1