From patchwork Thu Oct 5 10:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114874 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp53604edb; Thu, 5 Oct 2017 03:09:38 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCLDCR71o3falbhjNU/pT9G05m1jB/Mt6YSRdZ8TbKVcfiRyxpX44+z8CuJEMdaU6CW/N8U X-Received: by 10.233.239.215 with SMTP id d206mr14099042qkg.59.1507198178745; Thu, 05 Oct 2017 03:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198178; cv=none; d=google.com; s=arc-20160816; b=cbOyZYH9k2RPdD9CSAHIDg2yPGQaVH2NjnJtGKlohhWE71FFUE2nQUfw4shx67IkGW uVLD50ZMbWUltyfzoFiqA0ERZoI48d+T1Knv+6cnh1a6/vzmZzJlbfy5OlGgO2nHAjoC HMEurNW1V8PfEqO3NKOYz+/dCaZr54jW7hpLIh70b5kKAdrMQIVOsAy3j34QycTBvaV9 E0ryc+ERVDqUvhnX8F0nkNBBqiIRQOzMhj2nM7jGFeQWSH8AgW9vi5Zk2SyxkfxzCjY0 tPOF/FE1N4iLMBdOHhIn5oP22tfbMqK50qkp4iN/ktoU1SA+mw/YdsDdkLf9V0ksYPRU hXig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=3aaNS2j6mf9VOJUfHDWZKqj3qP2gcC75nibtx6wi7wc=; b=phR/zOgfDH/JVdJ3P51hAtBNUCLzaQhdkcM5+hoG8Gin53zfV4YO8aMbsMr1Ig55J6 8XdqtUmfvKqRe28qIxz3fNzPTSlHZae5aCaRzU+Iv9BWbCIO1T4gFsOlDtzGoppK75Dd rxoifz4ws+e1+7qysF2kyXhTKY71t9iDhnB79TYnKoNIX+ytmGOh/GDKEBWnlp9BvcVw uNk/gUJLLuVmi28sh1vmB18c4EMuw8MMAemydWJ9pdwbnnEgEVR9At6V9xCk48UMwHQ9 xqlwiVcXiHdLTQ1UiKQtnblJqnSOurofzvuoK+W5Hxcp5nOVcbvzBM2mcg4pcaUKXZcL 2Leg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n55si2087329qta.8.2017.10.05.03.09.38; Thu, 05 Oct 2017 03:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 5B6A5644C9; Thu, 5 Oct 2017 10:09:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 41A8860C4F; Thu, 5 Oct 2017 10:02:10 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3E20960918; Thu, 5 Oct 2017 10:02:06 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id A931460BE8 for ; Thu, 5 Oct 2017 10:00:31 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 36BCB1883EA for ; Thu, 5 Oct 2017 13:00:30 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Hzhr8k15Ks-0U54cWRo; Thu, 05 Oct 2017 13:00:30 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0TqOpAWm; Thu, 05 Oct 2017 13:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:02 +0300 Message-Id: <1507197617-6215-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 5/20] m4: move atomic checks to separate file X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov While we are at it, run 128bit atomic check only if __int128 is available for the target platform. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: f77d26100249d410e863b9db7a1a41fdad922e03 **/ m4/odp_atomic.m4 | 95 ++++++++++++++++++++++++++++++++++ platform/linux-generic/m4/configure.m4 | 65 +---------------------- 2 files changed, 96 insertions(+), 64 deletions(-) create mode 100644 m4/odp_atomic.m4 diff --git a/m4/odp_atomic.m4 b/m4/odp_atomic.m4 new file mode 100644 index 000000000..413dcbda9 --- /dev/null +++ b/m4/odp_atomic.m4 @@ -0,0 +1,95 @@ +# ODP_ATOMIC +# ---------- +# Run different atomic-related checks +AC_DEFUN([ODP_ATOMIC], [dnl +ODP_ATOMIC_BUILTINS + +dnl Check whether -latomic is needed +use_libatomic=no + +ODP_ATOMIC_NEEDED_64BIT([use_libatomic=yes]) +AC_CHECK_TYPE([__int128], [ODP_ATOMIC_NEEDED_128BIT([use_libatomic=yes])]) + +if test "x$use_libatomic" = "xyes"; then + ATOMIC_LIBS="-latomic" +fi +AC_SUBST([ATOMIC_LIBS]) +]) # ODP_ATOMIC + +# ODP_ATOMIC_BUILTINS +# ------------------- +# +AC_DEFUN([ODP_ATOMIC_BUILTINS], [dnl +AC_CACHE_CHECK([for GCC atomic builtins], [odp_cv_atomic_builtins], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [[int main() { + int v = 1; + __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); + __atomic_store_n(&v, 1, __ATOMIC_RELAXED); + __atomic_load_n(&v, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_builtins=yes], + [odp_cv_atomic_builtins=no])]) + +if test "x$odp_cv_atomic_builtins" != "xyes" ; then + AC_MSG_FAILURE([GCC-style __atomic builtins not supported by the compiler, use gcc > 4.7.0]) +fi +]) # ODP_ATOMIC_BUILTINS + +# ODP_ATOMIC_NEEDED_64BIT([ACTION_IF_NEEDED]) +# ------------------------------------------- +# +AC_DEFUN([ODP_ATOMIC_NEEDED_64BIT], [dnl +AC_CACHE_CHECK([whether -latomic is needed for 64-bit atomic built-ins], + [odp_cv_atomic_needed_64bit], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + #include + static uint64_t loc; + int main(void) + { + uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_needed_64bit=no], + [odp_cv_atomic_needed_64bit=yes])]) + +if test "x$odp_cv_atomic_needed_64bit" = "xyes" ; then + AC_CHECK_LIB( + [atomic], [__atomic_exchange_8], + [m4_default([$1], [:])], + [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) +fi +]) # ODP_ATOMIC_NEEDED_64BIT + +# ODP_ATOMIC_NEEDED_128BIT([ACTION_IF_NEEDED]) +# ------------------------------------------- +# +AC_DEFUN([ODP_ATOMIC_NEEDED_128BIT], [dnl +AC_CACHE_CHECK([whether -latomic is needed for 128-bit atomic built-ins], + [odp_cv_atomic_needed_128bit], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + #include + static __int128 loc; + int main(void) + { + __int128 prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_needed_128bit=no], + [odp_cv_atomic_needed_128bit=yes])]) + +if test "x$odp_cv_atomic_needed_128bit" = "xyes" ; then + AC_CHECK_LIB( + [atomic], [__atomic_exchange_16], + [m4_default([$1], [:])], + [AC_MSG_FAILURE([__atomic_exchange_16 is not available])]) +fi +]) # ODP_ATOMIC_NEEDED_128BIT diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 4e3ce6344..397c539b8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,68 +1,5 @@ ODP_VISIBILITY - -AC_MSG_CHECKING(for GCC atomic builtins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [[int main() { - int v = 1; - __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); - __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); - __atomic_store_n(&v, 1, __ATOMIC_RELAXED); - __atomic_load_n(&v, __ATOMIC_RELAXED); - return 0; - } - ]])], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - echo "GCC-style __atomic builtins not supported by the compiler." - echo "Use newer version. For gcc > 4.7.0" - exit -1) - -dnl Check whether -latomic is needed -use_libatomic=no - -AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - #include - static uint64_t loc; - int main(void) - { - uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_8], - [use_libatomic=yes], - [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) - ]) - -AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - static __int128 loc; - int main(void) - { - __int128 prev; - prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_16], - [use_libatomic=yes], - [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) - ]) - -if test "x$use_libatomic" = "xyes"; then - ATOMIC_LIBS="-latomic" -fi -AC_SUBST([ATOMIC_LIBS]) +ODP_ATOMIC m4_include([platform/linux-generic/m4/odp_pthread.m4]) ODP_TIMER