From patchwork Tue May 23 23:57:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 685247 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1989134wrt; Tue, 23 May 2023 17:03:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ65qy+4VAuA0Ma0ckQ9IUJ0VZMpAzb0XhsUQS4nxNztvE3jxFvm1K7LHdlcgLQNbnhUv/o+ X-Received: by 2002:a05:620a:843:b0:75b:23a1:8311 with SMTP id u3-20020a05620a084300b0075b23a18311mr6054727qku.12.1684886594137; Tue, 23 May 2023 17:03:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684886594; cv=none; d=google.com; s=arc-20160816; b=YMq/ehn/Cfgjs0qoVX6Ftxy9muU3wBa5Efe7/25R8VJ/EkBiczSM6mf3w8G8Xm6j/s tizlD3EWmSCwLWP8DDhitlsnBaA9vupGv6ypTZYLnWcErp0BntQE7r81QkHGn0B3H9Oc c5Tbh5qn0Tc6dFHn4ezjRVatAZTy0rAaAgQ2ICoG9N5HYHKmPRqagkRvc16vOjS05T3/ m3Mk/3EX/AUkOhwQI/0SMmUxfkOB0HDX1Kgafemot/i8f4qHuXWxTbfcUW3x7f0l9q+1 L5RWxQJJxA35keJp4lMPJI3a6p+Ju6++ldFclNgCTfEkJIY5LjcFhA4HWtD4Hi+AGQe3 uBxQ== 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=gwqzAqYyG1v/CLSJnBrdO2SKYW9ZIlSrgikgMj70uNU=; b=H9A+onK6sw63iGPdwBONDK796JcOUvt1IjEhCin8QuE4rNekyb8UFUS6gi8X/c4Eda 7aLnTfB6yr/odQFYYSjl6/drRJ2aJMOX9cKtlIHM/77Z/dnstRBa91PqYp/hgoJTZBVh 9NhuLqcOUF3+rD3NF3y+tiTWguZjzGlkaC2i3QD59BGxBBpAEvuXz24GeQo6gt+lW8w/ zCc8Aas/T2faPA5HyHaplMfJiiNcSVH5tXD0ncg29MqLGzQM9Us4gZW59d4HU5LXGcSA +I1nrBp1eKkeUWksKLfSAH5rQV6T1Eud1v77LSvYEBM5L/CotPoDL6JDMEWE3Oh3H02K k/Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FWeNWG4c; 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 t7-20020a05620a034700b0075950b9d44bsi5345034qkm.240.2023.05.23.17.03.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 17:03:14 -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=FWeNWG4c; 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 1q1btQ-0004AH-Bf; Tue, 23 May 2023 19:58:16 -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 1q1btN-00049K-7z for qemu-devel@nongnu.org; Tue, 23 May 2023 19:58:13 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1btL-0001lW-CP for qemu-devel@nongnu.org; Tue, 23 May 2023 19:58:13 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d41d8bc63so123795b3a.0 for ; Tue, 23 May 2023 16:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684886290; x=1687478290; 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=gwqzAqYyG1v/CLSJnBrdO2SKYW9ZIlSrgikgMj70uNU=; b=FWeNWG4cNcUys1RRJSCkPiuhiBSdj4U2gARVGzWbhsH5qO2/l9bt44HtE8iyr4wD2G Vaa1QgXdFADfci0eNNKhlAoz8RiHNl96DfA2Ay9skYCWfeL2B2GLARVi5+kPdC6QIhtp HlSffnMTeTziT1tRjNmfxNeyGKSvVh6YPQ+4sDNpXpS02e6HLkzD0lWp2NeiySe9Xzau jUbPaxDxGiAd36FerUK8xtWRbSmpLFnxar8fB1zM7mGHH2mIRN0V4SW+A7WqPPsr1Knv 77K7LT92z9vSXhHjFrCzMqwwwx8D0xYkRfoy4QwB7sK17CFzeJXFMmn1/L8bAAnMW2Oj Ir1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684886290; x=1687478290; 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=gwqzAqYyG1v/CLSJnBrdO2SKYW9ZIlSrgikgMj70uNU=; b=YgZ3uYoSBPBHMYbkqZKcosVQCKoJiCG2JnDVTu+knADj4KOkqboiftrOY1vVfZapoo hTWt8wdId/bsYniz+Nu5aO6+MwdTT+MR9tJQjIro3GJQCQEr3G1rcC/WFDwIDAev3eC6 Ko29M1HfXZfmn2lncyfooFOJslIU1vWhw4jqdlA8UPq8alUG+ve1CUtTCJmw0oNfradY cELtGa47nyBmlrBcGFVo7+FKrS/ZYKJissfK/0/JrZs6jnaLyVl5fe/Axfl3jnG/mirR ijljiFfGs4v5xX8GoXBCYhn8/AHzCVEFA3iyeiMVoWqfNDnxBmky6kDXhdFurDH0ktVj Gmrg== X-Gm-Message-State: AC+VfDyCUUkFcrUHZkLif0jE5U6I4QDYB6DLP65kSgQ0EpBnJVdHEmsv vd+NK0bPIcynx5yVJhKQomE9v3S9zHMbSQHgDc8= X-Received: by 2002:a05:6a00:2386:b0:641:3ca2:1aec with SMTP id f6-20020a056a00238600b006413ca21aecmr983960pfc.27.1684886290528; Tue, 23 May 2023 16:58:10 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:c13a:d73:4f88:3654]) by smtp.gmail.com with ESMTPSA id p18-20020aa78612000000b0063b7c42a070sm6285041pfn.68.2023.05.23.16.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 16:58:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 05/28] util/bufferiszero: Use i386 host/cpuinfo.h Date: Tue, 23 May 2023 16:57:41 -0700 Message-Id: <20230523235804.747803-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523235804.747803-1-richard.henderson@linaro.org> References: <20230523235804.747803-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Use cpuinfo_init() during init_accel(), and the variable cpuinfo during test_buffer_is_zero_next_accel(). Adjust the logic that cycles through the set of accelerators for testing. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- util/bufferiszero.c | 127 ++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 81 deletions(-) diff --git a/util/bufferiszero.c b/util/bufferiszero.c index 1886bc5ba4..3e6a5dfd63 100644 --- a/util/bufferiszero.c +++ b/util/bufferiszero.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/bswap.h" +#include "host/cpuinfo.h" static bool buffer_zero_int(const void *buf, size_t len) @@ -184,111 +185,75 @@ buffer_zero_avx512(const void *buf, size_t len) } #endif /* CONFIG_AVX512F_OPT */ - -/* Note that for test_buffer_is_zero_next_accel, the most preferred - * ISA must have the least significant bit. - */ -#define CACHE_AVX512F 1 -#define CACHE_AVX2 2 -#define CACHE_SSE4 4 -#define CACHE_SSE2 8 - -/* Make sure that these variables are appropriately initialized when +/* + * 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_AVX512F_OPT) || defined(CONFIG_AVX2_OPT) -# define INIT_CACHE 0 -# define INIT_ACCEL buffer_zero_int +# define INIT_USED 0 +# define INIT_LENGTH 0 +# define INIT_ACCEL buffer_zero_int #else # ifndef __SSE2__ # error "ISA selection confusion" # endif -# define INIT_CACHE CACHE_SSE2 -# define INIT_ACCEL buffer_zero_sse2 +# define INIT_USED CPUINFO_SSE2 +# define INIT_LENGTH 64 +# define INIT_ACCEL buffer_zero_sse2 #endif -static unsigned cpuid_cache = INIT_CACHE; +static unsigned used_accel = INIT_USED; +static unsigned length_to_accel = INIT_LENGTH; static bool (*buffer_accel)(const void *, size_t) = INIT_ACCEL; -static int length_to_accel = 64; -static void init_accel(unsigned cache) +static unsigned __attribute__((noinline)) +select_accel_cpuinfo(unsigned info) { - bool (*fn)(const void *, size_t) = buffer_zero_int; - if (cache & CACHE_SSE2) { - fn = buffer_zero_sse2; - length_to_accel = 64; - } -#ifdef CONFIG_AVX2_OPT - if (cache & CACHE_SSE4) { - fn = buffer_zero_sse4; - length_to_accel = 64; - } - if (cache & CACHE_AVX2) { - fn = buffer_zero_avx2; - length_to_accel = 128; - } -#endif + /* Array is sorted in order of algorithm preference. */ + static const struct { + unsigned bit; + unsigned len; + bool (*fn)(const void *, size_t); + } all[] = { #ifdef CONFIG_AVX512F_OPT - if (cache & CACHE_AVX512F) { - fn = buffer_zero_avx512; - length_to_accel = 256; - } + { CPUINFO_AVX512F, 256, buffer_zero_avx512 }, #endif - buffer_accel = fn; +#ifdef CONFIG_AVX2_OPT + { CPUINFO_AVX2, 128, buffer_zero_avx2 }, + { CPUINFO_SSE4, 64, buffer_zero_sse4 }, +#endif + { CPUINFO_SSE2, 64, buffer_zero_sse2 }, + { CPUINFO_ALWAYS, 0, buffer_zero_int }, + }; + + 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; + return all[i].bit; + } + } + return 0; } #if defined(CONFIG_AVX512F_OPT) || defined(CONFIG_AVX2_OPT) -#include "qemu/cpuid.h" - -static void __attribute__((constructor)) init_cpuid_cache(void) +static void __attribute__((constructor)) init_accel(void) { - unsigned max = __get_cpuid_max(0, NULL); - int a, b, c, d; - unsigned cache = 0; - - if (max >= 1) { - __cpuid(1, a, b, c, d); - if (d & bit_SSE2) { - cache |= CACHE_SSE2; - } - if (c & bit_SSE4_1) { - cache |= CACHE_SSE4; - } - - /* We must check that AVX is not just available, but usable. */ - if ((c & bit_OSXSAVE) && (c & bit_AVX) && max >= 7) { - unsigned bv = xgetbv_low(0); - __cpuid_count(7, 0, a, b, c, d); - if ((bv & 0x6) == 0x6 && (b & bit_AVX2)) { - cache |= CACHE_AVX2; - } - /* 0xe6: - * XCR0[7:5] = 111b (OPMASK state, upper 256-bit of ZMM0-ZMM15 - * and ZMM16-ZMM31 state are enabled by OS) - * XCR0[2:1] = 11b (XMM state and YMM state are enabled by OS) - */ - if ((bv & 0xe6) == 0xe6 && (b & bit_AVX512F)) { - cache |= CACHE_AVX512F; - } - } - } - cpuid_cache = cache; - init_accel(cache); + used_accel = select_accel_cpuinfo(cpuinfo_init()); } #endif /* CONFIG_AVX2_OPT */ bool test_buffer_is_zero_next_accel(void) { - /* If no bits set, we just tested buffer_zero_int, and there - are no more acceleration options to test. */ - if (cpuid_cache == 0) { - return false; - } - /* Disable the accelerator we used before and select a new one. */ - cpuid_cache &= cpuid_cache - 1; - init_accel(cpuid_cache); - return true; + /* + * Accumulate the accelerators that we've already tested, and + * remove them from the set to test this round. We'll get back + * a zero from select_accel_cpuinfo when there are no more. + */ + unsigned used = select_accel_cpuinfo(cpuinfo & ~used_accel); + used_accel |= used; + return used; } static bool select_accel_fn(const void *buf, size_t len)