From patchwork Thu Dec 16 20:28:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 32665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp832223iog; Thu, 16 Dec 2021 12:29:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJywhUNIymcmyNRfge3+bNpjZS/imLVvhPfxWKUd48fR+x5jICPFZZ/RrqaVP4MfTgjr+R/3 X-Received: by 2002:a05:6402:13d7:: with SMTP id a23mr405547edx.335.1639686569316; Thu, 16 Dec 2021 12:29:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639686569; cv=none; d=google.com; s=arc-20160816; b=hX+pwX0scfWXHGBs75NlIX5aKB/NKxNOc64TYrKR6k6I4rZ/ybT0acSVZEGmpNeT39 V2VwKzupvDVV8Og1ok2vByyJd9NJxeKSPvYYW70CgR9Ek3tDnv3NcoE2rYVGgVEsN8lD fH732dI2WDwfpjLIgzLWCsF1Brz495ib/i4NFyjBa9Z8r/3bG54SJmoLQxL6eG33/83u MMqu8YF5F7SvGAD2/1Udsd6PLNe9cz/6P86TjBIfXL3bpboesDdMPsinNGAgwE3g+0q5 WtZ4CQGdza2mhV/ZId2eM7w6jDJOkiniTQ+BKdWFzCBKHMzdqDfouyfK36U9Ptf/IAww CbUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Df9vXeLEhiREpdORlGw6s/Czjhh5SfFgvJF49OjpG0A=; b=o5AhZxR3aRzo344HGyealbnSllomhiChvFZy+sH4oYa8JDg+1KBoyBJw7lXWJglpMu U120JgmL67FMYDcFTpLK1u8r4ZzudRcirZQk89ELdQo7iCDXZzSNQ8chw3VxMvLg+Uwu xCMQJ15l/PdPuWLRfiuaxRJVl+B/PYwT2JmFsB31SGRIc4YOmU2U7NcPz93FiNVGLnp2 O3CI/7mHIk7VWSAZgdZE+0f6NvLc8kWR5+1hf4VchINmU/3lLWvTDplkpMr9o9mFVlzE Yx/W4/Bcr0+c2OYN+lRmJxChbJ2d/mpcZXoN1OM2cTMN2XE5FudCAs9eobYZytLpy2gY qweg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TtpjDXB3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gk1si5508210ejc.233.2021.12.16.12.29.28; Thu, 16 Dec 2021 12:29:29 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TtpjDXB3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 422CE68AF7A; Thu, 16 Dec 2021 22:29:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECF6868ACC3 for ; Thu, 16 Dec 2021 22:29:07 +0200 (EET) Received: by mail-pj1-f43.google.com with SMTP id np6-20020a17090b4c4600b001a90b011e06so453695pjb.5 for ; Thu, 16 Dec 2021 12:29:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LF+4SgbncZrSlCw5IrzsN1xjU11yS2mEI6IDk07klR0=; b=TtpjDXB3+q+tPi2b1/S6piJKalaxxfKJa5FXyntMro97fonzZ6VH7/9+URUv+BdReR bC84X9jNt3tkmNBs+Nx6adSaSwawoCwH1aTaxhgaX2aaJXBa+7m1774ApZjKoHdPw2Ja LHCOMn5hqHYNezdGXi7hIsya8timO+CIwtNTQe42JslEgj9PzSyaUnnzns6+ou2RAb4D 7EPd80xha2Q5dXr50AyWqhrSXcgTwj/GXUimuhfgb9vT340P26OYzwF62jkOJLy1ADiX xS3DvlUYiRquIfas8kuGLQYajpY8gr62mRyGCFY/r48SqKYM6uncSqsZvJMbmyX7SStg 1x7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LF+4SgbncZrSlCw5IrzsN1xjU11yS2mEI6IDk07klR0=; b=xuxmHa8hbK1+xMD3XzbmKL9NwJE79he5CwwfiCiRbkQAfwA4/Gisyx6Ey1rY87/Z4b k9fT8qxLDBirUTop8IsvrYMhBsPIup/eeGbV9BCpuzvteGVA8T/2O/XqSOxSzm0UT1RI JpjFKSufeYMi6YTP0xZsspqZReyW/r//RTdGuVe9oxd0UyHmNdLVkZeLWhPoPbAp0Qda 0cik2TfSr77R1gqo5itj82ZtBqYi55K4HI5/UPA1EDN8DhYTZ99gYcw5cbZq0RAgBfCU nGwr23kIgCVHtP+hWeJj3stz+UzA+4o00n5JGKx7UPxQEvT6HtGMkGhkLi3DcGaT2EL3 UhZA== X-Gm-Message-State: AOAM532XTKmmGlc8uWJMCJRBJPnSgK7lKas20PRJe+kvH0wTEB8gPatC XKRhGjVpWRGK0BZyhv0yL6fAKGx6rMCGVg== X-Received: by 2002:a17:902:6a8a:b0:143:905f:aec7 with SMTP id n10-20020a1709026a8a00b00143905faec7mr18087062plk.8.1639686545808; Thu, 16 Dec 2021 12:29:05 -0800 (PST) Received: from tmm1-imac.lan ([2600:8802:5501:308f:15c6:3324:e59b:bed5]) by smtp.gmail.com with ESMTPSA id k16sm7534732pfu.183.2021.12.16.12.29.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Dec 2021 12:29:05 -0800 (PST) From: Aman Karmani To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 12:28:55 -0800 Message-Id: <20211216202858.77643-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211216202858.77643-1-ffmpeg@tmm1.net> References: <20211216202858.77643-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] build: detect Metal.framework and build .metal files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: philipl@overt.org, Aman Karmani , kernrj@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: duQU7r2HhtIp From: Aman Karmani Signed-off-by: Aman Karmani --- .gitignore | 3 +++ configure | 8 +++++++- ffbuild/common.mak | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ed24b542e..1a5bb29ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ *.swp *.ver *.version +*.metal.air +*.metallib +*.metallib.c *.ptx *.ptx.c *.ptx.gz diff --git a/configure b/configure index 5fffcb8afe..ab00b2d7cb 100755 --- a/configure +++ b/configure @@ -309,6 +309,7 @@ External library support: if openssl, gnutls or libtls is not used [no] --enable-mediacodec enable Android MediaCodec support [no] --enable-mediafoundation enable encoding via MediaFoundation [auto] + --disable-metal disable Apple Metal framework [autodetect] --enable-libmysofa enable libmysofa, needed for sofalizer filter [no] --enable-openal enable OpenAL 1.1 capture support [no] --enable-opencl enable OpenCL processing [no] @@ -382,6 +383,7 @@ Toolchain options: --dep-cc=DEPCC use dependency generator DEPCC [$cc_default] --nvcc=NVCC use Nvidia CUDA compiler NVCC or clang [$nvcc_default] --ld=LD use linker LD [$ld_default] + --metalcc=METALCC use metal compiler METALCC [$metalcc_default] --pkg-config=PKGCONFIG use pkg-config tool PKGCONFIG [$pkg_config_default] --pkg-config-flags=FLAGS pass additional flags to pkgconf [] --ranlib=RANLIB use ranlib RANLIB [$ranlib_default] @@ -2564,6 +2566,7 @@ CMDLINE_SET=" ln_s logfile malloc_prefix + metalcc nm optflags nvcc @@ -3835,6 +3838,7 @@ host_cc_default="gcc" doxygen_default="doxygen" install="install" ln_s_default="ln -s -f" +metalcc_default="xcrun metal" nm_default="nm -g" pkg_config_default=pkg-config ranlib_default="ranlib" @@ -4435,7 +4439,7 @@ if enabled cuda_nvcc; then fi set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ - target_exec x86asmexe + target_exec x86asmexe metalcc enabled cross_compile || host_cc_default=$cc set_default host_cc @@ -6326,6 +6330,7 @@ check_apple_framework CoreFoundation check_apple_framework CoreMedia check_apple_framework CoreVideo check_apple_framework CoreAudio +check_apple_framework Metal enabled avfoundation && { disable coregraphics applicationservices @@ -7620,6 +7625,7 @@ ARFLAGS=$arflags AR_O=$ar_o AR_CMD=$ar NM_CMD=$nm +METALCC=$metalcc RANLIB=$ranlib STRIP=$strip STRIPTYPE=$striptype diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 0eb831d434..05440911f4 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -112,6 +112,15 @@ COMPILE_LASX = $(call COMPILE,CC,LASXFLAGS) $(BIN2CEXE): ffbuild/bin2c_host.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) +%.metal.air: %.metal + $(METALCC) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + +%.metallib: %.metal.air + $(METALCC)lib --split-module-without-linking $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + +%.metallib.c: %.metallib $(BIN2CEXE) + $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) + %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h $(COMPILE_NVCC)