From patchwork Fri Jan 17 23:13:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1225056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517633-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=ApEBxHKh; dkim=pass (2048-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=pfpt0818 header.b=V0d5hEMI; dkim-atps=neutral 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 47zxhr6bjXz9sR0 for ; Sat, 18 Jan 2020 10:14:18 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=tK6Ze96RFrWIQDyYCU0z6GzZsM4pepVffWUsb2cz6iCbjv8ABV asm9gAbHqqtEir/L3MGNhAKK8kU2D6dnYKTnjwVA6HaHyrMcpady9GlTZgRyZdVr HtHiJTr8lSek0h/Bq8V6FfGfqPNyqoK9Jx+g1GZ5GjNHWpxQ4dRws02Co= 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:from :to:cc:subject:date:message-id:mime-version:content-type; s= default; bh=gqxjm+35bMDZaPAzgVfDZqR2WT4=; b=ApEBxHKhQ2FvyYsdWUa/ 8eHExAEIBx5y2R6/sU0Les8mZVhv9dES7MV1O0Bb7mx720sh34h+u4DYVVOHYoTl NSa3wrNza3CGPI41/DBZl/usqNj/f0Ug3ovR40/7qY2TLLJzsCBiPI0KaoYfLoH6 +r0vt/7rjsYqU4rYOTXq3VM= Received: (qmail 83868 invoked by alias); 17 Jan 2020 23:14:11 -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 83860 invoked by uid 89); 17 Jan 2020 23:14:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:4379 X-HELO: mx0b-0016f401.pphosted.com Received: from mx0b-0016f401.pphosted.com (HELO mx0b-0016f401.pphosted.com) (67.231.156.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Jan 2020 23:14:09 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00HNAbm3005143 for ; Fri, 17 Jan 2020 15:14:07 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=VoxJbZ3peTNcZDYP2LPlIFMe+kMMhiIpbuR605oYcCw=; b=V0d5hEMIElUNyzFTpcFjxPEikYMhFLsptfgvwLDEUikp2mGWLy5fZifcqHfc/a7AUfTZ 3RJxl2liqQ62kf1THXFo+i80Iz/CqvgqB0gfVmD00PjiDtaHjovli9nDQIeBe+qHUs1U B60cCaeg+WXM02VxHPuMdsbiJPoz9yK3qyFmVE6UbaJWnj0UI4KD8my+JE6v3dwcAtxD PJt9itgsJNg2GBrIIWO3C2tGxJat2rggZfNmwyAHUbilYFsDy/vdjG+//ZE9yicRyk/g VFh3xqQkb/WjTee9a8/NzULQOi4svRjm2GpSjgP5EDFdnI1UjKwdiHSK5MiCyAh45CK6 CQ== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2xk0sn4tds-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 17 Jan 2020 15:14:07 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Jan 2020 15:14:06 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 17 Jan 2020 15:14:06 -0800 Received: from linux.pinskiwright.org.com (unknown [10.104.47.220]) by maili.marvell.com (Postfix) with ESMTP id A59983F7040; Fri, 17 Jan 2020 15:14:01 -0800 (PST) From: To: CC: Andrew Pinski Subject: [PATCH] Fix target/93119 (aarch64): ICE with traditional TLS support on ILP32 Date: Fri, 17 Jan 2020 15:13:37 -0800 Message-ID: <1579302817-19505-1-git-send-email-apinski@marvell.com> MIME-Version: 1.0 From: Andrew Pinski The problem here was g:23b88fda665d2f995c was not a complete fix for supporting tranditional TLS on ILP32. So the problem here is a couple of things, first __tls_get_addr call will return a C pointer value so we need to use ptr_mode when we are creating the call. Then we need to convert back that register to the correct mode, either zero extending it or just creating a move instruction. Also symbol_ref can either be in SImode or DImode. So we need to allow both modes. Built and tested on aarch64-linux-gnu with no regressions. Also built a full toolchain (including glibc) defaulting to traditional TLS that targets ilp32 and lp64. OK? Thanks, Andrew Pinski ChangeLog: * config/aarch64/aarch64.md (tlsgd_small_): Have operand 0 as PTR mode. Have operand 1 as being modeless, it can be P mode. (*tlsgd_small_): Likewise. * config/aarch64/aarch64.c (aarch64_load_symref_appropriately) : Call gen_tlsgd_small_* with a ptr_mode register. Convert that register back to dest using convert_mode. Change-Id: I76826350d6bace0b731f21df1f125e9122da843f --- gcc/config/aarch64/aarch64.c | 18 ++++++++++++++---- gcc/config/aarch64/aarch64.md | 8 ++++---- gcc/testsuite/gcc.target/aarch64/pr93119.c | 10 ++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gcc.target/aarch64/pr93119.c diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index c26ac0db942..6c825459dc6 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -2607,19 +2607,29 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, case SYMBOL_SMALL_TLSGD: { rtx_insn *insns; - machine_mode mode = GET_MODE (dest); - rtx result = gen_rtx_REG (mode, R0_REGNUM); + /* The return type of __tls_get_addr is the C pointer type + so use ptr_mode. */ + rtx result = gen_rtx_REG (ptr_mode, R0_REGNUM); + rtx tmp_reg = dest; + + if (GET_MODE (dest) != ptr_mode) + tmp_reg = can_create_pseudo_p () ? gen_reg_rtx (ptr_mode) : result; start_sequence (); - if (TARGET_ILP32) + if (ptr_mode == SImode) aarch64_emit_call_insn (gen_tlsgd_small_si (result, imm)); else aarch64_emit_call_insn (gen_tlsgd_small_di (result, imm)); + insns = get_insns (); end_sequence (); RTL_CONST_CALL_P (insns) = 1; - emit_libcall_block (insns, dest, result, imm); + emit_libcall_block (insns, tmp_reg, result, imm); + /* Convert back to the mode of the dest, adding a zero-extend as + needed. */ + if (dest != tmp_reg) + convert_move (dest, tmp_reg, true); return; } diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 86c2cdfc797..55dde54b16a 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -6755,10 +6755,10 @@ (define_insn "aarch64_load_tp_hard" ;; instructions in the TLS stubs, in order to enable linker relaxation. ;; Therefore we treat the stubs as an atomic sequence. (define_expand "tlsgd_small_" - [(parallel [(set (match_operand 0 "register_operand") + [(parallel [(set (match_operand:PTR 0 "register_operand") (call (mem:DI (match_dup 2)) (const_int 1))) (unspec:DI [(const_int 0)] UNSPEC_CALLEE_ABI) - (unspec:DI [(match_operand:PTR 1 "aarch64_valid_symref")] UNSPEC_GOTSMALLTLS) + (unspec:DI [(match_operand 1 "aarch64_valid_symref")] UNSPEC_GOTSMALLTLS) (clobber (reg:DI LR_REGNUM))])] "" { @@ -6766,10 +6766,10 @@ (define_expand "tlsgd_small_" }) (define_insn "*tlsgd_small_" - [(set (match_operand 0 "register_operand" "") + [(set (match_operand:PTR 0 "register_operand" "") (call (mem:DI (match_operand:DI 2 "" "")) (const_int 1))) (unspec:DI [(const_int 0)] UNSPEC_CALLEE_ABI) - (unspec:DI [(match_operand:PTR 1 "aarch64_valid_symref" "S")] UNSPEC_GOTSMALLTLS) + (unspec:DI [(match_operand 1 "aarch64_valid_symref" "S")] UNSPEC_GOTSMALLTLS) (clobber (reg:DI LR_REGNUM)) ] "" diff --git a/gcc/testsuite/gcc.target/aarch64/pr93119.c b/gcc/testsuite/gcc.target/aarch64/pr93119.c new file mode 100644 index 00000000000..93fa80e10b6 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr93119.c @@ -0,0 +1,10 @@ +/* { dg-require-effective-target fpic } */ +/* { dg-options "-mtls-dialect=trad -fpic" } */ + +__thread int g_tlsdata; + +int func1() +{ + g_tlsdata++; + return g_tlsdata; +}