From patchwork Mon Nov 20 12:50:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Cederman X-Patchwork-Id: 839529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467408-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="G/1d5Obq"; 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 3ygT8h23xLz9rxj for ; Mon, 20 Nov 2017 23:50:28 +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:in-reply-to:references; q=dns; s= default; b=VAILePefAU/BjBzu252qrOhZx515Qz5yOJcDhatvoBD6kcXwRbHZP JQtl4gv/kFf3YfS5lYdqQEtky4vpWYkjG2wP6bx8j3plLI2VvSCeF5u4qzr7gHrL cIeSv234FGNm4o90XViEEt8Ce2c+0FhxgNW4RrJzNr81P0oQzbnTm0= 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:in-reply-to:references; s= default; bh=oXJIiKus41F6Dz1S9aMCpaHvTew=; b=G/1d5ObqQrkkUozKJe2S Is4oJJixWT3qDEm7UJb+nMzYo1RpNw4pT6KEn4uKxW/CZ+qKpuAt0Z2y+sxaYWIf i8Bq603ZHfxKeTANTJFfihsUqwHJOTdEJ5JSGZFFvY+iiZ05N1CSkBEh0eqawURj ANODEUe6GZlKmQoIWPG2vWE= Received: (qmail 5248 invoked by alias); 20 Nov 2017 12:50:20 -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 5193 invoked by uid 89); 20 Nov 2017 12:50:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*daniel, H*Ad:U*ebotcazou, 94531, symbol_ref X-HELO: bin-vsp-out-03.atm.binero.net Received: from vsp-unauthed02.binero.net (HELO bin-vsp-out-03.atm.binero.net) (195.74.38.227) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 12:50:16 +0000 X-Halon-ID: 57252e77-cdf1-11e7-811b-0050569116f7 Authorized-sender: cederman@gaisler.com Received: from localhost.localdomain (unknown [81.170.187.120]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 57252e77-cdf1-11e7-811b-0050569116f7; Mon, 20 Nov 2017 13:50:10 +0100 (CET) From: Daniel Cederman To: gcc-patches@gcc.gnu.org Cc: ebotcazou@adacore.com, sebastian.huber@embedded-brains.de, daniel@gaisler.com Subject: [PATCH 1/4] [SPARC] Errata workaround for GRLIB-TN-0012 Date: Mon, 20 Nov 2017 13:50:00 +0100 Message-Id: <20171120125003.22670-2-cederman@gaisler.com> In-Reply-To: <20171120125003.22670-1-cederman@gaisler.com> References: <20171120125003.22670-1-cederman@gaisler.com> X-IsSubscribed: yes This patch provides a workaround for the errata described in GRLIB-TN-0012. If the workaround is enabled it will: * Prevent any floating-point operation from being placed in the delay slot of an annulled integer branch. * Place a NOP at the branch target of an integer branch if it is a floating-point operation or a floating-point branch. It is applicable to GR712RC. gcc/ChangeLog: 2017-11-17 Daniel Cederman * config/sparc/sparc.c (fpop_insn_p): New function. (sparc_do_work_around_errata): Insert NOP instructions to prevent sequences that could trigger the TN-0012 errata for GR712RC. (pass_work_around_errata::gate): Also test sparc_fix_gr712rc. * config/sparc/sparc.md (fix_gr712rc): New attribute. (in_branch_annul_delay): Prevent floating-point instructions in delay slot of annulled integer branch. --- gcc/config/sparc/sparc.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-- gcc/config/sparc/sparc.md | 17 ++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index a9945e2..8f6eb48 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -945,6 +945,31 @@ mem_ref (rtx x) return NULL_RTX; } +/* True if floating-point instruction. */ + +static int +fpop_insn_p (rtx_insn *insn) +{ + if ( GET_CODE (PATTERN (insn)) != SET) + return false; + + switch (get_attr_type (insn)) + { + case TYPE_FPMOVE: + case TYPE_FPCMOVE: + case TYPE_FP: + case TYPE_FPCMP: + case TYPE_FPMUL: + case TYPE_FPDIVS: + case TYPE_FPSQRTS: + case TYPE_FPDIVD: + case TYPE_FPSQRTD: + return true; + default: + return false; + } +} + /* We use a machine specific pass to enable workarounds for errata. We need to have the (essentially) final form of the insn stream in order @@ -970,11 +995,31 @@ sparc_do_work_around_errata (void) { bool insert_nop = false; rtx set; + rtx_insn *jump = 0; /* Look into the instruction in a delay slot. */ if (NONJUMP_INSN_P (insn)) if (rtx_sequence *seq = dyn_cast (PATTERN (insn))) - insn = seq->insn (1); + { + jump = seq->insn (0); + insn = seq->insn (1); + } + + /* Place a NOP at the branch target of an integer branch if it is + a floating-point operation or a floating-point branch. */ + if (sparc_fix_gr712rc + && (JUMP_P (insn) || jump) + && get_attr_branch_type (jump ? jump : insn) == BRANCH_TYPE_ICC) + { + rtx_insn *target; + + target = next_active_insn (JUMP_LABEL_AS_INSN (jump ? jump : insn)); + if (target + && (fpop_insn_p (target) + || ((JUMP_P (target) + && get_attr_branch_type (target) == BRANCH_TYPE_FCC)))) + emit_insn_before (gen_nop (), target); + } /* Look for either of these two sequences: @@ -1303,7 +1348,8 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { - return sparc_fix_at697f || sparc_fix_ut699 || sparc_fix_b2bst; + return sparc_fix_at697f || sparc_fix_ut699 || sparc_fix_b2bst + || sparc_fix_gr712rc; } virtual unsigned int execute (function *) diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md index d9cbd4f..ef789e2 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md @@ -430,6 +430,10 @@ (symbol_ref "(sparc_fix_b2bst != 0 ? FIX_B2BST_TRUE : FIX_B2BST_FALSE)")) +(define_attr "fix_gr712rc" "false,true" + (symbol_ref "(sparc_fix_gr712rc != 0 + ? FIX_GR712RC_TRUE : FIX_GR712RC_FALSE)")) + ;; Length (in # of insns). ;; Beware that setting a length greater or equal to 3 for conditional branches ;; has a side-effect (see output_cbranch and output_v9branch). @@ -590,6 +594,15 @@ (const_string "true") ] (const_string "false"))) +(define_attr "in_branch_annul_delay" "false,true" + (cond[(and (eq_attr "fix_gr712rc" "true") + (eq_attr "type" "fp,fpcmp,fpmove,fpcmove,fpmul, + fpdivs,fpsqrts,fpdivd,fpsqrtd")) + (const_string "false") + (eq_attr "in_branch_delay" "true") + (const_string "true") + ] (const_string "false"))) + (define_delay (eq_attr "type" "call") [(eq_attr "in_call_delay" "true") (nil) (nil)]) @@ -602,6 +615,10 @@ (define_delay (eq_attr "type" "branch") [(eq_attr "in_branch_delay" "true") (nil) (eq_attr "in_branch_delay" "true")]) +(define_delay (and (eq_attr "type" "branch") (eq_attr "branch_type" "icc")) + [(eq_attr "in_branch_delay" "true") (nil) + (eq_attr "in_branch_annul_delay" "true")]) + (define_delay (eq_attr "type" "uncond_branch") [(eq_attr "in_branch_delay" "true") (nil) (nil)]) From patchwork Mon Nov 20 12:50:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Cederman X-Patchwork-Id: 839530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467409-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="YYfdYVqz"; 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 3ygT8w2NRkz9rxj for ; Mon, 20 Nov 2017 23:50:40 +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:in-reply-to:references; q=dns; s= default; b=Dd4aSKa5JaHuCavuqK7TsK19Gqapf3ndKVFCCyV980LYQZTXxjLgk mUSkouYwb+XzrnU/jZ1NnwZxfTfcTq+VG+Th2EH5cj20+2CLyHCRVdcb6IBn2pZw m8RmcgTfxu5gv16ORSKOb+5INE5+l0pBVeFO66W2xp36VAqhukOnY8= 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:in-reply-to:references; s= default; bh=D6TZ0MxLcIzVDtDASdrC9UoxWAQ=; b=YYfdYVqzA9tpDPiGvSlq 9Amsa4nAGAKtZN5rW+zKWcse26Pg8RKLAAgwQIm/y9SInyy+mVgYRnF+WszKoURN NL1rfFGkyikgIOWRohSzWI5UUqZE6BOkn5sZrXT9VntH+S8LWMMS6WA/n186iKRm dkiwuBxv1sSSn5w8Tg19VMU= Received: (qmail 5278 invoked by alias); 20 Nov 2017 12:50:20 -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 5186 invoked by uid 89); 20 Nov 2017 12:50:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*daniel, supervisor, H*Ad:U*ebotcazou, casa X-HELO: bin-vsp-out-03.atm.binero.net Received: from vsp-unauthed02.binero.net (HELO bin-vsp-out-03.atm.binero.net) (195.74.38.227) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 12:50:16 +0000 X-Halon-ID: 586e8a56-cdf1-11e7-811b-0050569116f7 Authorized-sender: cederman@gaisler.com Received: from localhost.localdomain (unknown [81.170.187.120]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 586e8a56-cdf1-11e7-811b-0050569116f7; Mon, 20 Nov 2017 13:50:11 +0100 (CET) From: Daniel Cederman To: gcc-patches@gcc.gnu.org Cc: ebotcazou@adacore.com, sebastian.huber@embedded-brains.de, daniel@gaisler.com Subject: [PATCH 2/4] [SPARC] Errata workaround for GRLIB-TN-0011 Date: Mon, 20 Nov 2017 13:50:01 +0100 Message-Id: <20171120125003.22670-3-cederman@gaisler.com> In-Reply-To: <20171120125003.22670-1-cederman@gaisler.com> References: <20171120125003.22670-1-cederman@gaisler.com> X-IsSubscribed: yes This patch provides a workaround for the errata described in GRLIB-TN-0011. If the workaround is enabled it will: * Insert .align 16 before atomic instructions (swap, ldstub, casa). It is applicable to GR712RC. gcc/ChangeLog: 2017-11-17 Daniel Cederman * config/sparc/sync.md (swapsi): 16-byte align if sparc_fix_gr712rc. (atomic_compare_and_swap_leon3_1): Likewise. (ldstub): Likewise. --- gcc/config/sparc/sync.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/config/sparc/sync.md b/gcc/config/sparc/sync.md index 1593bde..d5c505b 100644 --- a/gcc/config/sparc/sync.md +++ b/gcc/config/sparc/sync.md @@ -222,6 +222,8 @@ UNSPECV_CAS))] "TARGET_LEON3" { + if (sparc_fix_gr712rc) + output_asm_insn (".align\t16", operands); if (TARGET_SV_MODE) return "casa\t%1 0xb, %2, %0"; /* ASI for supervisor data space. */ else @@ -275,7 +277,12 @@ (set (match_dup 1) (match_operand:SI 2 "register_operand" "0"))] "(TARGET_V8 || TARGET_V9) && !sparc_fix_ut699" - "swap\t%1, %0" +{ + if (sparc_fix_gr712rc) + return ".align\t16\n\tswap\t%1, %0"; + else + return "swap\t%1, %0"; +} [(set_attr "type" "multi")]) (define_expand "atomic_test_and_set" @@ -307,5 +314,10 @@ UNSPECV_LDSTUB)) (set (match_dup 1) (const_int -1))] "!sparc_fix_ut699" - "ldstub\t%1, %0" +{ + if (sparc_fix_gr712rc) + return ".align\t16\n\tldstub\t%1, %0"; + else + return "ldstub\t%1, %0"; +} [(set_attr "type" "multi")]) From patchwork Mon Nov 20 12:50:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Cederman X-Patchwork-Id: 839533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467412-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Y93X1Ew+"; 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 3ygT9c2tg0z9s0g for ; Mon, 20 Nov 2017 23:51:16 +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:in-reply-to:references; q=dns; s= default; b=ycQFZhJXpvN5zI5mxSoIheOpyBZdPC9annnzT0JJoFqsw7AxP1bZ2 Wmdh36dJyj4h800/wqJGjH90tmPn0tq5+F2pdvVs8q7wUKXLJkoIRZdG6wVYNB6Z YT4yMIbRE7wiDD/ImrkyxRKgyhBXn9z4ROr+RhNwoKc9yKnwVk0hHE= 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:in-reply-to:references; s= default; bh=qevHM8G8Mf4rhRBIMUmjGvOdOts=; b=Y93X1Ew+Fbhl2+drc0cv NukVHkjNkk7oKJdqCVgPqnZCZ5af0kCVNZYMKjjLBKPV9Q3nmnlSdyuxcO4oMNc3 8JSyKNRk7ddhC/yNH7CQjchzg9MQoYLOCFbnrCjuRzwr6kCCooYpa76gG6w69qKj RijmZvokNLWxsVcskaWxatA= Received: (qmail 5445 invoked by alias); 20 Nov 2017 12:50:21 -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 5188 invoked by uid 89); 20 Nov 2017 12:50:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*daniel, H*Ad:U*ebotcazou, casa, Hx-languages-length:2754 X-HELO: bin-vsp-out-03.atm.binero.net Received: from bin-mail-out-06.binero.net (HELO bin-vsp-out-03.atm.binero.net) (195.74.38.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 12:50:16 +0000 X-Halon-ID: 591654c1-cdf1-11e7-811b-0050569116f7 Authorized-sender: cederman@gaisler.com Received: from localhost.localdomain (unknown [81.170.187.120]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 591654c1-cdf1-11e7-811b-0050569116f7; Mon, 20 Nov 2017 13:50:12 +0100 (CET) From: Daniel Cederman To: gcc-patches@gcc.gnu.org Cc: ebotcazou@adacore.com, sebastian.huber@embedded-brains.de, daniel@gaisler.com Subject: [PATCH 3/4] [SPARC] Errata workaround for GRLIB-TN-0010 Date: Mon, 20 Nov 2017 13:50:02 +0100 Message-Id: <20171120125003.22670-4-cederman@gaisler.com> In-Reply-To: <20171120125003.22670-1-cederman@gaisler.com> References: <20171120125003.22670-1-cederman@gaisler.com> X-IsSubscribed: yes This patch provides a workaround for the errata described in GRLIB-TN-0010. If the workaround is enabled it will: * Insert a NOP between load instruction and atomic instruction (swap, ldstub, casa). * Insert a NOP at branch target if load in delay slot and atomic instruction at branch target. It is applicable to UT700. gcc/ChangeLog: 2017-11-17 Daniel Cederman * config/sparc/sparc.c (atomic_insn_p): New function. (sparc_do_work_around_errata): Insert NOP instructions to prevent sequences that could trigger the TN-0010 errata for UT700. * config/sparc/sync.md (atomic_compare_and_swap_leon3_1): Make instruction referable in atomic_insns_p. --- gcc/config/sparc/sparc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ gcc/config/sparc/sync.md | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 8f6eb48..9faf774 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -970,6 +970,22 @@ fpop_insn_p (rtx_insn *insn) } } +/* True if complex atomic instruction. */ + +static int +atomic_insn_p (rtx_insn *insn) +{ + switch (INSN_CODE (insn)) + { + case CODE_FOR_swapsi: + case CODE_FOR_ldstub: + case CODE_FOR_atomic_compare_and_swap_leon3_1: + return true; + default: + return false; + } +} + /* We use a machine specific pass to enable workarounds for errata. We need to have the (essentially) final form of the insn stream in order @@ -1021,6 +1037,33 @@ sparc_do_work_around_errata (void) emit_insn_before (gen_nop (), target); } + /* Insert a NOP between load instruction and atomic + instruction. Insert a NOP at branch target if load + in delay slot and atomic instruction at branch target. */ + if (sparc_fix_ut700 + && NONJUMP_INSN_P (insn) + && (set = single_set (insn)) != NULL_RTX + && MEM_P (SET_SRC (set)) + && REG_P (SET_DEST (set))) + { + if (jump) + { + rtx_insn *target; + + target = next_active_insn (JUMP_LABEL_AS_INSN (jump)); + if (target + && atomic_insn_p (target)) + emit_insn_before (gen_nop (), target); + } + + next = next_active_insn (insn); + if (!next) + break; + + if (atomic_insn_p (next)) + insert_nop = true; + } + /* Look for either of these two sequences: Sequence A: diff --git a/gcc/config/sparc/sync.md b/gcc/config/sparc/sync.md index d5c505b..b1baa73 100644 --- a/gcc/config/sparc/sync.md +++ b/gcc/config/sparc/sync.md @@ -212,7 +212,7 @@ "cas\t%1, %2, %0" [(set_attr "type" "multi")]) -(define_insn "*atomic_compare_and_swap_leon3_1" +(define_insn "atomic_compare_and_swap_leon3_1" [(set (match_operand:SI 0 "register_operand" "=r") (match_operand:SI 1 "mem_noofs_operand" "+w")) (set (match_dup 1) From patchwork Mon Nov 20 12:50:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Cederman X-Patchwork-Id: 839532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467411-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="LuzQyTfT"; 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 3ygT9M0G9pz9rxj for ; Mon, 20 Nov 2017 23:51:02 +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:in-reply-to:references; q=dns; s= default; b=CYMO3B7eDPcuJxqZzRDDP7dc9BA+hP5gP5bGjTFOQheamtAtCEzGe nrnwojArziMNWevaWacvxUqhLvBkY6U9ealugJPy09i0pHsLU8t9W+caDpLZB9EF XyuLhPSuAQVUmFRuqWsynOGL079SitYqgRJVEfttTUX7iTZEHg6ap4= 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:in-reply-to:references; s= default; bh=/fPTmiDZL19fxV1taFErbl7QPYw=; b=LuzQyTfTBZRRYA5sLzQr udbDbp/b7hhyXuQgaYGkGIvyJe1W4GGBbfLIE6+gYHY+NVsEt5Rh0Amvuy+iK+O3 wrlaFAgILAc5fUbKZQWZlhKgy2ASXK9CbUDyVAed+GZ7TBtmgZIrKPSCxvdiLUfu KIcg/3jbk0UaU1K4CGNIAQQ= Received: (qmail 5399 invoked by alias); 20 Nov 2017 12:50:21 -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 5233 invoked by uid 89); 20 Nov 2017 12:50:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*daniel, H*Ad:U*ebotcazou, 94539, symbol_ref X-HELO: bin-vsp-out-03.atm.binero.net Received: from vsp-unauthed02.binero.net (HELO bin-vsp-out-03.atm.binero.net) (195.74.38.227) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 12:50:17 +0000 X-Halon-ID: 59ae9198-cdf1-11e7-811b-0050569116f7 Authorized-sender: cederman@gaisler.com Received: from localhost.localdomain (unknown [81.170.187.120]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 59ae9198-cdf1-11e7-811b-0050569116f7; Mon, 20 Nov 2017 13:50:13 +0100 (CET) From: Daniel Cederman To: gcc-patches@gcc.gnu.org Cc: ebotcazou@adacore.com, sebastian.huber@embedded-brains.de, daniel@gaisler.com Subject: [PATCH 4/4] [SPARC] Errata workaround for GRLIB-TN-0013 Date: Mon, 20 Nov 2017 13:50:03 +0100 Message-Id: <20171120125003.22670-5-cederman@gaisler.com> In-Reply-To: <20171120125003.22670-1-cederman@gaisler.com> References: <20171120125003.22670-1-cederman@gaisler.com> X-IsSubscribed: yes This patch provides a workaround for the errata described in GRLIB-TN-0013. If the workaround is enabled it will: * Prevent div and sqrt instructions in the delay slot. * Insert NOPs to prevent the sequence (div/sqrt) -> (two or three floating point operations or loads) -> (div/sqrt). * Not insert NOPs if any of the floating point operations have a dependency on the destination register of the first (div/sqrt). * Not insert NOPs if one of the floating point operations is a (div/sqrt). * Insert NOPs to prevent (div/sqrt) followed by a branch. It is applicable to GR712RC, UT700, and UT699. gcc/ChangeLog: 2017-11-17 Daniel Cederman * config/sparc/sparc.c (fpop_reg_depend_p): New function. (div_sqrt_insn_p): New function. (sparc_do_work_around_errata): Insert NOP instructions to prevent sequences that could trigger the TN-0013 errata for certain LEON3 processors. (pass_work_around_errata::gate): Also test sparc_fix_tn0013. (sparc_option_override): Set sparc_fix_tn0013 appropriately. * config/sparc/sparc.md (fix_tn0013): New attribute. (in_branch_delay): Prevent div and sqrt in delay slot if fix_tn0013. * config/sparc/sparc.opt (sparc_fix_tn0013: New variable. --- gcc/config/sparc/sparc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++- gcc/config/sparc/sparc.md | 7 +++ gcc/config/sparc/sparc.opt | 4 ++ 3 files changed, 123 insertions(+), 2 deletions(-) diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 9faf774..3da642e 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -945,6 +945,39 @@ mem_ref (rtx x) return NULL_RTX; } +/* True if any of the floating-point instruction's source + registers is the same as the provided register. */ + +static int +fpop_reg_depend_p (rtx_insn *insn, unsigned int reg) +{ + extract_insn (insn); + return (REGNO (recog_data.operand[1]) == reg + || (recog_data.n_operands == 3 + && REGNO (recog_data.operand[2]) == reg)); +} + +/* True if the instruction is floating-point division or + floating-point square-root. */ + +static int +div_sqrt_insn_p (rtx_insn *insn) +{ + if ( GET_CODE (PATTERN (insn)) != SET) + return false; + + switch (get_attr_type (insn)) + { + case TYPE_FPDIVS: + case TYPE_FPSQRTS: + case TYPE_FPDIVD: + case TYPE_FPSQRTD: + return true; + default: + return false; + } +} + /* True if floating-point instruction. */ static int @@ -1064,6 +1097,80 @@ sparc_do_work_around_errata (void) insert_nop = true; } + /* Look for sequences that could trigger the TN-0013 errata. */ + if (sparc_fix_tn0013 + && NONJUMP_INSN_P (insn) + && div_sqrt_insn_p (insn)) + { + int i; + int fp_found = 0; + unsigned int dest_reg; + rtx_insn *after; + + dest_reg = REGNO (SET_DEST (single_set (insn))); + + next = next_active_insn (insn); + if (!next) + break; + + for (after = next, i = 0; i < 4; i++) + { + /* Count floating-point operations. */ + if (i != 3 + && fpop_insn_p (after)) + { + /* If the insn uses the destination register of + the div/sqrt, then it cannot be problematic. */ + if (fpop_reg_depend_p (after, dest_reg)) + break; + fp_found++; + } + + /* Count floating-point loads. */ + if (i != 3 + && (set = single_set (after)) != NULL_RTX + && REG_P (SET_DEST (set)) + && REGNO (SET_DEST (set)) > 31) + { + /* If the insn uses the destination register of + the div/sqrt, then it cannot be problematic. */ + if (REGNO (SET_DEST (set)) == dest_reg) + break; + fp_found++; + } + + /* Check if this is a problematic sequence. */ + if (i > 1 + && fp_found >= 2 + && div_sqrt_insn_p (after)) + { + /* Add extra NOP to prevent second version of + problematic sequence. */ + if (i == 2) + emit_insn_before (gen_nop (), next); + insert_nop = true; + break; + } + + /* No need to scan past a second div/sqrt. */ + if (div_sqrt_insn_p (after)) + break; + + /* Insert NOP before branch. */ + if (i < 3 + && (!NONJUMP_INSN_P (after) + || GET_CODE (PATTERN (after)) == SEQUENCE)) + { + insert_nop = true; + break; + } + + after = next_active_insn (after); + if (!after) + break; + } + } + /* Look for either of these two sequences: Sequence A: @@ -1392,7 +1499,7 @@ public: virtual bool gate (function *) { return sparc_fix_at697f || sparc_fix_ut699 || sparc_fix_b2bst - || sparc_fix_gr712rc; + || sparc_fix_gr712rc || sparc_fix_tn0013; } virtual unsigned int execute (function *) @@ -1762,9 +1869,12 @@ sparc_option_override (void) if (!(target_flags_explicit & MASK_LRA)) target_flags |= MASK_LRA; - /* Enable the back-to-back store errata workaround for LEON3FT. */ + /* Enable applicable errata workarounds for LEON3FT. */ if (sparc_fix_ut699 || sparc_fix_ut700 || sparc_fix_gr712rc) + { sparc_fix_b2bst = 1; + sparc_fix_tn0013 = 1; + } /* Disable FsMULd for the UT699 since it doesn't work correctly. */ if (sparc_fix_ut699) diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md index ef789e2..ec2b476 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md @@ -430,6 +430,10 @@ (symbol_ref "(sparc_fix_b2bst != 0 ? FIX_B2BST_TRUE : FIX_B2BST_FALSE)")) +(define_attr "fix_tn0013" "false,true" + (symbol_ref "(sparc_fix_tn0013 != 0 + ? FIX_TN0013_TRUE : FIX_TN0013_FALSE)")) + (define_attr "fix_gr712rc" "false,true" (symbol_ref "(sparc_fix_gr712rc != 0 ? FIX_GR712RC_TRUE : FIX_GR712RC_FALSE)")) @@ -581,6 +585,9 @@ (define_attr "in_branch_delay" "false,true" (cond [(eq_attr "type" "uncond_branch,branch,cbcond,uncond_cbcond,call,sibcall,call_no_delay_slot,multi") (const_string "false") + (and (eq_attr "fix_tn0013" "true") + (eq_attr "type" "fpdivs,fpsqrts,fpdivd,fpsqrtd")) + (const_string "false") (and (eq_attr "fix_b2bst" "true") (eq_attr "type" "store,fpstore")) (const_string "false") (and (eq_attr "fix_ut699" "true") (eq_attr "type" "load,sload")) diff --git a/gcc/config/sparc/sparc.opt b/gcc/config/sparc/sparc.opt index 22267f5..43cd964 100644 --- a/gcc/config/sparc/sparc.opt +++ b/gcc/config/sparc/sparc.opt @@ -253,6 +253,10 @@ Enable workarounds for the errata of the GR712RC processor. TargetVariable unsigned int sparc_fix_b2bst +;; Enable workaround for TN-0013 errata +TargetVariable +unsigned int sparc_fix_tn0013 + Mask(LONG_DOUBLE_128) ;; Use 128-bit long double