From patchwork Thu Oct 12 21:09:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 825103 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=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-85762-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="eUTm+0HG"; 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 3yCk5C1LK1z9s7p for ; Fri, 13 Oct 2017 08:10:07 +1100 (AEDT) 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=G6qFL0HSZV7gw5V7vswgqOsKJ5A1ILR Bsw/e20eflmVg7nqCRyF9Pnr0My/Nt0wudcM0HzMeMvbu5DIAdxMBgPtDe9KqR0/ FPR6/vY26iqyjVS6rZ2DKfOIXNZLahMkI6Uefu7LnuKswTC7/SXsezU8hCgfGd1Q t86s8tbeQcvI= 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=foUOTTPcZBjsXXMKBB9VHuc27jE=; b=eUTm+ 0HG/hseE/4y7nhczA+qQAxpf2ZuAdhbqTxlml6hVPWtr5SJOFtdHmKq81rHGtiie XtBeJACWwx9Vy+AuDsjF3s5xGOnoXrKtbRQtz3HLWn4v4VagF37ZRBDwu560m7xy nNvBSrVAj1MH78RHZLlb9iSxwqPdux3+eGsRR8= Received: (qmail 101088 invoked by alias); 12 Oct 2017 21:09:59 -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 100430 invoked by uid 89); 12 Oct 2017 21:09:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=2046, nifty X-HELO: mail-qk0-f177.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=5kEURYOBurK4Mr6IshlbtMncrbM4NhieFCwzyhi6dQo=; b=bJX4uhpecI7OoDS6do9bZ9G+/fL4+CUbOYoobn9sAuNz4buHn6vo1zm+siSxyMj+HQ JXh4G4w6ir4k5/T0n90yGVGf0dCJ9aj2vOnTr7e9/KvPYlXLn1C11mEUxo6y4s+p5q2b 4GSbcS+adhIx3p8aoNnrHGzszRorirLg1fGXBibp/lMdMuOqEulqQBVC9tDKhw6/Z7uz xRE4WmIfmd0wL96e+3eiDtJgOB26Nd3my2M2M2c7adq31vEZ4LtD2kpoViRiSma17RXv jWbsGgxUVjEnQCsc2lpMWlXVlWbGy2E0GQScqOGQiwy2ALu4YKuEFm6/YcIWl3dr0oOx XJ/g== X-Gm-Message-State: AMCzsaXIfZoX5YwxAFDe+xIS5toQb5qqGHFl9UnF2h/Ypwikeki5hk8P Z2LJI2d6HTQ/KnaLt00mPjumkSYiRps= X-Google-Smtp-Source: ABhQp+Si6losbiWPDSxwnVbHzb/IX8H6mO/vWxl+RG/Ok9VSjNaSHRc71qoWjo/e65pAfndrOypFrw== X-Received: by 10.55.22.146 with SMTP id 18mr2449044qkw.281.1507842595826; Thu, 12 Oct 2017 14:09:55 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/5] Add common ifunc-init.h header Date: Thu, 12 Oct 2017 18:09:41 -0300 Message-Id: <1507842584-28674-2-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1507842584-28674-1-git-send-email-adhemerval.zanella@linaro.org> References: <1507842584-28674-1-git-send-email-adhemerval.zanella@linaro.org> This patch moves the generic definition from x86_64 init-arch to a common header ifunc-init.h. No functional changes is expected. Checked on a x86_64-linux-gnu build. * sysdeps/generic/ifunc-init.h: New file. * sysdeps/x86/init-arch.h: Use generic ifunc-init.h. --- ChangeLog | 3 +++ sysdeps/generic/ifunc-init.h | 54 ++++++++++++++++++++++++++++++++++++++++++++ sysdeps/x86/init-arch.h | 41 +-------------------------------- 3 files changed, 58 insertions(+), 40 deletions(-) create mode 100644 sysdeps/generic/ifunc-init.h diff --git a/sysdeps/generic/ifunc-init.h b/sysdeps/generic/ifunc-init.h new file mode 100644 index 0000000..59d5ac6 --- /dev/null +++ b/sysdeps/generic/ifunc-init.h @@ -0,0 +1,54 @@ +/* IFUNC generic definitions. + This file is part of the GNU C Library. + Copyright (C) 2017 Free Software Foundation, Inc. + + 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 + . */ + +/* These macros are used to implement ifunc selection in C. To implement + an ifunc function, foo, which returns the address of __foo_impl1 or + __foo_impl2: + + #define foo __redirect_foo + #include + #undef foo + #define SYMBOL_NAME foo + #include + + extern __typeof (REDIRECT_NAME) OPTIMIZE (impl1) attribute_hidden; + extern __typeof (REDIRECT_NAME) OPTIMIZE (impl2) attribute_hidden; + + static inline void * + foo_selector (void) + { + if (condition) + return OPTIMIZE (impl2); + + return OPTIMIZE (impl1); + } + + libc_ifunc_redirected (__redirect_foo, foo, IFUNC_SELECTOR ()); +*/ + +#define PASTER1(x,y) x##_##y +#define EVALUATOR1(x,y) PASTER1 (x,y) +#define PASTER2(x,y) __##x##_##y +#define EVALUATOR2(x,y) PASTER2 (x,y) + +/* Basically set '__redirect_' to use as type definition, + '___' as the optimized implementation and + '_ifunc_selector' as the IFUNC selector. */ +#define REDIRECT_NAME EVALUATOR1 (__redirect, SYMBOL_NAME) +#define OPTIMIZE(name) EVALUATOR2 (SYMBOL_NAME, name) +#define IFUNC_SELECTOR EVALUATOR1 (SYMBOL_NAME, ifunc_selector) diff --git a/sysdeps/x86/init-arch.h b/sysdeps/x86/init-arch.h index 15d3f09..06a21cc 100644 --- a/sysdeps/x86/init-arch.h +++ b/sysdeps/x86/init-arch.h @@ -20,46 +20,7 @@ #else # include #endif - -/* These macros are used to implement ifunc selection in C. To implement - an ifunc function, foo, which returns the address of __foo_sse2 or - __foo_avx2: - - #define foo __redirect_foo - #define __foo __redirect___foo - #include - #undef foo - #undef __foo - #define SYMBOL_NAME foo - #include - - extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; - extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2) attribute_hidden; - - static inline void * - foo_selector (void) - { - if (use AVX2) - return OPTIMIZE (avx2); - - return OPTIMIZE (sse2); - } - - libc_ifunc_redirected (__redirect_foo, foo, foo_selector ()); - -*/ - -#define PASTER1(x,y) x##_##y -#define EVALUATOR1(x,y) PASTER1 (x,y) -#define PASTER2(x,y) __##x##_##y -#define EVALUATOR2(x,y) PASTER2 (x,y) - -/* Basically set '__redirect_' to use as type definition, - '___' as the optimized implementation and - '_ifunc_selector' as the IFUNC selector. */ -#define REDIRECT_NAME EVALUATOR1 (__redirect, SYMBOL_NAME) -#define OPTIMIZE(name) EVALUATOR2 (SYMBOL_NAME, name) -#define IFUNC_SELECTOR EVALUATOR1 (SYMBOL_NAME, ifunc_selector) +#include #ifndef __x86_64__ /* Due to the reordering and the other nifty extensions in i686, it is