From patchwork Tue Nov 11 13:56:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 409462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 65E8214017E for ; Wed, 12 Nov 2014 00:57:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 30C40A1BD2; Tue, 11 Nov 2014 13:57:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QmvU14a42M_l; Tue, 11 Nov 2014 13:57:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3C2A1A1A5E; Tue, 11 Nov 2014 13:57:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 40B0D1C2B47 for ; Tue, 11 Nov 2014 13:57:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3DA2295288 for ; Tue, 11 Nov 2014 13:57:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mjRBfgyJKVHj for ; Tue, 11 Nov 2014 13:56:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (us01smtprelay-2.synopsys.com [198.182.44.111]) by hemlock.osuosl.org (Postfix) with ESMTPS id E8B2E95157 for ; Tue, 11 Nov 2014 13:56:58 +0000 (UTC) Received: from us01secmta2.synopsys.com (us01secmta2.synopsys.com [10.9.203.102]) by smtprelay.synopsys.com (Postfix) with ESMTP id 7618624E0D34; Tue, 11 Nov 2014 05:56:57 -0800 (PST) Received: from us01secmta2.internal.synopsys.com (us01secmta2.internal.synopsys.com [127.0.0.1]) by us01secmta2.internal.synopsys.com (Service) with ESMTP id 2E55AA4112; Tue, 11 Nov 2014 05:56:57 -0800 (PST) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by us01secmta2.internal.synopsys.com (Service) with ESMTP id E43F5A4102; Tue, 11 Nov 2014 05:56:56 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id D22F116C; Tue, 11 Nov 2014 05:56:56 -0800 (PST) Received: from abrodkin-8560l.internal.synopsys.com (unknown [10.121.8.116]) by mailhost.synopsys.com (Postfix) with ESMTP id 99374165; Tue, 11 Nov 2014 05:56:54 -0800 (PST) From: Alexey Brodkin To: buildroot@buildroot.org Date: Tue, 11 Nov 2014 16:56:48 +0300 Message-Id: <1415714208-825-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 1.9.3 Cc: Thomas Petazzoni , Alexey Brodkin Subject: [Buildroot] [PATCH v2] rt-tests: allow building subset of tests with non-NPTL toolchains X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some architectures are still stuck with non-NPTL toolchains. These are for example ARC, Blackfin, Xtensa etc. Still rt-tests are very good benchmarks and it would be good to enable use of at least selected (those that will be built) tests on those architectures. This change makes it possible to only build subset of tests that don't require NPTL calls. Following tests will be built with non-NPTL toolchain: * signaltest * ptsematest * sigwaittest * svsematest * sendme * hackbench Still it's required to have a toolchain with threads support because most of mentioned tests use threads. 03-fix-non-nptl-buil.patch was submitted upstream: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg762958.html so as soon as it is accepted with the next version bump this patch should be removed. Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Gustavo Zacarias --- Compared to v1 dependency on threads support in toolchain was added. --- package/rt-tests/03-fix-non-nptl-buil.patch | 55 +++++++++++++++++++++++++++++ package/rt-tests/Config.in | 7 ++-- package/rt-tests/rt-tests.mk | 6 ++++ 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 package/rt-tests/03-fix-non-nptl-buil.patch diff --git a/package/rt-tests/03-fix-non-nptl-buil.patch b/package/rt-tests/03-fix-non-nptl-buil.patch new file mode 100644 index 0000000..5c65018 --- /dev/null +++ b/package/rt-tests/03-fix-non-nptl-buil.patch @@ -0,0 +1,55 @@ +From c6920f97be02ca3fba9320b043acd578ce4c62d8 Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 10 Nov 2014 10:00:13 +0300 +Subject: [PATCH] Makefile: allow building selected tests with non-NPTL + toolchain + +Some architectures are still stuck with non-NPTL toolchains. +These are for example ARC, Blackfin, Xtensa etc. + +Still rt-tests are very good benchmarks and it would be good to enable use of +at least selected (those that will be built) tests on those architectures. + +This change makes it possible to only build subset of tests that don't require +NPTL calls. + +By default behavior is not modified - all tests are built, but if one wants +to build with non-NPTL toolchain just add "HAVE_NPTL=no" in command line +or modify "HAVE_NPTL" variable right in Makefile and execute "make". + +This patch was submitted upstream: +https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg762958.html +so as soon as it is accepted with the next version bump this patch should be +removed. + +Signed-off-by: Alexey Brodkin +Cc: Vineet Gupta +Cc: Clark Williams +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 318a5c6..675edf7 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,13 @@ + VERSION_STRING = 0.89 + +-sources = cyclictest.c signaltest.c pi_stress.c rt-migrate-test.c \ +- ptsematest.c sigwaittest.c svsematest.c pmqtest.c sendme.c \ +- pip_stress.c hackbench.c ++HAVE_NPTL ?= yes ++ ++ifeq ($(HAVE_NPTL),yes) ++sources = cyclictest.c pi_stress.c pip_stress.c pmqtest.c rt-migrate-test.c ++endif ++ ++sources += signaltest.c ptsematest.c sigwaittest.c svsematest.c sendme.c \ ++ hackbench.c + + TARGETS = $(sources:.c=) + +-- +1.9.3 + diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 81e5d06..34669b2 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" - # no _tid field in 'struct sigevent' - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_HAS_THREADS help Set of utilities for testing the real-time behaviour of a Linux system. @@ -26,5 +25,5 @@ comment "rt-tests may not work on MIPS with an external uClibc toolchain" depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el -comment "rt-tests needs a toolchain w/ NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL +comment "rt-tests needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 4cd99c0..1980556 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -13,15 +13,21 @@ ifeq ($(BR2_PACKAGE_PYTHON),y) RT_TESTS_DEPENDENCIES = python endif +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +RT_TESTS_HAVE_NPTL=no +endif + define RT_TESTS_BUILD_CMDS $(MAKE) -C $(@D) \ CC="$(TARGET_CC)" \ + HAVE_NPTL=$(RT_TESTS_HAVE_NPTL) \ CFLAGS="$(TARGET_CFLAGS)" \ prefix=/usr endef define RT_TESTS_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) \ + HAVE_NPTL=$(RT_TESTS_HAVE_NPTL) \ DESTDIR="$(TARGET_DIR)" \ prefix=/usr \ $(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \