From patchwork Wed Mar 2 19:29:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 63409 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2558740lbc; Wed, 2 Mar 2016 11:30:53 -0800 (PST) X-Received: by 10.141.2.11 with SMTP id e11mr8905495qhd.69.1456947053177; Wed, 02 Mar 2016 11:30:53 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i6si3004122qhi.95.2016.03.02.11.30.52; Wed, 02 Mar 2016 11:30:53 -0800 (PST) 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 Received: by lists.linaro.org (Postfix, from userid 109) id C4EC862FC2; Wed, 2 Mar 2016 19:30:52 +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, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 3C74B650BA; Wed, 2 Mar 2016 19:30:23 +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 5883862FC4; Wed, 2 Mar 2016 19:30:17 +0000 (UTC) Received: from mail-qk0-f176.google.com (mail-qk0-f176.google.com [209.85.220.176]) by lists.linaro.org (Postfix) with ESMTPS id 1A6DE61D7E for ; Wed, 2 Mar 2016 19:30:16 +0000 (UTC) Received: by mail-qk0-f176.google.com with SMTP id o6so86884402qkc.2 for ; Wed, 02 Mar 2016 11:30:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G7r5qBO59yDpjlyMOdcT0iF1ccqfzYDwJeh4/rgJu0M=; b=DmjLHK9OhZ+GpjNe1pjrqGFIGhRV/TO7mwkl8gsvTkLFRVZy1oSqaPikYAL6LVmYxy M1VQ3ax5pmPVqzisAR9Iu8onHXmhY1QcMJD0T5n8oX/kcYmtd8/qDEw6UKBgssSR1YGo TBOeyHnacH9YARgA+coyHKmdUFLvFNgpHU7Ahqy1z8HAoS+c9QDVnURGg1Q8mKzw7j1f n/A/siteelNox2Tu7/tVjGDamRbz/3qCvXfFyNDcnZShUjFiofB7syjyuM5uEjJEuBGC AyHJmQCFnt4fXIP6dZCyUFEMFIpWxEmljlN1CsXKRUaYk8qbsdLo7N9vFMZ+opiFl7li Bktw== X-Gm-Message-State: AD7BkJKooIaKChw+NtmgLJXCDLI8+Z6oM2kLLoRYD3AV8zym1o9mlrSIeeNl/87AeDAu1eCTVgM= X-Received: by 10.55.76.15 with SMTP id z15mr35814276qka.32.1456947015850; Wed, 02 Mar 2016 11:30:15 -0800 (PST) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id a129sm15527538qkb.45.2016.03.02.11.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 11:30:15 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 2 Mar 2016 14:29:45 -0500 Message-Id: <1456946992-19251-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456946992-19251-1-git-send-email-mike.holmes@linaro.org> References: <1456946992-19251-1-git-send-email-mike.holmes@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v5 1/8] linux-generic: separate x86 ODP_CACHE_LINE_SIZE to its arch 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Hongbo Zhang Currently all ODP_CACHE_LINE_SIZE macros for different architectures are held in one header file, they should be moved to their own arch file. This patch moves ODP_CACHE_LINE_SIZE for x86. Signed-off-by: Mike Holmes Signed-off-by: Hongbo Zhang Reviewed-and-tested-by: Bill Fischofer --- configure.ac | 1 + doc/application-api-guide/doxygen.cfg | 1 + m4/ax_prog_doxygen.m4 | 3 ++- platform/linux-generic/arch/x86/odp/cpu_arch.h | 10 ++++++++++ platform/linux-generic/include/odp/align.h | 9 ++------- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index b6c6b1e..c9a146c 100644 --- a/configure.ac +++ b/configure.ac @@ -393,6 +393,7 @@ AC_MSG_RESULT([ libdir: ${libdir} includedir: ${includedir} testdir: ${testdir} + WITH_ARCH: ${WITH_ARCH} cc: ${CC} cppflags: ${CPPFLAGS} diff --git a/doc/application-api-guide/doxygen.cfg b/doc/application-api-guide/doxygen.cfg index 7951e9e..4d6506d 100644 --- a/doc/application-api-guide/doxygen.cfg +++ b/doc/application-api-guide/doxygen.cfg @@ -14,6 +14,7 @@ INPUT = $(SRCDIR)/doc \ $(SRCDIR)/doc/users-guide \ $(SRCDIR)/include \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \ + $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) \ $(SRCDIR)/helper/include FILE_PATTERNS = *.h odp*.c *.dox RECURSIVE = YES diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index d0858ca..70baff8 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -270,6 +270,7 @@ DX_ENV_APPEND(SRCDIR, $srcdir) DX_ENV_APPEND(BUILDDIR, $builddir) DX_ENV_APPEND(VERSION, $VERSION) DX_ENV_APPEND(WITH_PLATFORM, $with_platform) +DX_ENV_APPEND(WITH_ARCH, $ARCH) DX_ENV_APPEND(PROJECT, $DX_PROJECT) DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) @@ -607,4 +608,4 @@ echo DX_FLAG_html=$DX_FLAG_html #echo DX_FLAG_pdf=$DX_FLAG_pdf #echo DX_FLAG_ps=$DX_FLAG_ps #echo DX_ENV=$DX_ENV -]) \ No newline at end of file +]) diff --git a/platform/linux-generic/arch/x86/odp/cpu_arch.h b/platform/linux-generic/arch/x86/odp/cpu_arch.h index 997a954..3a16fa6 100644 --- a/platform/linux-generic/arch/x86/odp/cpu_arch.h +++ b/platform/linux-generic/arch/x86/odp/cpu_arch.h @@ -11,6 +11,16 @@ extern "C" { #endif +/** @ingroup odp_compiler_optim + * @{ + */ + +#define ODP_CACHE_LINE_SIZE 64 + +/** + * @} + */ + static inline void odp_cpu_pause(void) { #ifdef __SSE2__ diff --git a/platform/linux-generic/include/odp/align.h b/platform/linux-generic/include/odp/align.h index be8c9ae..161a302 100644 --- a/platform/linux-generic/include/odp/align.h +++ b/platform/linux-generic/include/odp/align.h @@ -31,11 +31,7 @@ extern "C" { #define ODP_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) -#if defined __x86_64__ || defined __i386__ - -#define ODP_CACHE_LINE_SIZE 64 - -#elif defined __arm__ || defined __aarch64__ +#if defined __arm__ || defined __aarch64__ #define ODP_CACHE_LINE_SIZE 64 @@ -47,8 +43,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -#else -#error GCC target not found #endif #else @@ -65,6 +59,7 @@ extern "C" { * @} */ +#include #include #ifdef __cplusplus