From patchwork Thu Oct 26 19:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 117275 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1128136qgn; Thu, 26 Oct 2017 12:11:51 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SCnbwE7o9xSWUs/yQVZiEdiGGK1wtXidWPED6qQ5ybIvON40/j31VEOVnPm6dUpHGbehhc X-Received: by 10.99.124.27 with SMTP id x27mr5831519pgc.304.1509045111685; Thu, 26 Oct 2017 12:11:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509045111; cv=none; d=google.com; s=arc-20160816; b=ws1p4SsRpqdhCJ0niHB0e/J+yqOecAOfzUplJq4s5yEZnVtvUPdUmdKK94hBUBtTgd 4hKqVARliiW6rwABTJy9S+2oiZD+6dDkTp09aA+PA9HukvtpNRZUr/i7Nd+EQ1UlSf9s l8ZdfLK8+zUZWC8SjN+ms+CdVBM5n85snuNBrjX4Vfok9F6v/8Jam58T5f3sCcH9SGD+ Onu/PDYQ8j+OX0B9aRtHaxF8TS7zxQbpjaKZowJInOoHFWtPZqm7q0UnjsRaHcL40RzT KEkwv7X8pfXao03gaa7SXA4ldGyO2/4DQxnwrGTDqnAJx0na4FVJneuCVOOvyLZ8pU/7 9AWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=pjn6PD3IiegZ7RVspXxdI67kXncCcRJbOHiKBpAOPvU=; b=WCY3sm6KSFs4S3SZVGSif88DVcI9FssW/QUmDRTQbbKLiCkmL5QzcGc1p3e5ebSA+3 ULZj3Fjxd1uQ53rnO/ljMxgBwQNuG4Qm+6yk64r7a+STjDnQPOJTkkJAbMmAAgg259gz pIy22Uzm8IXi6SZ4H4qNRHIvShyAhVFtx0qpD8K7G2u2Gzw+JRsQZGHl2LdiQ/hmNXWS LCqVx6HrlGn69NN+h+tnxd8Tfb6fk+VkzFNY67UPaB/1QPzLP/MRt6ckdNG9kBJmc4CB oU+cShzjkvt8TSv69WgibSI6qqRQtlPqHV3tym0rxnIxAXzHY8joZ0FoSajDN46uiOMI plSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=F2DjsQN7; spf=pass (google.com: domain of libc-alpha-return-86425-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86425-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x66si4072701pfe.396.2017.10.26.12.11.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:11:51 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86425-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=F2DjsQN7; spf=pass (google.com: domain of libc-alpha-return-86425-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86425-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=ZEmcyArOti9RUKs/YM32ilQrL9CG4FQ 1u0TCp3FuWRI5NZOf2rzsb97lRMkBh2N4RLLDzQ5+MOZGLeluCM/B55Uoqh+9BvL u1yEMNlU8zY/SdR2Q+QocXsOLpK8FbkJBbz0UPPQnt+n0KDnJvJEc7OsvymCWl4G tnM5Lt7OmPfQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=XIKg4aHUdfr+9u5s5TYKom8qz6U=; b=F2Djs QN7kh8OEcW/GSwKnxqE7hdr/w5cjdOR0Am7PoKXovv85S5AZ2UplLRdqMONSw0lS /1hQY+2YRYKqiuldEPfAeUojMIHKAqjrGOegTHf2ZohCM0eg18iedypB4Tb11J0x lbNATTUW84W+dnYU1efPtvvPg0yl2ORSW8zMR4= Received: (qmail 101229 invoked by alias); 26 Oct 2017 19:07:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 100563 invoked by uid 89); 26 Oct 2017 19:07:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=strand X-HELO: mail-qt0-f195.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pjn6PD3IiegZ7RVspXxdI67kXncCcRJbOHiKBpAOPvU=; b=CJZXqJea/g24FPxuboeT8YhjfI2ArWu78y+nxyuTSsQ3iHS0vsS0+JqgYrI0d7ez74 dtzD7GD/KV3+/9oy272l+dW2i8GwadfhTHwEKzZaAnSl9kJojOWsxKvmS0v8sV4NNfJm V8k6kc39PCdQ5rwYYtQsYP8Kfo8teFxaZvUtjDCzOBsG3FNChzrktNOBuSoI4G6T/D19 4wxzLrNhevuDAN/8DlYzdZVyChMyPt1Htp5KfIFaLNZf8yxy+CBJKELj/oml/IjF9LTN QYWNa2rKYICJs1th/cigPBji6aFeOLyh607/uMgBZw1seJ4kaNEXinaXsJbWbEexzqDD IuPQ== X-Gm-Message-State: AMCzsaUC3YizPsLJgCAmA859EazW+homFmqq/ZEA9ucNXKc9f2ZA5oh0 C819Mt4hHWBX70dWlJ/GQwXxLfcNaDY= X-Received: by 10.200.49.21 with SMTP id g21mr38567465qtb.183.1509044853199; Thu, 26 Oct 2017 12:07:33 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 23/25] sparc: refactor cpu_relax to C Date: Thu, 26 Oct 2017 17:06:51 -0200 Message-Id: <1509044813-9951-24-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> * sysdeps/sparc/sparc64/cpu_relax.c: New file. * sysdeps/sparc/sparc32/sparcv9/cpu_relax.c: Likewise. * sysdeps/sparc/sparc64/cpu_relax.S: Remove file. * sysdeps/sparc/sparc32/sparcv9/cpu_relax.S: Likewise. Signed-off-by: Adhemerval Zanella --- ChangeLog | 5 +++ sysdeps/sparc/sparc32/sparcv9/cpu_relax.S | 1 - sysdeps/sparc/sparc32/sparcv9/cpu_relax.c | 1 + sysdeps/sparc/sparc64/cpu_relax.S | 67 ------------------------------- sysdeps/sparc/sparc64/cpu_relax.c | 38 ++++++++++++++++++ 5 files changed, 44 insertions(+), 68 deletions(-) delete mode 100644 sysdeps/sparc/sparc32/sparcv9/cpu_relax.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/cpu_relax.c delete mode 100644 sysdeps/sparc/sparc64/cpu_relax.S create mode 100644 sysdeps/sparc/sparc64/cpu_relax.c -- 2.7.4 diff --git a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S deleted file mode 100644 index 41a5e72..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c new file mode 100644 index 0000000..1670cf6 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc64/cpu_relax.S b/sysdeps/sparc/sparc64/cpu_relax.S deleted file mode 100644 index 5271164..0000000 --- a/sysdeps/sparc/sparc64/cpu_relax.S +++ /dev/null @@ -1,67 +0,0 @@ -/* CPU strand yielding for busy loops. - Copyright (C) 2012-2017 Free Software Foundation, Inc. - Contributed by David S. Miller (davem@davemloft.net) - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - - .text -__cpu_relax_generic: - rd %ccr, %g0 - rd %ccr, %g0 - rd %ccr, %g0 - retl - nop - .size __cpu_relax_generic,.-__cpu_relax_generic - -__cpu_relax_pause: - wr %g0, 128, %asr27 - retl - nop - .size __cpu_relax_pause,.-__cpu_relax_pause - -ENTRY(__cpu_relax) - .type __cpu_relax, @gnu_indirect_function -# ifdef SHARED - SETUP_PIC_REG_LEAF(o3, o5) -# endif - set HWCAP_SPARC_PAUSE, %o1 - andcc %o0, %o1, %g0 - be 1f - nop -# ifdef SHARED - sethi %gdop_hix22(__cpu_relax_pause), %o1 - xor %o1, %gdop_lox10(__cpu_relax_pause), %o1 -# else - set __cpu_relax_pause, %o1 -# endif - ba 10f - nop -1: -# ifdef SHARED - sethi %gdop_hix22(__cpu_relax_generic), %o1 - xor %o1, %gdop_lox10(__cpu_relax_generic), %o1 -# else - set __cpu_relax_generic, %o1 -# endif -10: -# ifdef SHARED - add %o3, %o1, %o1 -# endif - retl - mov %o1, %o0 -END(__cpu_relax) diff --git a/sysdeps/sparc/sparc64/cpu_relax.c b/sysdeps/sparc/sparc64/cpu_relax.c new file mode 100644 index 0000000..388e76c --- /dev/null +++ b/sysdeps/sparc/sparc64/cpu_relax.c @@ -0,0 +1,38 @@ +/* CPU strand yielding for busy loops. Linux/sparc64 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +static void +__cpu_relax_generic (void) +{ + asm volatile ("rd %ccr, %g0;" + "rd %ccr, %g0;" + "rd %ccr, %g0"); +} + +static void +__cpu_relax_pause (void) +{ + asm volatile ("wr %g0, 128, %asr27;"); +} + +sparc_libc_ifunc (__cpu_relax, + hwcap & HWCAP_SPARC_PAUSE + ? __cpu_relax_pause + : __cpu_relax_generic)