From patchwork Mon Feb 17 02:59:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 183572 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4454796ile; Sun, 16 Feb 2020 19:03:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxZNV9BmAFvzAXD9CmNdr7rD/LDBtA5f75UhJcCEkKCN8sdPMuV5j+aO7BAw821NY2hadBv X-Received: by 2002:a37:8683:: with SMTP id i125mr12725689qkd.491.1581908611489; Sun, 16 Feb 2020 19:03:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581908611; cv=none; d=google.com; s=arc-20160816; b=UfOvhspmdfrwMD+/0oYfFoBdqrClUHX1wRULl+PkUKKWVutF7tDoXGJXOEglHSQA5S e9mwpXz9DwJ4bWOESYr+1Pl+hjjPHlFfbxGuBTnPnr6vRcbCDVjDjTMBy7CcNf5UDdCs uTSUH3Z6XX1hQG0sQBaRCu5ljP4TSSnjOqa6wGaAPvYgIXDOfg9gCv2xARgWO1IZ76JP CbWsTP/UHNvmdX+ct4+SarIhWltVc94fRHAMAqs1acXi/XfhYaYKoE8Sgsv7vEiDx108 rDkzMLZqCnaeBHGdGN7xv2bU+16T60TW6QUB36xF64CzWF754sjFB+1UAj2Y1EzsNiQy feww== 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:to:from :dkim-signature; bh=GfGZz+uTpdMIZZzSAMPcmTLg6XJzkWWciXxWC3zVUN4=; b=zAqJLkuwvSJ7AzSOsDURVgRzY5dkynJpMQH9E7yxXsCyJO08hmUR9b86AMFB/hsYdf AxNDOaoUoHdKhHzWjWYLWErTyT29QOYJc39+lPyg5J2aIE+6CDujM1kXA81mq7iArbQG M6/Fx0jZARRX76G3HomucTr0yeE3CBYB32OXmPbF1IMiEMTJTLvbOgAwQqUQsKKjQU1q Y4FscTGgtgKsvoyPveW9SDEnYkIBIkK7QU4WxxXJz9fm/8KB3tsXFsHLRVPofTAsVKPW KwU39NZI68iM+NbQnsjR3kcKXqXAfQoNqemq1dM482V1uuVwUPbJnnMiRhYGUDD0ecXO eoHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wgtd5Mly; 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 cs6si5476204qvb.125.2020.02.16.19.03.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Feb 2020 19:03:31 -0800 (PST) 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=wgtd5Mly; 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]:39588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3Wh0-0007bq-Uw for patch@linaro.org; Sun, 16 Feb 2020 22:03:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44803) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3Wdf-00036R-S9 for qemu-devel@nongnu.org; Sun, 16 Feb 2020 22:00:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3Wde-0003Nl-4I for qemu-devel@nongnu.org; Sun, 16 Feb 2020 22:00:03 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:38750) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3Wdd-0003MV-TG for qemu-devel@nongnu.org; Sun, 16 Feb 2020 22:00:02 -0500 Received: by mail-pg1-x534.google.com with SMTP id d6so8272510pgn.5 for ; Sun, 16 Feb 2020 19:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GfGZz+uTpdMIZZzSAMPcmTLg6XJzkWWciXxWC3zVUN4=; b=wgtd5Mlyysj7TC3FI4UE1BhAdvRxva1PIYnThRppnJxMiUgjwLcX/8FYppUrWhRJu8 ERJmHJZDn0Cu37Pb8VTNVfPrFVWnEy1Ol+6lPGvDko02o9Fjg2bl2ZBF3ncb1FtbTOmr Uhc0PIpijgEdCFfUuPtot7RaLXIXg2o+6y5CXFApHkNSEixrXQiUOcqfLNz1QCqpc8gh VonAi+F6462Z5E1W7cqk7tgT9uFATE8KlZ7jhjh8iB5+F1IGH+NUMP/gwNYRt38tsgON fgMx1kOpT2JvwLHffpwfqiRaBw/lxBnXk5o+P9RsnkxwTk3kmOGgB6q86wIjfSdIrkbL W99w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GfGZz+uTpdMIZZzSAMPcmTLg6XJzkWWciXxWC3zVUN4=; b=Nns7Vpaw1e8TGDXV6825Wk44Nn1I8YdeGxzeP2UKt7fx4v0gNF70qkEkO5+7CmOBj+ sr9qAIrSE8TP+u7wVXJ0/RtA/Tp+fKWo4avlmVIbnC7XzN34DmVYUo5qp5XS1KELSfOF GJ+zUWMpV7XXvZUuqmw+1v6QTPKDU+WUTs6qYCh6N+FQcyyw12kZMdTCUyEYlCYZiNE9 5MMiacBxsP1KZEP2fp/EGnRsQdf8/dUel21uPcy82Jxyf/9sj2A9GzWDXZkTDQegv8B/ MyPwbvbG5E7njlAarypuZf/qV+c2fDW3BXBy1iU+psRfxb8eypsh+2E2j/SkU/xxuBKE NN+g== X-Gm-Message-State: APjAAAWa989eUXBoTrgDfAuK6TQcWFW9NsRaBOqlBz6bs6r3wJ02WcVe +sPONi4rTxllVCgnk9bzoF9GpCg+Zis= X-Received: by 2002:a63:cc4a:: with SMTP id q10mr15387615pgi.241.1581908400224; Sun, 16 Feb 2020 19:00:00 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id u2sm14741060pgj.7.2020.02.16.18.59.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 18:59:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/4] tcg: Remove CONFIG_VECTOR16 Date: Sun, 16 Feb 2020 18:59:54 -0800 Message-Id: <20200217025957.12031-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217025957.12031-1-richard.henderson@linaro.org> References: <20200217025957.12031-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::534 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" The comment in tcg-runtime-gvec.c about CONFIG_VECTOR16 says that tcg-op-gvec.c has eliminated size 8 vectors, and only passes on multiples of 16. This may have been true of the first few operations, but is not true of all operations. In particular, multiply, shift by scalar, and compare of 8- and 16-bit elements are not expanded inline if host vector operations are not supported. For an x86_64 host that does not support AVX, this means that we will fall back to the helper, which will attempt to use SSE instructions, which will SEGV on an invalid 8-byte aligned memory operation. This patch simply removes the CONFIG_VECTOR16 code and configuration without further simplification. Buglink: https://bugs.launchpad.net/bugs/1863508 Signed-off-by: Richard Henderson --- configure | 56 ------------------------------------ accel/tcg/tcg-runtime-gvec.c | 35 +--------------------- 2 files changed, 1 insertion(+), 90 deletions(-) -- 2.20.1 diff --git a/configure b/configure index 16f94cd96b..bccb979aaf 100755 --- a/configure +++ b/configure @@ -5618,58 +5618,6 @@ if test "$plugins" = "yes" && "for this purpose. You can't build with --static." fi -######################################## -# See if 16-byte vector operations are supported. -# Even without a vector unit the compiler may expand these. -# There is a bug in old GCC for PPC that crashes here. -# Unfortunately it's the system compiler for Centos 7. - -cat > $TMPC << EOF -typedef unsigned char U1 __attribute__((vector_size(16))); -typedef unsigned short U2 __attribute__((vector_size(16))); -typedef unsigned int U4 __attribute__((vector_size(16))); -typedef unsigned long long U8 __attribute__((vector_size(16))); -typedef signed char S1 __attribute__((vector_size(16))); -typedef signed short S2 __attribute__((vector_size(16))); -typedef signed int S4 __attribute__((vector_size(16))); -typedef signed long long S8 __attribute__((vector_size(16))); -static U1 a1, b1; -static U2 a2, b2; -static U4 a4, b4; -static U8 a8, b8; -static S1 c1; -static S2 c2; -static S4 c4; -static S8 c8; -static int i; -void helper(void *d, void *a, int shift, int i); -void helper(void *d, void *a, int shift, int i) -{ - *(U1 *)(d + i) = *(U1 *)(a + i) << shift; - *(U2 *)(d + i) = *(U2 *)(a + i) << shift; - *(U4 *)(d + i) = *(U4 *)(a + i) << shift; - *(U8 *)(d + i) = *(U8 *)(a + i) << shift; -} -int main(void) -{ - a1 += b1; a2 += b2; a4 += b4; a8 += b8; - a1 -= b1; a2 -= b2; a4 -= b4; a8 -= b8; - a1 *= b1; a2 *= b2; a4 *= b4; a8 *= b8; - a1 &= b1; a2 &= b2; a4 &= b4; a8 &= b8; - a1 |= b1; a2 |= b2; a4 |= b4; a8 |= b8; - a1 ^= b1; a2 ^= b2; a4 ^= b4; a8 ^= b8; - a1 <<= i; a2 <<= i; a4 <<= i; a8 <<= i; - a1 >>= i; a2 >>= i; a4 >>= i; a8 >>= i; - c1 >>= i; c2 >>= i; c4 >>= i; c8 >>= i; - return 0; -} -EOF - -vector16=no -if compile_prog "" "" ; then - vector16=yes -fi - ######################################## # See if __attribute__((alias)) is supported. # This false for Xcode 9, but has been remedied for Xcode 10. @@ -7266,10 +7214,6 @@ if test "$atomic64" = "yes" ; then echo "CONFIG_ATOMIC64=y" >> $config_host_mak fi -if test "$vector16" = "yes" ; then - echo "CONFIG_VECTOR16=y" >> $config_host_mak -fi - if test "$attralias" = "yes" ; then echo "CONFIG_ATTRIBUTE_ALIAS=y" >> $config_host_mak fi diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c index 5b1902d591..00da0938a5 100644 --- a/accel/tcg/tcg-runtime-gvec.c +++ b/accel/tcg/tcg-runtime-gvec.c @@ -24,32 +24,6 @@ #include "tcg/tcg-gvec-desc.h" -/* Virtually all hosts support 16-byte vectors. Those that don't can emulate - * them via GCC's generic vector extension. This turns out to be simpler and - * more reliable than getting the compiler to autovectorize. - * - * In tcg-op-gvec.c, we asserted that both the size and alignment of the data - * are multiples of 16. - * - * When the compiler does not support all of the operations we require, the - * loops are written so that we can always fall back on the base types. - */ -#ifdef CONFIG_VECTOR16 -typedef uint8_t vec8 __attribute__((vector_size(16))); -typedef uint16_t vec16 __attribute__((vector_size(16))); -typedef uint32_t vec32 __attribute__((vector_size(16))); -typedef uint64_t vec64 __attribute__((vector_size(16))); - -typedef int8_t svec8 __attribute__((vector_size(16))); -typedef int16_t svec16 __attribute__((vector_size(16))); -typedef int32_t svec32 __attribute__((vector_size(16))); -typedef int64_t svec64 __attribute__((vector_size(16))); - -#define DUP16(X) { X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X } -#define DUP8(X) { X, X, X, X, X, X, X, X } -#define DUP4(X) { X, X, X, X } -#define DUP2(X) { X, X } -#else typedef uint8_t vec8; typedef uint16_t vec16; typedef uint32_t vec32; @@ -64,7 +38,6 @@ typedef int64_t svec64; #define DUP8(X) X #define DUP4(X) X #define DUP2(X) X -#endif /* CONFIG_VECTOR16 */ static inline void clear_high(void *d, intptr_t oprsz, uint32_t desc) { @@ -917,13 +890,7 @@ void HELPER(gvec_sar64v)(void *d, void *a, void *b, uint32_t desc) clear_high(d, oprsz, desc); } -/* If vectors are enabled, the compiler fills in -1 for true. - Otherwise, we must take care of this by hand. */ -#ifdef CONFIG_VECTOR16 -# define DO_CMP0(X) X -#else -# define DO_CMP0(X) -(X) -#endif +#define DO_CMP0(X) -(X) #define DO_CMP1(NAME, TYPE, OP) \ void HELPER(NAME)(void *d, void *a, void *b, uint32_t desc) \