From patchwork Mon Jan 30 12:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 18223 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 59A03BDC71 for ; Mon, 30 Jan 2023 12:46:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7E4D6625E4; Mon, 30 Jan 2023 13:46:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1675082763; bh=fZ+H8oYY9pyZaF5aaWz2GMQtAyt41WDrVxEAiZPfIpk=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=aIoCZCF2Q44FyW+6TyupsnaUCV9g2Y7I96c0RSquNo5RiT8hw2OZk8fs2vHcupQ9G iu7YpViO3N/h1mJ0NKFTkbRdLmVuuWbtLVukCoDJzMkGcquyMKSCTW2rw5x1ZbZeBm ZeGJJh/DepaMWKhbHKUKe09nFZ5g46J7G8sGTtnQoRJ8rlh2kvIp+2ebDoK6pehi/j nAo121o5C3QyS55PHlvEQFWR6G9wtt/dM6GxvRRjCx119dotide0ppTqGMuDERrmsl zdGEePREaAw5DRTclV6zXTaPB8qpXKJGNxVZvXDLZpDEKg9+JSuludbNx6/Ib05mAx X66qwHi2OrBHg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B407E60482 for ; Mon, 30 Jan 2023 13:46:02 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="s6wnTxUM"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1EBA08B8; Mon, 30 Jan 2023 13:46:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1675082762; bh=fZ+H8oYY9pyZaF5aaWz2GMQtAyt41WDrVxEAiZPfIpk=; h=From:To:Cc:Subject:Date:From; b=s6wnTxUMTWdDglWo2HrdZ3pbnXCywdBJLt6tF0CA4EWl0XKU75IM1Yf++ONk6IShE DDjs2Iq64s1HhYI91UP8hcJWMvED6/2IZlXFn/oqduS5WbuA2aUfKglHyt+8kfiFTl H7zeS7AfZ+y2RHvTzfBz4e27tKjUm6Ii9YRaqD2I= To: libcamera devel Date: Mon, 30 Jan 2023 12:45:59 +0000 Message-Id: <20230130124559.1838507-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] meson: Rework automatic pipeline selection X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The supported pipelines are listed in three places: the meson_options.txt file, the defined array when a user selects -Dpipelines="all", and arrays defined when the default -Dpipelines="auto" is selected. This can be hard to maintain and error prone. Rework the definition of pipeline selection to a single table which specifies the architecture(s) that the pipeline handler supports and iterate it to handle the special cases for 'all', 'auto' and 'test'. The current behaviour such that 'all' takes precedence over 'auto' is maintained, and 'test' is now extended such that additional test pipeline handlers can easily be introduced. The existing implementation defines the i.MX8-ISI and RKISP1 pipeline handlers as only supported by 'aarch64'. This conversion changes the behaviour such that those pipeline handlers are now supported on both 'arm' and 'aarch64' as each of those platforms could support a 32-bit ARM build. Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- v2: - Took in Laurent's feedback, and moved the comment regarding enableing VIMC for tests closer to the code block where that actually occurs. meson.build | 57 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/meson.build b/meson.build index 389c547206fb..3cbe1584e2dd 100644 --- a/meson.build +++ b/meson.build @@ -164,42 +164,41 @@ liblttng = dependency('lttng-ust', required : get_option('tracing')) # Pipeline handlers # -# Tests require the vimc pipeline handler, include it automatically when tests -# are enabled. pipelines = get_option('pipelines') -if pipelines.contains('all') - pipelines = [ - 'imx8-isi', - 'ipu3', - 'raspberrypi', - 'rkisp1', - 'simple', - 'uvcvideo', - 'vimc', - ] -endif +arch_arm = ['arm', 'aarch64'] +arch_x86 = ['x86', 'x86_64'] +pipelines_support = { + 'imx8-isi': arch_arm, + 'ipu3': arch_x86, + 'raspberrypi': arch_arm, + 'rkisp1': arch_arm, + 'simple': arch_arm, + 'uvcvideo': ['any'], + 'vimc': ['test'], +} -if pipelines.contains('auto') +if pipelines.contains('all') + pipelines = pipelines_support.keys() +elif pipelines.contains('auto') host_cpu = host_machine.cpu_family() pipelines = [] - if host_cpu == 'x86' or host_cpu == 'x86_64' - pipelines += ['ipu3'] - elif host_cpu == 'aarch64' - pipelines += ['imx8-isi', 'rkisp1'] - endif - - if host_cpu == 'arm' or host_cpu == 'aarch64' - pipelines += ['raspberrypi', 'simple'] - endif - - # Always include the uvcvideo pipeline handler. - pipelines += ['uvcvideo'] + foreach pipeline, archs : pipelines_support + if host_cpu in archs or 'any' in archs + pipelines += pipeline + endif + endforeach endif -if get_option('test') and 'vimc' not in pipelines - message('Enabling vimc pipeline handler to support tests') - pipelines += ['vimc'] +# Tests require the vimc pipeline handler, include it automatically when tests +# are enabled. +if get_option('test') + foreach pipeline, archs : pipelines_support + if 'test' in archs and pipeline not in pipelines + message('Enabling ' + pipeline + ' pipeline handler for tests') + pipelines += pipeline + endif + endforeach endif # Utilities are parsed first to provide support for other components.