From patchwork Mon Mar 12 16:50:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 146171 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 3E0B8B6ED0 for ; Tue, 13 Mar 2012 03:51:07 +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=1332175867; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=ThkGchBtnH842SpuToUZSzvszEM=; b=eHjZLO0Wil+MadnaTQkEOXRXUcvv6gfsLbGCTAhlITFLhevUAjx6//3r5SoM1W eNM6BMVbAqJP9cZ3GEWWOr8E339QKkAhF5WUz3XQHFKgIbTCaqCu1M21Rj+BSdJU XXKrp0nwdrXj1dOy3Ha9HYZ4au6IAtzZ0GmGKU0ggay+k= 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:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=GaI140VY2xcgoV/SfV1Wllnr2qAJyd10Ub8qCs/ycoCOMdlmAFnKD7JoVXIq37 JVMcVX7t4Vgx8r6a+F6P/DVYT00h7I+j3dHna94YOKs41QNSXr5BdAvOZ3N+UwnN laMVzsvufVdziLW+AqbIfvFy8DkSshFl6kqchlygyfygg=; Received: (qmail 7918 invoked by alias); 12 Mar 2012 16:50:50 -0000 Received: (qmail 7715 invoked by uid 22791); 12 Mar 2012 16:50:41 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-fa0-f47.google.com (HELO mail-fa0-f47.google.com) (209.85.161.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Mar 2012 16:50:26 +0000 Received: by faaq2 with SMTP id q2so181446faa.20 for ; Mon, 12 Mar 2012 09:50:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.27.84 with SMTP id h20mr8875661qac.48.1331571024261; Mon, 12 Mar 2012 09:50:24 -0700 (PDT) Received: by 10.229.89.137 with HTTP; Mon, 12 Mar 2012 09:50:24 -0700 (PDT) In-Reply-To: References: <20120311232613.GA28504@intel.com> Date: Mon, 12 Mar 2012 09:50:24 -0700 Message-ID: Subject: Re: PATCH: Call gen_tls_global_dynamic_64_ and en_tls_local_dynamic_base_64_ From: "H.J. Lu" To: Uros Bizjak Cc: gcc-patches@gcc.gnu.org, Richard Henderson 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 Mon, Mar 12, 2012 at 12:46 AM, Uros Bizjak wrote: > On Mon, Mar 12, 2012 at 12:26 AM, H.J. Lu wrote: > >> Pmode may be DImode for x32.  This patch calls >> gen_tls_global_dynamic_64_ and gen_tls_local_dynamic_base_64_, >> depending on Pmode.  Tested on Linux/x86-64.  OK for trunk? >> >> 2012-03-11  H.J. Lu   >> >>        * config/i386/i386.c (legitimize_tls_address): Call >>        gen_tls_global_dynamic_64_ and >>        gen_tls_local_dynamic_base_64_, depending on Pmode. >> >>        * config/i386/i386.md (*tls_global_dynamic_64): Renamed to ... >>        (*tls_global_dynamic_64_): This. >>        (tls_global_dynamic_64): Renamed to ... >>        (tls_global_dynamic_64_): This. >>        (*tls_local_dynamic_base_64): Renamed to ... >>        (*tls_local_dynamic_base_64): This. >>        (tls_local_dynamic_base_64): Renamed to ... >>        (tls_local_dynamic_base_64): This. >> >> diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c >> index d673101..fc8fa12 100644 >> --- a/gcc/config/i386/i386.c >> +++ b/gcc/config/i386/i386.c >> @@ -12533,7 +12543,12 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) >>              rtx rax = gen_rtx_REG (Pmode, AX_REG), insns; >> >>              start_sequence (); >> -             emit_call_insn (gen_tls_global_dynamic_64 (rax, x, caddr)); >> +             if (Pmode == DImode) >> +               emit_call_insn (gen_tls_global_dynamic_64_di (rax, x, >> +                                                             caddr)); >> +             else >> +               emit_call_insn (gen_tls_global_dynamic_64_si (rax, x, >> +                                                             caddr)); >>              insns = get_insns (); >>              end_sequence (); >> >> @@ -12581,7 +12596,12 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) >>              rtx rax = gen_rtx_REG (Pmode, AX_REG), insns, eqv; >> >>              start_sequence (); >> -             emit_call_insn (gen_tls_local_dynamic_base_64 (rax, caddr)); >> +             if (Pmode == DImode) >> +               emit_call_insn (gen_tls_local_dynamic_base_64_di (rax, >> +                                                                 caddr)); >> +             else >> +               emit_call_insn (gen_tls_local_dynamic_base_64_si (rax, >> +                                                                 caddr)); >>              insns = get_insns (); >>              end_sequence (); > > Please use indirect functions here, see many examples in the code. > > OK with this change. > > Thanks, > Uros. This is the patch I checked in. Thanks. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index d85dc25..dbcf5a9 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -2444,6 +2444,8 @@ static rtx (*ix86_gen_andsp) (rtx, rtx, rtx); static rtx (*ix86_gen_allocate_stack_worker) (rtx, rtx); static rtx (*ix86_gen_adjust_stack_and_probe) (rtx, rtx, rtx); static rtx (*ix86_gen_probe_stack_range) (rtx, rtx, rtx); +static rtx (*ix86_gen_tls_global_dynamic_64) (rtx, rtx, rtx); +static rtx (*ix86_gen_tls_local_dynamic_base_64) (rtx, rtx); /* Preferred alignment for stack boundary in bits. */ unsigned int ix86_preferred_stack_boundary; @@ -3754,9 +3756,19 @@ ix86_option_override_internal (bool main_args_p) { ix86_gen_leave = gen_leave_rex64; if (Pmode == DImode) - ix86_gen_monitor = gen_sse3_monitor64_di; + { + ix86_gen_monitor = gen_sse3_monitor64_di; + ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_di; + ix86_gen_tls_local_dynamic_base_64 + = gen_tls_local_dynamic_base_64_di; + } else - ix86_gen_monitor = gen_sse3_monitor64_si; + { + ix86_gen_monitor = gen_sse3_monitor64_si; + ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_si; + ix86_gen_tls_local_dynamic_base_64 + = gen_tls_local_dynamic_base_64_si; + } } else { @@ -12549,7 +12561,8 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) rtx rax = gen_rtx_REG (Pmode, AX_REG), insns; start_sequence (); - emit_call_insn (gen_tls_global_dynamic_64 (rax, x, caddr)); + emit_call_insn (ix86_gen_tls_global_dynamic_64 (rax, x, + caddr)); insns = get_insns (); end_sequence (); @@ -12597,7 +12610,8 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) rtx rax = gen_rtx_REG (Pmode, AX_REG), insns, eqv; start_sequence (); - emit_call_insn (gen_tls_local_dynamic_base_64 (rax, caddr)); + emit_call_insn (ix86_gen_tls_local_dynamic_base_64 (rax, + caddr)); insns = get_insns (); end_sequence (); diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 986ddad..4b64aae 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -12573,13 +12573,13 @@ (clobber (match_scratch:SI 5 "")) (clobber (reg:CC FLAGS_REG))])]) -(define_insn "*tls_global_dynamic_64" - [(set (match_operand:DI 0 "register_operand" "=a") - (call:DI - (mem:QI (match_operand:DI 2 "constant_call_address_operand" "z")) - (match_operand:DI 3 "" ""))) - (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")] - UNSPEC_TLS_GD)] +(define_insn "*tls_global_dynamic_64_" + [(set (match_operand:P 0 "register_operand" "=a") + (call:P + (mem:QI (match_operand:P 2 "constant_call_address_operand" "z")) + (match_operand:P 3 "" ""))) + (unspec:P [(match_operand:P 1 "tls_symbolic_operand" "")] + UNSPEC_TLS_GD)] "TARGET_64BIT" { if (!TARGET_X32) @@ -12596,14 +12596,15 @@ (set (attr "length") (symbol_ref "TARGET_X32 ? 15 : 16"))]) -(define_expand "tls_global_dynamic_64" +(define_expand "tls_global_dynamic_64_" [(parallel - [(set (match_operand:DI 0 "register_operand" "") - (call:DI - (mem:QI (match_operand:DI 2 "constant_call_address_operand" "")) + [(set (match_operand:P 0 "register_operand" "") + (call:P + (mem:QI (match_operand:P 2 "constant_call_address_operand" "")) (const_int 0))) - (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")] - UNSPEC_TLS_GD)])]) + (unspec:P [(match_operand:P 1 "tls_symbolic_operand" "")] + UNSPEC_TLS_GD)])] + "TARGET_64BIT") (define_insn "*tls_local_dynamic_base_32_gnu" [(set (match_operand:SI 0 "register_operand" "=a") @@ -12640,12 +12641,12 @@ (clobber (match_scratch:SI 4 "")) (clobber (reg:CC FLAGS_REG))])]) -(define_insn "*tls_local_dynamic_base_64" - [(set (match_operand:DI 0 "register_operand" "=a") - (call:DI - (mem:QI (match_operand:DI 1 "constant_call_address_operand" "z")) - (match_operand:DI 2 "" ""))) - (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)] +(define_insn "*tls_local_dynamic_base_64_" + [(set (match_operand:P 0 "register_operand" "=a") + (call:P + (mem:QI (match_operand:P 1 "constant_call_address_operand" "z")) + (match_operand:P 2 "" ""))) + (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)] "TARGET_64BIT" { output_asm_insn @@ -12657,13 +12658,14 @@ [(set_attr "type" "multi") (set_attr "length" "12")]) -(define_expand "tls_local_dynamic_base_64" +(define_expand "tls_local_dynamic_base_64_" [(parallel - [(set (match_operand:DI 0 "register_operand" "") - (call:DI - (mem:QI (match_operand:DI 1 "constant_call_address_operand" "")) + [(set (match_operand:P 0 "register_operand" "") + (call:P + (mem:QI (match_operand:P 1 "constant_call_address_operand" "")) (const_int 0))) - (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)])]) + (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)])] + "TARGET_64BIT") ;; Local dynamic of a single variable is a lose. Show combine how ;; to convert that back to global dynamic.