From patchwork Wed Aug 10 20:47:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 37225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1142564pzi; Wed, 10 Aug 2022 13:48:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR6YYMhHQI9O5TUIvjIXVpkNHsLOddvPiAThsfMVG2Hd6BtCQaBjea4Q4SHitZW3K10Jvigs X-Received: by 2002:a05:6402:28cb:b0:43b:c6d7:ef92 with SMTP id ef11-20020a05640228cb00b0043bc6d7ef92mr28596360edb.333.1660164507779; Wed, 10 Aug 2022 13:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660164507; cv=none; d=google.com; s=arc-20160816; b=CqiWzxS1/gad+fg8w4e958ML/54bE9HemjkIYSuJjLCV3q1x0YtJu5DWlWwGJ+B3al WrDhnHdRptIZeYzgEjqLtkpV0cFLJ+Ehvy6XRaUFeRH5tQCIv0eVzookujqbYpS2YPaS zDalHGNtu7fBSrNK1MkFcaFaurmtcKjTgZnJfiRx7O+ypw++oZjCXt7+4bLrgCrYClIO P+dgQWSkCduQXqazcwILPJpmwDVKaLrmQ/tOts0C+Dq8kXgXmz/ZYWohEsrBtoxa21dJ OZAO/r80tJFItjhVvkNRbDBkH5RBXv4Fr/u1sNMNQ/pEI0DD+Gf1HWe0YlrChdlkQzQU nzcA== 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=vyBzX5RFZ+UPP8R+9UYcXtZFIOM8p6glwQnetq1J19c=; b=T3SzEsCcfoApsAQ5YNtXyPJeF+ipUxo1ZC+8jGpmpOYQx1wgLCn3S4St6JWQn60OpN G7GCuJV7nNIlwX+j1z4bvNMekwxF5sNAGgwiZULyIspGyIjdWKvP1XtpcpDX1lr6/aSI fo9GP3zi8y6EIFDcTg5y+rB3Z6pvumMf2rKPrHfvzowNjZy+cxnWlyfC7sATAGOJBzy1 5CGKVhFEmUrT/bLJ0kF9rYfiaQdp/UCzPfSXZQ7UCH+2Wk4SMGOZUd5ezjg1TgZ/Zfqc hCTpTrsEtoJLfwxb5C3c9FIsKT68BBl7hcRJLDCrWON5UzZRKXPbxJpVAKgjmtptdUvL p7Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=ex07BzQf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt38-20020a1709072da600b0073127725a02si5633887ejc.770.2022.08.10.13.48.27; Wed, 10 Aug 2022 13:48:27 -0700 (PDT) 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=@rothenpieler.org header.s=mail header.b=ex07BzQf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4125E68B8FC; Wed, 10 Aug 2022 23:47:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B48668B883 for ; Wed, 10 Aug 2022 23:47:31 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 62E922F260F; Wed, 10 Aug 2022 22:47:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1660164445; bh=tRI0BK5KQlVJV8F94kb8xqVuesqZ4ZNFe9JELoi9AP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ex07BzQfo1nq6On/ltbEpp9jqBqjhH3NOr4X9ZhaSZzJ7X65TVmCteRkmrTuhlViT 15uMgBF/zX+hg9BNeEC00OVRjsRFtfmND/8kDDzDkSVNEtVwzle6Bolwj5IUboyzOD +hdEJTTaHy/ICHQKD2lmtM8L2AdYV1KMsL1uGAPEziHI7pDTk6ZrO1ikDQXrUgRpLc v8/3Vp+81ViM5Xtq/YecuQlMKaEZS/o5NclkydOWyPjilQ9JWhKDSkXmhH7ZCRK8dd dbfVNquFK7njPUBUzY9jOt0mQG+WpQVs3wiLPE1eef3Ao+5ccsLt7prVAqfoppXkCT A0CYKBC0zWADA== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 22:47:10 +0200 Message-Id: <20220810204712.3123-9-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810204712.3123-1-timo@rothenpieler.org> References: <20220810204712.3123-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] avutil/half2float: use native _Float16 if available 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3+VkvMpABZ+U _Float16 support was available on arm/aarch64 for a while, and with gcc 12 was enabled on x86 as long as SSE2 is supported. If the target arch supports f16c, gcc emits fairly efficient assembly, taking advantage of it. This is the case on x86-64-v3 or higher. Without f16c, it emulates it in software using sse2 instructions. --- configure | 4 ++++ libavutil/float2half.c | 2 ++ libavutil/float2half.h | 16 ++++++++++++++++ libavutil/half2float.c | 4 ++++ libavutil/half2float.h | 16 ++++++++++++++++ 5 files changed, 42 insertions(+) diff --git a/configure b/configure index 6761d0cb32..2536ae012d 100755 --- a/configure +++ b/configure @@ -2143,6 +2143,7 @@ ARCH_FEATURES=" fast_64bit fast_clz fast_cmov + float16 local_aligned simd_align_16 simd_align_32 @@ -5125,6 +5126,8 @@ elif enabled arm; then ;; esac + test_cflags -mfp16-format=ieee && add_cflags -mfp16-format=ieee + elif enabled avr32; then case $cpu in @@ -6228,6 +6231,7 @@ check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)" check_builtin gmtime_r time.h "time_t *time; struct tm *tm; gmtime_r(time, tm)" check_builtin localtime_r time.h "time_t *time; struct tm *tm; localtime_r(time, tm)" +check_builtin float16 "" "_Float16 f16var" case "$custom_allocator" in jemalloc) diff --git a/libavutil/float2half.c b/libavutil/float2half.c index dba14cef5d..1390d3acc0 100644 --- a/libavutil/float2half.c +++ b/libavutil/float2half.c @@ -20,6 +20,7 @@ void ff_init_float2half_tables(float2half_tables *t) { +#if !HAVE_FLOAT16 for (int i = 0; i < 256; i++) { int e = i - 127; @@ -50,4 +51,5 @@ void ff_init_float2half_tables(float2half_tables *t) t->shifttable[i|0x100] = 13; } } +#endif } diff --git a/libavutil/float2half.h b/libavutil/float2half.h index b8c9cdfc4f..8c1fb804b7 100644 --- a/libavutil/float2half.h +++ b/libavutil/float2half.h @@ -20,21 +20,37 @@ #define AVUTIL_FLOAT2HALF_H #include +#include "intfloat.h" + +#include "config.h" typedef struct float2half_tables { +#if HAVE_FLOAT16 + uint8_t dummy; +#else uint16_t basetable[512]; uint8_t shifttable[512]; +#endif } float2half_tables; void ff_init_float2half_tables(float2half_tables *t); static inline uint16_t float2half(uint32_t f, const float2half_tables *t) { +#if HAVE_FLOAT16 + union { + _Float16 f; + uint16_t i; + } u; + u.f = av_int2float(f); + return u.i; +#else uint16_t h; h = t->basetable[(f >> 23) & 0x1ff] + ((f & 0x007fffff) >> t->shifttable[(f >> 23) & 0x1ff]); return h; +#endif } #endif /* AVUTIL_FLOAT2HALF_H */ diff --git a/libavutil/half2float.c b/libavutil/half2float.c index baac8e4093..873226d3a0 100644 --- a/libavutil/half2float.c +++ b/libavutil/half2float.c @@ -18,6 +18,7 @@ #include "libavutil/half2float.h" +#if !HAVE_FLOAT16 static uint32_t convertmantissa(uint32_t i) { int32_t m = i << 13; // Zero pad mantissa bits @@ -33,9 +34,11 @@ static uint32_t convertmantissa(uint32_t i) return m | e; // Return combined number } +#endif void ff_init_half2float_tables(half2float_tables *t) { +#if !HAVE_FLOAT16 t->mantissatable[0] = 0; for (int i = 1; i < 1024; i++) t->mantissatable[i] = convertmantissa(i); @@ -60,4 +63,5 @@ void ff_init_half2float_tables(half2float_tables *t) t->offsettable[31] = 2048; t->offsettable[32] = 0; t->offsettable[63] = 2048; +#endif } diff --git a/libavutil/half2float.h b/libavutil/half2float.h index cb58e44a1c..b2a7c934a6 100644 --- a/libavutil/half2float.h +++ b/libavutil/half2float.h @@ -20,22 +20,38 @@ #define AVUTIL_HALF2FLOAT_H #include +#include "intfloat.h" + +#include "config.h" typedef struct half2float_tables { +#if HAVE_FLOAT16 + uint8_t dummy; +#else uint32_t mantissatable[3072]; uint32_t exponenttable[64]; uint16_t offsettable[64]; +#endif } half2float_tables; void ff_init_half2float_tables(half2float_tables *t); static inline uint32_t half2float(uint16_t h, const half2float_tables *t) { +#if HAVE_FLOAT16 + union { + _Float16 f; + uint16_t i; + } u; + u.i = h; + return av_float2int(u.f); +#else uint32_t f; f = t->mantissatable[t->offsettable[h >> 10] + (h & 0x3ff)] + t->exponenttable[h >> 10]; return f; +#endif } #endif /* AVUTIL_HALF2FLOAT_H */