From patchwork Fri Oct 9 14:14:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 528237 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 CC2231402A8 for ; Sat, 10 Oct 2015 01:14:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=sscHV6/p; 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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=JcefLSD0ZqLlVqY6hL9rvZrr/ehv1nBlVBvgbEpk8VQnuF3RMi sVZwsJ45QULFNNnwR6z+8WP7qDH+YNPjefzt1evJMaJHJe7ew+mi47lLW+9/5up9 Sem4NKblRFfgsknUlFMQvwAKk9LcpD0C3ApQU02LuoDW1QOtvnyyuF34o= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=+3gA34GlzILBJj+S6mx8BRI0pm0=; b=sscHV6/plzPnBwieAHZs fKpJM8KyVmvrZSA2Yh1y3DsVl8URjbJeNB4YEJKJ6TBbok32u+g24eZ3MAC+0TyA 3DZ+87JBg/JwyS8dotGqhH5vLHGKNYyVblnZm7sr6No4WIjHSM0blEmKzfwKBU6y 5CedhslKJtNfdDkUzVLOR4Q= Received: (qmail 50008 invoked by alias); 9 Oct 2015 14:14:53 -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 49997 invoked by uid 89); 9 Oct 2015 14:14:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=BAYES_00, FREEMAIL_FROM, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f54.google.com Received: from mail-qg0-f54.google.com (HELO mail-qg0-f54.google.com) (209.85.192.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 09 Oct 2015 14:14:51 +0000 Received: by qgew37 with SMTP id w37so10964544qge.0 for ; Fri, 09 Oct 2015 07:14:49 -0700 (PDT) X-Received: by 10.140.109.74 with SMTP id k68mr15929685qgf.77.1444400089317; Fri, 09 Oct 2015 07:14:49 -0700 (PDT) Received: from ?IPv6:2601:181:c000:c497:a2a8:cdff:fe3e:b48? ([2601:181:c000:c497:a2a8:cdff:fe3e:b48]) by smtp.googlemail.com with ESMTPSA id k206sm714751qhk.2.2015.10.09.07.14.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2015 07:14:48 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: [gomp4] Message-ID: <5617CBD5.9070807@acm.org> Date: Fri, 9 Oct 2015 10:14:45 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 I've applied this to gomp4 branch. 1) ports the break fix in gimple-fold from trunk 2) fixes missing tab in ptx output. nathan 2015-10-09 Nathan Sidwell * config/nvptx/nvptx.c (nvptx_init_axis_predicate): Fix output formatting. PR 67861 * gimple-fold.c (gimple_fold_builtin): Add break after BUILT_IN_PRINTF_CHK, BUILT_IN_VPRINTF_CHK folding. Index: gcc/config/nvptx/nvptx.c =================================================================== --- gcc/config/nvptx/nvptx.c (revision 228656) +++ gcc/config/nvptx/nvptx.c (working copy) @@ -629,8 +629,7 @@ static void nvptx_init_axis_predicate (FILE *file, int regno, const char *name) { fprintf (file, "\t{\n"); - - fprintf (file, "\t.reg.u32\t%%%s;\n", name); + fprintf (file, "\t\t.reg.u32\t%%%s;\n", name); fprintf (file, "\t\tmov.u32\t%%%s, %%tid.%s;\n", name, name); fprintf (file, "\t\tsetp.ne.u32\t%%r%d, %%%s, 0;\n", regno, name); fprintf (file, "\t}\n"); Index: gcc/gimple-fold.c =================================================================== --- gcc/gimple-fold.c (revision 228656) +++ gcc/gimple-fold.c (working copy) @@ -2890,6 +2890,7 @@ gimple_fold_builtin (gimple_stmt_iterato n == 3 ? gimple_call_arg (stmt, 2) : NULL_TREE, fcode); + break; case BUILT_IN_ACC_ON_DEVICE: return gimple_fold_builtin_acc_on_device (gsi, gimple_call_arg (stmt, 0));