From patchwork Sun Mar 18 20:55:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 147426 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 A1A95B6FA3 for ; Mon, 19 Mar 2012 07:55:25 +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=1332708926; 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=g3jJ8S6cPM3xfNFBI1zGRrpUO8Q=; b=UKTZi2Mbj4Spe9rnq4Le3xvjWHg5YX1VtB6OhAR6JJPw8gioqmUao7JLm+20pZ 7LNoaDRrw2asDPHbQ31CW0kkHj7RPpUQEvMNUgWpSRyWboK0XgO/MhVjv1AoTpnJ Uz4W5Rq8re5GP6/15ZA6PTtYzeDHt1PiQIUWc2C4piQrU= 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:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=hZmLHJPlcuBdYmZ/c5PPUanY6RxZUC87xY3nckIhEOHK4juDQ4UeIE+yLNxNb5 mfZfUdfPMPNyxaJehIBpKnBfE28DukZtSmKsSQm3dICa6YGPB5aSGgS4tNN80dvn XpqFr6mrXpEAK2bYv9c/QVd9jWw4Zsq5dVsTgqq1Z5DUk=; Received: (qmail 3485 invoked by alias); 18 Mar 2012 20:55:21 -0000 Received: (qmail 3477 invoked by uid 22791); 18 Mar 2012 20:55:20 -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_OV, TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-gx0-f175.google.com (HELO mail-gx0-f175.google.com) (209.85.161.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 18 Mar 2012 20:55:06 +0000 Received: by ggcy3 with SMTP id y3so5384661ggc.20 for ; Sun, 18 Mar 2012 13:55:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.138.110 with SMTP id z74mr9907771yhi.114.1332104105613; Sun, 18 Mar 2012 13:55:05 -0700 (PDT) Received: by 10.146.241.18 with HTTP; Sun, 18 Mar 2012 13:55:05 -0700 (PDT) In-Reply-To: References: Date: Sun, 18 Mar 2012 21:55:05 +0100 Message-ID: Subject: Re: PATCH: Properly generate X32 IE sequence From: Uros Bizjak To: "H.J. Lu" Cc: gcc-patches@gcc.gnu.org, Richard Henderson 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 Sun, Mar 18, 2012 at 5:01 PM, Uros Bizjak wrote: >> I am testing this patch.  OK for trunk if it passes all tests? > > No, force_reg will generate a pseudo, so this conversion is valid only > for !can_create_pseudo (). > > At least for *tls_initial_exec_x32_store, you will need a temporary to > split the pattern after reload. Please try attached patch. It simply throws away all recent complications w.r.t. to thread pointer and always handles TP in DImode. The testcase: --cut here-- __thread int foo __attribute__ ((tls_model ("initial-exec"))); void bar (int x) { foo = x; } int baz (void) { return foo; } --cut here-- Now compiles to: bar: movq foo@gottpoff(%rip), %rax movl %edi, %fs:(%rax) ret baz: movq foo@gottpoff(%rip), %rax movl %fs:(%rax), %eax ret In effect, this always generates %fs(%rDI) and emits REX prefix before mov/add to satisfy brain-dead linkers. The patch is bootstrapping now on x86_64-pc-linux-gnu. Uros. Index: i386.md =================================================================== --- i386.md (revision 185505) +++ i386.md (working copy) @@ -12836,28 +12836,6 @@ } [(set_attr "type" "multi")]) -;; When Pmode == SImode, there may be no REX prefix for ADD. Avoid -;; any instructions between MOV and ADD, which may interfere linker -;; IE->LE optimization, since the last byte of the previous instruction -;; before ADD may look like a REX prefix. This also avoids -;; movl x@gottpoff(%rip), %reg32 -;; movl $fs:(%reg32), %reg32 -;; Since address override works only on the (reg32) part in fs:(reg32), -;; we can't use it as memory operand. -(define_insn "tls_initial_exec_x32" - [(set (match_operand:SI 0 "register_operand" "=r") - (unspec:SI - [(match_operand 1 "tls_symbolic_operand")] - UNSPEC_TLS_IE_X32)) - (clobber (reg:CC FLAGS_REG))] - "TARGET_X32" -{ - output_asm_insn - ("mov{l}\t{%%fs:0, %0|%0, DWORD PTR fs:0}", operands); - return "add{l}\t{%a1@gottpoff(%%rip), %0|%0, %a1@gottpoff[rip]}"; -} - [(set_attr "type" "multi")]) - ;; GNU2 TLS patterns can be split. (define_expand "tls_dynamic_gnu2_32" Index: i386.c =================================================================== --- i386.c (revision 185504) +++ i386.c (working copy) @@ -11509,6 +11509,10 @@ ix86_decompose_address (rtx addr, struct ix86_addr scale = 1 << scale; break; + case ZERO_EXTEND: + op = XEXP (op, 0); + /* FALLTHRU */ + case UNSPEC: if (XINT (op, 1) == UNSPEC_TP && TARGET_TLS_DIRECT_SEG_REFS @@ -12478,15 +12482,15 @@ legitimize_pic_address (rtx orig, rtx reg) /* Load the thread pointer. If TO_REG is true, force it into a register. */ static rtx -get_thread_pointer (bool to_reg) +get_thread_pointer (enum machine_mode tp_mode, bool to_reg) { rtx tp = gen_rtx_UNSPEC (ptr_mode, gen_rtvec (1, const0_rtx), UNSPEC_TP); - if (GET_MODE (tp) != Pmode) - tp = convert_to_mode (Pmode, tp, 1); + if (GET_MODE (tp) != tp_mode) + tp = convert_to_mode (tp_mode, tp, 1); if (to_reg) - tp = copy_addr_to_reg (tp); + tp = copy_to_mode_reg (tp_mode, tp); return tp; } @@ -12538,6 +12542,7 @@ legitimize_tls_address (rtx x, enum tls_model mode { rtx dest, base, off; rtx pic = NULL_RTX, tp = NULL_RTX; + enum machine_mode tp_mode = Pmode; int type; switch (model) @@ -12563,7 +12568,7 @@ legitimize_tls_address (rtx x, enum tls_model mode else emit_insn (gen_tls_dynamic_gnu2_32 (dest, x, pic)); - tp = get_thread_pointer (true); + tp = get_thread_pointer (Pmode, true); dest = force_reg (Pmode, gen_rtx_PLUS (Pmode, tp, dest)); set_unique_reg_note (get_last_insn (), REG_EQUAL, x); @@ -12613,7 +12618,7 @@ legitimize_tls_address (rtx x, enum tls_model mode else emit_insn (gen_tls_dynamic_gnu2_32 (base, tmp, pic)); - tp = get_thread_pointer (true); + tp = get_thread_pointer (Pmode, true); set_unique_reg_note (get_last_insn (), REG_EQUAL, gen_rtx_MINUS (Pmode, tmp, tp)); } @@ -12659,27 +12664,18 @@ legitimize_tls_address (rtx x, enum tls_model mode case TLS_MODEL_INITIAL_EXEC: if (TARGET_64BIT) { + tp_mode = DImode; + if (TARGET_SUN_TLS) { /* The Sun linker took the AMD64 TLS spec literally and can only handle %rax as destination of the initial executable code sequence. */ - dest = gen_reg_rtx (Pmode); + dest = gen_reg_rtx (tp_mode); emit_insn (gen_tls_initial_exec_64_sun (dest, x)); return dest; } - else if (Pmode == SImode) - { - /* Always generate - movl %fs:0, %reg32 - addl xgottpoff(%rip), %reg32 - to support linker IE->LE optimization and avoid - fs:(%reg32) as memory operand. */ - dest = gen_reg_rtx (Pmode); - emit_insn (gen_tls_initial_exec_x32 (dest, x)); - return dest; - } pic = NULL; type = UNSPEC_GOTNTPOFF; @@ -12703,24 +12699,23 @@ legitimize_tls_address (rtx x, enum tls_model mode type = UNSPEC_INDNTPOFF; } - off = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, x), type); - off = gen_rtx_CONST (Pmode, off); + off = gen_rtx_UNSPEC (tp_mode, gen_rtvec (1, x), type); + off = gen_rtx_CONST (tp_mode, off); if (pic) - off = gen_rtx_PLUS (Pmode, pic, off); - off = gen_const_mem (Pmode, off); + off = gen_rtx_PLUS (tp_mode, pic, off); + off = gen_const_mem (tp_mode, off); set_mem_alias_set (off, ix86_GOT_alias_set ()); if (TARGET_64BIT || TARGET_ANY_GNU_TLS) { - base = get_thread_pointer (for_mov - || !(TARGET_TLS_DIRECT_SEG_REFS - && TARGET_TLS_INDIRECT_SEG_REFS)); - off = force_reg (Pmode, off); - return gen_rtx_PLUS (Pmode, base, off); + base = get_thread_pointer (tp_mode, + for_mov || !TARGET_TLS_DIRECT_SEG_REFS); + off = force_reg (tp_mode, off); + return gen_rtx_PLUS (tp_mode, base, off); } else { - base = get_thread_pointer (true); + base = get_thread_pointer (Pmode, true); dest = gen_reg_rtx (Pmode); emit_insn (gen_subsi3 (dest, base, off)); } @@ -12734,14 +12729,13 @@ legitimize_tls_address (rtx x, enum tls_model mode if (TARGET_64BIT || TARGET_ANY_GNU_TLS) { - base = get_thread_pointer (for_mov - || !(TARGET_TLS_DIRECT_SEG_REFS - && TARGET_TLS_INDIRECT_SEG_REFS)); + base = get_thread_pointer (Pmode, + for_mov || !TARGET_TLS_DIRECT_SEG_REFS); return gen_rtx_PLUS (Pmode, base, off); } else { - base = get_thread_pointer (true); + base = get_thread_pointer (Pmode, true); dest = gen_reg_rtx (Pmode); emit_insn (gen_subsi3 (dest, base, off)); } @@ -13269,8 +13263,7 @@ ix86_delegitimize_tls_address (rtx orig_x) rtx x = orig_x, unspec; struct ix86_address addr; - if (!(TARGET_TLS_DIRECT_SEG_REFS - && TARGET_TLS_INDIRECT_SEG_REFS)) + if (!TARGET_TLS_DIRECT_SEG_REFS) return orig_x; if (MEM_P (x)) x = XEXP (x, 0); Index: i386.h =================================================================== --- i386.h (revision 185504) +++ i386.h (working copy) @@ -467,9 +467,6 @@ extern int x86_prefetch_sse; #define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT 0 #endif -/* Address override works only on the (%reg) part of %fs:(%reg). */ -#define TARGET_TLS_INDIRECT_SEG_REFS (Pmode == word_mode) - /* Fence to use after loop using storent. */ extern tree x86_mfence;