From patchwork Mon Apr 8 17:49:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786942 Delivered-To: patch@linaro.org Received: by 2002:adf:fb4d:0:b0:346:15ad:a2a with SMTP id c13csp1756wrs; Mon, 8 Apr 2024 10:55:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXH2vBFshQftCYuSSmTJFqX89aYMRnNT+DB+y2PWTdZLHzzlcr16HpnHIXm/9k0h7fWhe0JnlnwQRUb6crQlWzH X-Google-Smtp-Source: AGHT+IGsLf1IH2HgFza7TclWnN1oMCn6BcOlBbQpc5XI68eAgXZdY7o8ORgSy3k81U1vDiagv0lx X-Received: by 2002:ad4:5f09:0:b0:69b:1a48:ed72 with SMTP id fo9-20020ad45f09000000b0069b1a48ed72mr5374758qvb.52.1712598933761; Mon, 08 Apr 2024 10:55:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712598933; cv=none; d=google.com; s=arc-20160816; b=UR7KCT1/lxcjA+avJgdPPrs+fqheSR6cRAEeuTxcrmwjpdN5TqO9dp12xAdKmaot6q ho1VB8KCEjX7rcd+cjP1g4v5e8uMgI436ua6vYMy237rJd4GBNYW754yOwvpohd62x18 0rov7tBuQUMsdc3biCUkScGOveNjDryBHj9nhrKy5MNqPZCofwJmbAW4uegrrg07PeEm mnui2ojNBpiUKLunP6LnRRlOidIcuqiewcpgmiH71SR4cahnrJTaG2z5NkeAw92u9UJA KcDypKL7TmNC0Qj6xWJ14xQM01vsNmnfdib+3UbuPY63n9yG+EFox6eUyEzfm/wgruNe 4GmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Aco89HGhDUqxtzZSl7gQEXCIzX7CLhr3rgmAxnnD0GI=; fh=IOfZmL/4G2LGBtSV+LzySu7eotL7HJ1AQcRx3etIBXU=; b=sxqjChjuAJrNdPztMmGzUWtZIIjKT2O6nM1O5NC59LNqFeVZQs4SQju+hAV2KOp5wc l1r4iOaFMTgfmFRwJ06xcjwep0tqX1CuKpPcwsd+Lf9VnNeN0lWosT8cedbrDb/scIVd A2Z2Uo6y9Bo4pBbRRxtktevgzBZOzg3cEWbHDTObQDMIolh6TWYjaY3smhL+zsJ4NUJf cG0pLrP25qQqSXHl2s2x/JCFFsFId1m3/+Bjo+wcI9qcxoflTA+YK6UoSgE2Fcc3b08b 0jvSnqPJU5sUHD2TXTax/qRuJBII+Sne4iMfYQvFyoFgAg3KXXIjbDSS7hPjQbpu12TT f5MA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBYYcPUE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 14-20020a0562140dce00b0069b1a67026bsi3184922qvt.177.2024.04.08.10.55.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2024 10:55:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBYYcPUE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtt8P-00029W-Pg; Mon, 08 Apr 2024 13:50:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtt8P-000291-0M for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:50:21 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtt8M-0003kw-4k for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:50:20 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2a502547460so936123a91.2 for ; Mon, 08 Apr 2024 10:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712598616; x=1713203416; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aco89HGhDUqxtzZSl7gQEXCIzX7CLhr3rgmAxnnD0GI=; b=BBYYcPUErrRL1Zi8/Yo9kkYmpWGncs3x92LOCH1BT/VR92X/xutiYx1UpHYQuCjgTV ZjjbiqarYlooZetraU696fp5nr3B/xvlRAPB2i7KLX97QNzyZFuRo04ZQ2M1hLULnLYg ke3Sx2VpnZ0tKnkcSB/QPBSSaDfrP2N7HViBcFHcYm0bJOwygJF5Xw3bNCx2n6V/3Xq5 B2BUM53Bsz2oTphpgPrzDsLaTPZbrzF5ew81BvHiCHQ0lrRaGAoprY1Lf1JJSjfWvnKv EtKxEi8/yFZXMxzVwuMg/mFE5t7o1prHdJWXtg30IoMlxm0O3Mj7ZoBLBO4B2GoNKxiY 5yEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712598616; x=1713203416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aco89HGhDUqxtzZSl7gQEXCIzX7CLhr3rgmAxnnD0GI=; b=h8qT7ocKFFUloyVEoWZv5HCQmMTc6SVRnux1/1cQEjs312H812PRB1tVH7MCFaby3c LvbJsmuuDDMTHg4dyzpsUTGEPPCJrxXxa8q/8Y3pumfVd1lafrH93KRWnOj5No8hC/lZ e9Nl+oUStpzYTe1zsooEnAbLT9lrAjV8FwXhcUUElJp/EoAm9vLnOBUBn2rdCTbPOn3S u89mGgzqa0zqXqKawYYJ4kVtOOnpK5otPGgISrC6/k7T+Rj/EWF7r+wV3n31UD1oN0Sh 0VRR/1aegvGljBiiUXme1yLRQKEjSeI+L8BuQo7jOZabTnfVGT00HUW1+Afen4xikhmO yU2Q== X-Gm-Message-State: AOJu0Yw6NvDRIm/IljtTcyuWadoUXGyJHLLKXeDh+5nHRhr8hIuwZyVn TyLZDnBsOgYaXP273NVIoOOv/dTWI1vyc9mfoFmOBYnDgAeWl42ez3q4r3wpyHb0WUdaXHuU72A v X-Received: by 2002:a17:90a:4614:b0:2a4:ca45:ded1 with SMTP id w20-20020a17090a461400b002a4ca45ded1mr4249364pjg.28.1712598616566; Mon, 08 Apr 2024 10:50:16 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id ga15-20020a17090b038f00b0029c3bac0aa8sm8658432pjb.4.2024.04.08.10.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 10:50:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Alexander Monakov , Mikhail Romanov Subject: [PULL 30/35] util/bufferiszero: Reorganize for early test for acceleration Date: Mon, 8 Apr 2024 07:49:24 -1000 Message-Id: <20240408174929.862917-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240408174929.862917-1-richard.henderson@linaro.org> References: <20240408174929.862917-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alexander Monakov Test for length >= 256 inline, where is is often a constant. Before calling into the accelerated routine, sample three bytes from the buffer, which handles most non-zero buffers. Signed-off-by: Alexander Monakov Signed-off-by: Mikhail Romanov Message-Id: <20240206204809.9859-3-amonakov@ispras.ru> [rth: Use __builtin_constant_p; move the indirect call out of line.] Signed-off-by: Richard Henderson --- include/qemu/cutils.h | 32 ++++++++++++++++- util/bufferiszero.c | 84 +++++++++++++++++-------------------------- 2 files changed, 63 insertions(+), 53 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 92c927a6a3..741dade7cf 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -187,9 +187,39 @@ char *freq_to_str(uint64_t freq_hz); /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") -bool buffer_is_zero(const void *buf, size_t len); +/* + * Check if a buffer is all zeroes. + */ + +bool buffer_is_zero_ool(const void *vbuf, size_t len); +bool buffer_is_zero_ge256(const void *vbuf, size_t len); bool test_buffer_is_zero_next_accel(void); +static inline bool buffer_is_zero_sample3(const char *buf, size_t len) +{ + /* + * For any reasonably sized buffer, these three samples come from + * three different cachelines. In qemu-img usage, we find that + * each byte eliminates more than half of all buffer testing. + * It is therefore critical to performance that the byte tests + * short-circuit, so that we do not pull in additional cache lines. + * Do not "optimize" this to !(a | b | c). + */ + return !buf[0] && !buf[len - 1] && !buf[len / 2]; +} + +#ifdef __OPTIMIZE__ +static inline bool buffer_is_zero(const void *buf, size_t len) +{ + return (__builtin_constant_p(len) && len >= 256 + ? buffer_is_zero_sample3(buf, len) && + buffer_is_zero_ge256(buf, len) + : buffer_is_zero_ool(buf, len)); +} +#else +#define buffer_is_zero buffer_is_zero_ool +#endif + /* * Implementation of ULEB128 (http://en.wikipedia.org/wiki/LEB128) * Input is limited to 14-bit numbers diff --git a/util/bufferiszero.c b/util/bufferiszero.c index 641d5f9b9e..972f394cbd 100644 --- a/util/bufferiszero.c +++ b/util/bufferiszero.c @@ -26,8 +26,9 @@ #include "qemu/bswap.h" #include "host/cpuinfo.h" -static bool -buffer_zero_int(const void *buf, size_t len) +static bool (*buffer_is_zero_accel)(const void *, size_t); + +static bool buffer_is_zero_integer(const void *buf, size_t len) { if (unlikely(len < 8)) { /* For a very small buffer, simply accumulate all the bytes. */ @@ -128,60 +129,38 @@ buffer_zero_avx2(const void *buf, size_t len) } #endif /* CONFIG_AVX2_OPT */ -/* - * Make sure that these variables are appropriately initialized when - * SSE2 is enabled on the compiler command-line, but the compiler is - * too old to support CONFIG_AVX2_OPT. - */ -#if defined(CONFIG_AVX2_OPT) -# define INIT_USED 0 -# define INIT_LENGTH 0 -# define INIT_ACCEL buffer_zero_int -#else -# ifndef __SSE2__ -# error "ISA selection confusion" -# endif -# define INIT_USED CPUINFO_SSE2 -# define INIT_LENGTH 64 -# define INIT_ACCEL buffer_zero_sse2 -#endif - -static unsigned used_accel = INIT_USED; -static unsigned length_to_accel = INIT_LENGTH; -static bool (*buffer_accel)(const void *, size_t) = INIT_ACCEL; - static unsigned __attribute__((noinline)) select_accel_cpuinfo(unsigned info) { /* Array is sorted in order of algorithm preference. */ static const struct { unsigned bit; - unsigned len; bool (*fn)(const void *, size_t); } all[] = { #ifdef CONFIG_AVX2_OPT - { CPUINFO_AVX2, 128, buffer_zero_avx2 }, + { CPUINFO_AVX2, buffer_zero_avx2 }, #endif - { CPUINFO_SSE2, 64, buffer_zero_sse2 }, - { CPUINFO_ALWAYS, 0, buffer_zero_int }, + { CPUINFO_SSE2, buffer_zero_sse2 }, + { CPUINFO_ALWAYS, buffer_is_zero_integer }, }; for (unsigned i = 0; i < ARRAY_SIZE(all); ++i) { if (info & all[i].bit) { - length_to_accel = all[i].len; - buffer_accel = all[i].fn; + buffer_is_zero_accel = all[i].fn; return all[i].bit; } } return 0; } -#if defined(CONFIG_AVX2_OPT) +static unsigned used_accel; + static void __attribute__((constructor)) init_accel(void) { used_accel = select_accel_cpuinfo(cpuinfo_init()); } -#endif /* CONFIG_AVX2_OPT */ + +#define INIT_ACCEL NULL bool test_buffer_is_zero_next_accel(void) { @@ -194,36 +173,37 @@ bool test_buffer_is_zero_next_accel(void) used_accel |= used; return used; } - -static bool select_accel_fn(const void *buf, size_t len) -{ - if (likely(len >= length_to_accel)) { - return buffer_accel(buf, len); - } - return buffer_zero_int(buf, len); -} - #else -#define select_accel_fn buffer_zero_int bool test_buffer_is_zero_next_accel(void) { return false; } + +#define INIT_ACCEL buffer_is_zero_integer #endif -/* - * Checks if a buffer is all zeroes - */ -bool buffer_is_zero(const void *buf, size_t len) +static bool (*buffer_is_zero_accel)(const void *, size_t) = INIT_ACCEL; + +bool buffer_is_zero_ool(const void *buf, size_t len) { if (unlikely(len == 0)) { return true; } + if (!buffer_is_zero_sample3(buf, len)) { + return false; + } + /* All bytes are covered for any len <= 3. */ + if (unlikely(len <= 3)) { + return true; + } - /* Fetch the beginning of the buffer while we select the accelerator. */ - __builtin_prefetch(buf); - - /* Use an optimized zero check if possible. Note that this also - includes a check for an unrolled loop over 64-bit integers. */ - return select_accel_fn(buf, len); + if (likely(len >= 256)) { + return buffer_is_zero_accel(buf, len); + } + return buffer_is_zero_integer(buf, len); +} + +bool buffer_is_zero_ge256(const void *buf, size_t len) +{ + return buffer_is_zero_accel(buf, len); }