From patchwork Thu Jan 5 15:01:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 134489 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 F0C711007D6 for ; Fri, 6 Jan 2012 02:02:05 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1326380526; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=AIWihGkVyYWxhiY9AyRK SMz8f4g=; b=sya1SyCgVbvYEoycYAyd0L0EWgLIFVfLAa1q2Jq4i/bp5kDWOC25 +0sTRSwZaEFWs9wUxe4GdLMO6Fz1yYL/BSqPcSQfguAb35JdY/VSH0yIT6hxCeP/ A714kpXsNsoMMqRYndDM15eyae8NUKLFXyDqqjAJag5BWwhbPacxDXA= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=bTPR2Exqgjj1AZzDSxitG1QmclvsKrFWZc3DHpatMkyAsVXWZXYJMr45KKXtDp meczUjGx+TxqV4juKZzFK2ieMq4nKARBKEGtj9uVunsnGrekcjT7oEjndL5/574w DP+S7k9Ujoph4Zw+pPMyrb7cvC8VIXeMmDz/94H3zwe+A=; Received: (qmail 29086 invoked by alias); 5 Jan 2012 15:02:01 -0000 Received: (qmail 29077 invoked by uid 22791); 5 Jan 2012 15:01:59 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 05 Jan 2012 15:01:44 +0000 Received: from relay2.suse.de (nat.nue.novell.com [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8CF358CC2B for ; Thu, 5 Jan 2012 16:01:43 +0100 (CET) Date: Thu, 5 Jan 2012 16:01:43 +0100 (CET) From: Richard Guenther To: gcc-patches@gcc.gnu.org Subject: [PATCH] Handle OPTIMIZATION_NODE in LTO Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 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 Easy, just mimics what we do for the target attribute. Bootstrap / regtest pending on x86_64-unknown-linux-gnu. Richard. 2012-01-05 Richard Guenther PR lto/50490 * tree-streamer-out.c (write_ts_optimization): New function. (streamer_write_tree_body): Call it. * tree-streamer-in.c (lto_input_ts_optimization): New function. (streamer_read_tree_body): Call it. * lto-streamer-out.c (lto_is_streamable): Handle OPTIMIZATION_NODE. Index: gcc/tree-streamer-out.c =================================================================== --- gcc/tree-streamer-out.c (revision 182908) +++ gcc/tree-streamer-out.c (working copy) @@ -767,6 +767,27 @@ write_ts_target_option (struct output_bl streamer_write_bitpack (&bp); } +/* Write a TS_OPTIMIZATION tree in EXPR to OB. */ + +static void +write_ts_optimization (struct output_block *ob, tree expr) +{ + struct cl_optimization *t = TREE_OPTIMIZATION (expr); + struct bitpack_d bp; + unsigned i, len; + + /* The cl_optimizaation is generated by the options + awk script, so we just recreate a byte-by-byte copy here. */ + + bp = bitpack_create (ob->main_stream); + len = sizeof (struct cl_optimization); + for (i = 0; i < len; i++) + bp_pack_value (&bp, ((unsigned char *)t)[i], 8); + /* Catch struct size mismatches between reader and writer. */ + bp_pack_value (&bp, 0x12345678, 32); + streamer_write_bitpack (&bp); +} + /* Write a TS_TRANSLATION_UNIT_DECL tree in EXPR to OB. */ static void @@ -841,6 +862,9 @@ streamer_write_tree_body (struct output_ if (CODE_CONTAINS_STRUCT (code, TS_TARGET_OPTION)) write_ts_target_option (ob, expr); + if (CODE_CONTAINS_STRUCT (code, TS_OPTIMIZATION)) + write_ts_optimization (ob, expr); + if (CODE_CONTAINS_STRUCT (code, TS_TRANSLATION_UNIT_DECL)) write_ts_translation_unit_decl_tree_pointers (ob, expr); } Index: gcc/tree-streamer-in.c =================================================================== --- gcc/tree-streamer-in.c (revision 182908) +++ gcc/tree-streamer-in.c (working copy) @@ -903,6 +903,23 @@ lto_input_ts_target_option (struct lto_i fatal_error ("cl_target_option size mismatch in LTO reader and writer"); } +/* Input a TS_OPTIMIZATION tree from IB into EXPR. */ + +static void +lto_input_ts_optimization (struct lto_input_block *ib, tree expr) +{ + unsigned i, len; + struct bitpack_d bp; + struct cl_optimization *t = TREE_OPTIMIZATION (expr); + + bp = streamer_read_bitpack (ib); + len = sizeof (struct cl_optimization); + for (i = 0; i < len; i++) + ((unsigned char *)t)[i] = bp_unpack_value (&bp, 8); + if (bp_unpack_value (&bp, 32) != 0x12345678) + fatal_error ("cl_optimization size mismatch in LTO reader and writer"); +} + /* Input a TS_TRANSLATION_UNIT_DECL tree from IB and DATA_IN into EXPR. */ static void @@ -979,6 +996,9 @@ streamer_read_tree_body (struct lto_inpu if (CODE_CONTAINS_STRUCT (code, TS_TARGET_OPTION)) lto_input_ts_target_option (ib, expr); + if (CODE_CONTAINS_STRUCT (code, TS_OPTIMIZATION)) + lto_input_ts_optimization (ib, expr); + if (CODE_CONTAINS_STRUCT (code, TS_TRANSLATION_UNIT_DECL)) lto_input_ts_translation_unit_decl_tree_pointers (ib, data_in, expr); } Index: gcc/lto-streamer-out.c =================================================================== --- gcc/lto-streamer-out.c (revision 182908) +++ gcc/lto-streamer-out.c (working copy) @@ -304,7 +304,6 @@ lto_is_streamable (tree expr) && code != WITH_CLEANUP_EXPR && code != STATEMENT_LIST && code != OMP_CLAUSE - && code != OPTIMIZATION_NODE && (code == CASE_LABEL_EXPR || code == DECL_EXPR || TREE_CODE_CLASS (code) != tcc_statement);