From nobody Sat May 4 01:10:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1670118755; cv=none; d=zohomail.com; s=zohoarc; b=fL1SSMmy9i6enJ9E6OpkfZ7Ixe00Iq903S+SkXfDuDlLCOGEQnXxvkC+PmJHXuHVVXsl5j8AZ8eREl64qtZR9S1w/SkCtIxByo10kOsMR9DV33okv4358iLx0KVvolQeJfkFB3zI7X44s6OLgldeQaHEbA/XMggL9P9d/d+kKrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670118755; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9u/Uw0Ie39D5553Yw1gw6awZ7nIzmtrFVt1jBUP4Idk=; b=FoqRuhZSs7f2OP91J9iTHDRzUuyC4JN5DiejId/Ejczq0aLNEWbvvMhzVP0EpCtygG8EKnx72/HwDECogUPZzooIdKhi8ESvsyRGE/1JQuCmTpZS0KAam4Ph6js3rpd8s3W4d1wsTZyCbFUJXtey1znMOd+OHS5znT/5Tgki92g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670118755205990.1105469609549; Sat, 3 Dec 2022 17:52:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1eAJ-0001ZT-DB; Sat, 03 Dec 2022 20:51:35 -0500 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 1p1eAH-0001YP-HP for qemu-devel@nongnu.org; Sat, 03 Dec 2022 20:51:33 -0500 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1eAC-0006o0-B7 for qemu-devel@nongnu.org; Sat, 03 Dec 2022 20:51:33 -0500 Received: by mail-oi1-x22d.google.com with SMTP id c129so9349248oia.0 for ; Sat, 03 Dec 2022 17:51:27 -0800 (PST) Received: from stoup.. ([2806:102e:18:70b5:6b63:a06c:99b3:833]) by smtp.gmail.com with ESMTPSA id e16-20020aca2310000000b003436fa2c23bsm4964215oie.7.2022.12.03.17.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 17:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=9u/Uw0Ie39D5553Yw1gw6awZ7nIzmtrFVt1jBUP4Idk=; b=GwyGbZT8GMyvoj87AhyMO7u2kmw47u0gdfg6Hr4MwMAzlHjtZul7h/8oMeWiasRGyC 5D02yx8Ma/mJoXTT8jYoHf89GqADv82ss987/VcGzTsYHWUDa6efoLKUU70pYu72PkHw 3Ms4ctJjdxTW7O0ax0ZBfaRLEhGe5BUYjrcXPX2sAHm4cYGW/nqSrkna5T1rTfs12XqA YNfXaH9xn1LNHHcyolZryZgD2H9AmwNCt9tkSuwVqBzLNxItnrnJhyV2DEkQeW6SFpIE i0vWapJrlgRpW7rBTIrYjeHAGNqPbUauvHTEx16OoVful0fD2ECdOyCIlswh332fbsVn pEfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9u/Uw0Ie39D5553Yw1gw6awZ7nIzmtrFVt1jBUP4Idk=; b=nNkuvSgdgr0SwOtRkRtqgCVHd6vQDsq/9XA0UutXhRQ9cxijzakp5k5+hngy/YH4Ci bPGUoIE4cVFT63xBqt7ha8UfyYu1WTT3kz0dMnQ3O5GYgEc94++aIXP1e3nAkMzqsc8E wTSIKo0fgy1eagTKUQsWQjUJ/l+2okPxmzxJsrk18taEQSWkX3mtrCmooozeSgOWc0Wk ncSgf1vtv1L+FCVsIYJ3Q2Av6SveHkG8EWR5JlJFMMj6h1ZwQ+DHpF5G8wnbTK+ENb+e BlgQ0TiaTSclZSRCuinx09y2CIXkM3EsNmSksHwPY/G3bN93LN0NHUQCtS0j5un2Hcp2 0kbw== X-Gm-Message-State: ANoB5pkDqf98sFPdmSe3DoLT3L7wX0IaGsbL3+NXTKdaTXHgt6JVgNq0 9nNXxU2f7mP+HZVMVVPnDuvHD2pqCcb9QaqWCTY= X-Google-Smtp-Source: AA0mqf708eU1JFcV2nif5DD/DTIIZEo5ihNaHFmMgwOGBuJW5gpKqBlNFtE4NL53pbiDeDuXnly63A== X-Received: by 2002:a05:6808:170d:b0:35a:757a:ef9d with SMTP id bc13-20020a056808170d00b0035a757aef9dmr36816882oib.121.1670118686952; Sat, 03 Dec 2022 17:51:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, tstellar@redhat.com, berrange@redhat.com Subject: [PATCH 1/2] util/bufferiszero: Use __attribute__((target)) for avx2/avx512 Date: Sat, 3 Dec 2022 19:51:22 -0600 Message-Id: <20221204015123.362726-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221204015123.362726-1-richard.henderson@linaro.org> References: <20221204015123.362726-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1670118756000100004 Content-Type: text/plain; charset="utf-8" Use the attribute, which is supported by clang, instead of the #pragma, which is not supported and, for some reason, also not detected by the meson probe, so we fail by -Werror. Signed-off-by: Richard Henderson --- meson.build | 8 ++------ util/bufferiszero.c | 41 ++++++----------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/meson.build b/meson.build index 5c6b5a1c75..11b873f911 100644 --- a/meson.build +++ b/meson.build @@ -2324,11 +2324,9 @@ config_host_data.set('CONFIG_CPUID_H', have_cpuid_h) config_host_data.set('CONFIG_AVX2_OPT', get_option('avx2') \ .require(have_cpuid_h, error_message: 'cpuid.h not available, cannot ena= ble AVX2') \ .require(cc.links(''' - #pragma GCC push_options - #pragma GCC target("avx2") #include #include - static int bar(void *a) { + static int __attribute__((target("avx2"))) bar(void *a) { __m256i x =3D *(__m256i *)a; return _mm256_testz_si256(x, x); } @@ -2338,11 +2336,9 @@ config_host_data.set('CONFIG_AVX2_OPT', get_option('= avx2') \ config_host_data.set('CONFIG_AVX512F_OPT', get_option('avx512f') \ .require(have_cpuid_h, error_message: 'cpuid.h not available, cannot ena= ble AVX512F') \ .require(cc.links(''' - #pragma GCC push_options - #pragma GCC target("avx512f") #include #include - static int bar(void *a) { + static int __attribute__((target("avx512f"))) bar(void *a) { __m512i x =3D *(__m512i *)a; return _mm512_test_epi64_mask(x, x); } diff --git a/util/bufferiszero.c b/util/bufferiszero.c index ec3cd4ca15..1790ded7d4 100644 --- a/util/bufferiszero.c +++ b/util/bufferiszero.c @@ -64,18 +64,11 @@ buffer_zero_int(const void *buf, size_t len) } =20 #if defined(CONFIG_AVX512F_OPT) || defined(CONFIG_AVX2_OPT) || defined(__S= SE2__) -/* Do not use push_options pragmas unnecessarily, because clang - * does not support them. - */ -#if defined(CONFIG_AVX512F_OPT) || defined(CONFIG_AVX2_OPT) -#pragma GCC push_options -#pragma GCC target("sse2") -#endif -#include +#include =20 /* Note that each of these vectorized functions require len >=3D 64. */ =20 -static bool +static bool __attribute__((target("sse2"))) buffer_zero_sse2(const void *buf, size_t len) { __m128i t =3D _mm_loadu_si128(buf); @@ -104,20 +97,9 @@ buffer_zero_sse2(const void *buf, size_t len) =20 return _mm_movemask_epi8(_mm_cmpeq_epi8(t, zero)) =3D=3D 0xFFFF; } -#if defined(CONFIG_AVX512F_OPT) || defined(CONFIG_AVX2_OPT) -#pragma GCC pop_options -#endif =20 #ifdef CONFIG_AVX2_OPT -/* Note that due to restrictions/bugs wrt __builtin functions in gcc <=3D = 4.8, - * the includes have to be within the corresponding push_options region, a= nd - * therefore the regions themselves have to be ordered with increasing ISA. - */ -#pragma GCC push_options -#pragma GCC target("sse4") -#include - -static bool +static bool __attribute__((target("sse4"))) buffer_zero_sse4(const void *buf, size_t len) { __m128i t =3D _mm_loadu_si128(buf); @@ -145,12 +127,7 @@ buffer_zero_sse4(const void *buf, size_t len) return _mm_testz_si128(t, t); } =20 -#pragma GCC pop_options -#pragma GCC push_options -#pragma GCC target("avx2") -#include - -static bool +static bool __attribute__((target("avx2"))) buffer_zero_avx2(const void *buf, size_t len) { /* Begin with an unaligned head of 32 bytes. */ @@ -176,15 +153,10 @@ buffer_zero_avx2(const void *buf, size_t len) =20 return _mm256_testz_si256(t, t); } -#pragma GCC pop_options #endif /* CONFIG_AVX2_OPT */ =20 #ifdef CONFIG_AVX512F_OPT -#pragma GCC push_options -#pragma GCC target("avx512f") -#include - -static bool +static bool __attribute__((target("avx512f"))) buffer_zero_avx512(const void *buf, size_t len) { /* Begin with an unaligned head of 64 bytes. */ @@ -210,8 +182,7 @@ buffer_zero_avx512(const void *buf, size_t len) return !_mm512_test_epi64_mask(t, t); =20 } -#pragma GCC pop_options -#endif +#endif /* CONFIG_AVX512F_OPT */ =20 =20 /* Note that for test_buffer_is_zero_next_accel, the most preferred --=20 2.34.1 From nobody Sat May 4 01:10:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1670118755; cv=none; d=zohomail.com; s=zohoarc; b=ArO05DQBa1SzUh/7NaptCgZlJCskpIjWbbrWjSgmKW+n6BNUy6rMZWdWNEoN6DQ7O91nAcEqP4VD4C0I3t7FAYfBZIs/mQ+pW1P3n/AB3neTowIvdzmF/B8lcHd7rsbVO6QslKdxa692kt9k9l2CSiFCas0SfXu6gFAIIQVosHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670118755; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/X/PweNAPHbRLy4stxb7I3pE8OoDuvoF0xSWsTWyH88=; b=CbTSoVBHiRto57RzDhZpwzoxqbQzhYSo2oKeobJEHcuTkHHKC7ROdy5T/pbc/9vi7SkS6r82xQsbIZIog65xS0+LGqKJO4k0RUwmAY1/D5zUIqdWioNrvg9wdVBOxnocNknCmFTesSqerhcLqcJGWs7ZTMUKF3t9LPcTWkNKomE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670118755784479.1654421083498; Sat, 3 Dec 2022 17:52:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1eAI-0001Yy-Ox; Sat, 03 Dec 2022 20:51:34 -0500 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 1p1eAH-0001YM-DK for qemu-devel@nongnu.org; Sat, 03 Dec 2022 20:51:33 -0500 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1eAD-0006oD-GY for qemu-devel@nongnu.org; Sat, 03 Dec 2022 20:51:33 -0500 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1443a16b71cso6174450fac.13 for ; Sat, 03 Dec 2022 17:51:29 -0800 (PST) Received: from stoup.. ([2806:102e:18:70b5:6b63:a06c:99b3:833]) by smtp.gmail.com with ESMTPSA id e16-20020aca2310000000b003436fa2c23bsm4964215oie.7.2022.12.03.17.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 17:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=/X/PweNAPHbRLy4stxb7I3pE8OoDuvoF0xSWsTWyH88=; b=cYvy35sdg1y5lUucQKmCtKj8F9E6GvNHp+KbKTNdZYaQ4g/D1yGlXY+4FK9PnaNrwl uR+sfTFBV+sQ7DgKvRC2vR5R7Tf1Ldyu6pMOCXQB5/1cMLFI4hdugYVSk0Tegc1Lgn9w IayxEpvIzMUxrSH18zs5PW5bLL1aW6EemQ+VxtlbjH2dvcwIPtC3d9U+MAWXo0J47PKL ej7eLxbfmOQ7M//6BxB7kFH4GwErQlJ/r6mK0wPoUpVkPlqArXO7R39rK+6NZ7TSlIlt +/VlPhOrPRNDKssrATlC4DPzPOTkCoHBFCnU+OoH9gSMVe3Xk7GyhztbPdhXYWWFpHHZ +yNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/X/PweNAPHbRLy4stxb7I3pE8OoDuvoF0xSWsTWyH88=; b=RD5udCJPmQRzTNpitm0YF6srBvCelTLOR9LvkRMfyJW5i7qPR6axAHLJPOKayvu9b4 DrOR7b3nQ0KImdaUSUNfAKYQJIc+BD6y6Bmgw9tqOycWgctxs1290JaP2unOTnYZf/y9 nJ4jw/q8No2F2gxL0e/cT5j0pE6aa0/T14IYKWhvZyL0EKXRfErzkxd2rEsLOSfRNGY8 lZRm4qfrOoxlHtZBxlGwhirJUigGRO52unxMWaQsEW6IWGqcnVU1cE1JsZyHAmsaKD6x /+DTBlvZI+1Nvp5jp9jkE/ydKLH75OAXKucztnkrEChsCwBquDwT8qEtopZqzv3cEVpZ aHsA== X-Gm-Message-State: ANoB5pl3/KY8UgXBPDgmwe+3B+QdKSajnIBVdg2wvCpkpDEF/NWCaq+r 1T4vINW6BNXBDQ+0U/WKopVgW3NcASbYiERmIZI= X-Google-Smtp-Source: AA0mqf7NjE3hPJ1MWnb2vLbn+uRl7f6HCFHomk7kD7IFeRzEy9YZEyG8Z1vsgLjiJhfEeaswERCjCw== X-Received: by 2002:a05:6870:a553:b0:141:7736:a839 with SMTP id p19-20020a056870a55300b001417736a839mr32303482oal.71.1670118688227; Sat, 03 Dec 2022 17:51:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, tstellar@redhat.com, berrange@redhat.com Subject: [PATCH 2/2] meson: Set avx512f option to auto Date: Sat, 3 Dec 2022 19:51:23 -0600 Message-Id: <20221204015123.362726-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221204015123.362726-1-richard.henderson@linaro.org> References: <20221204015123.362726-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1670118757833100010 Content-Type: text/plain; charset="utf-8" I'm not sure why this option wasn't set the same as avx2. Signed-off-by: Richard Henderson --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 4b749ca549..f98ee101e2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -102,7 +102,7 @@ option('membarrier', type: 'feature', value: 'disabled', =20 option('avx2', type: 'feature', value: 'auto', description: 'AVX2 optimizations') -option('avx512f', type: 'feature', value: 'disabled', +option('avx512f', type: 'feature', value: 'auto', description: 'AVX512F optimizations') option('keyring', type: 'feature', value: 'auto', description: 'Linux keyring support') --=20 2.34.1