From patchwork Fri Dec 14 03:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153734 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1607065ljp; Thu, 13 Dec 2018 19:40:49 -0800 (PST) X-Google-Smtp-Source: AFSGD/UvbWYAOmspKgMzwZlpRKEhB94WIz0n+Z9WG++kiUE7dQnT/0rf8TOUE+cX4tPtxKdxcBy+ X-Received: by 2002:aed:25f2:: with SMTP id y47mr1241500qtc.217.1544758849700; Thu, 13 Dec 2018 19:40:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544758849; cv=none; d=google.com; s=arc-20160816; b=V/SPKvdxMUoJRWUGRFh0DYbXHUZhNy9oEwhf4jCalkVkK2bSQAQm3MJE4cVRoDQja5 RD/0k9jsNZYXs0d8BXPJ7cSmWZFmBExdLvE35BHS+VLpEipgtiRsqEBb8IEwUOzrFK7V DkRGIET95522YmT1SsnfgtsS8HU1jES0IGZAKihRlRAPo76SO989dfxRrs56VvvteBmZ iFO4b3B0WIUJX2klg0Q4xwyE1EsAEOLmLJyfonYuLL7v7L8TzQ/f4X9NDnOGKXuJC5Ry NTcRIg7n0sk0PIAjhdl3ZQh7yi2Nhct1QVkKQmTs4k0DiioBnZHj0e6RuBjoa69GqXgS R2CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=rSLn4sAllcbYQ44EjOT6wIuUmlyloNNdXcTUlyxEZyE=; b=HYIvJnqWYqLckWfHjV9FEtndUjoF1VYsvfYxwru97WdPsINAfIMnC7iXDF9KYEM1o2 QSHPASTon31JImc3PlY0WbOJ64dSWFAnG/cabNydeSy0L7pPKkdC/sarDvaNHX8i3Js3 lujtZ+j224uoheSuVUt3/bH/6WhIj3Pg9UoGHfaHKY8c6bK1DF1RlNtwyr7G/xyIMW0O GGczIj+b/00s536+JvjUgk0E3v9oTbQKXzV6v1b4n/U8hekKmN5+29ulL0OiXuxnmOUZ 4FqdqmWMk/SPXuwS639TBsiRx4Ey90MFXzkKvYkN8dhRJNT2EZ8yp8MeeTwFlVNtGgmZ a/RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fFro9Vq+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u62si1619652qkh.229.2018.12.13.19.40.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:40:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fFro9Vq+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXeLJ-0008Jq-7D for patch@linaro.org; Thu, 13 Dec 2018 22:40:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe1D-0006I8-L5 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe1C-0007ir-8X for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:03 -0500 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]:37957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe1B-0007eZ-U2 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:02 -0500 Received: by mail-ot1-x331.google.com with SMTP id e12so4121394otl.5 for ; Thu, 13 Dec 2018 19:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rSLn4sAllcbYQ44EjOT6wIuUmlyloNNdXcTUlyxEZyE=; b=fFro9Vq+AOoW9LMOCZfbmrl3QqoA8lgcu098+DIZm37CC6m6zCCyXrvhr6n4IIS69j p0V07bu12JXpCOEHCSUfImV72PSFFjM02HJLYe3v/MuQY8TUFHALL+Irjqy0aPQ4oXPc i6q+oQ5wuv2OVwuiB3PeEbFx5Kxr3kCdh4bOQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rSLn4sAllcbYQ44EjOT6wIuUmlyloNNdXcTUlyxEZyE=; b=ZHRZJ7NsPHFo04gc3Suu8kWVBpwlgJq0JvcIB+hsWPx8WGlqPck0F8oNS6bVzmu1HO RSBZgVdrrB8IRvBgzMdiWGmk7yCIXrWbQLa89oZHdKQyNGF+lQrWy7KeJOet49AYz9lN 8qMvXzRUu5fcXhK4U4E7omHW5eOHp1BuzKrO9oLRnDh8dcVnEoihtv2T9gDUVfVSUyKi wco+lkaJ5ZnLuxCHFo4FOUTn+NbMWo31dYpR0TMAFw8f2D/5O5IdQpn7xdKOZMvoJpkH sTPob5rJ+iWFEySy4LR2EvYlyTk1eWtSw62lBb8dPfGWgBGHstuyGLfajddqOVbD+Rkw neJA== X-Gm-Message-State: AA+aEWbzCo1lO97RlW7iNPVjdvDKdzPO/EXV67rfgHhsK+5xctp5MwLW B6D7dIUVnGBXyyVFk5OhmSkh4P4wIEHJKw== X-Received: by 2002:a9d:1c97:: with SMTP id l23mr1019753ota.276.1544757600085; Thu, 13 Dec 2018 19:20:00 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:19:21 -0600 Message-Id: <20181214031923.29527-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-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::331 Subject: [Qemu-devel] [PULL 30/32] exec: introduce qemu_xxhash{2,4,5,6,7} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Before moving them all to include/qemu/xxhash.h. Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/exec/tb-hash-xx.h | 41 +++++++++++++++++++++++++++++---------- include/exec/tb-hash.h | 2 +- tests/qht-bench.c | 2 +- util/qsp.c | 12 ++++++------ 4 files changed, 39 insertions(+), 18 deletions(-) -- 2.17.2 diff --git a/include/exec/tb-hash-xx.h b/include/exec/tb-hash-xx.h index 747a9a612c..98ce4b628a 100644 --- a/include/exec/tb-hash-xx.h +++ b/include/exec/tb-hash-xx.h @@ -42,23 +42,23 @@ #define PRIME32_4 668265263U #define PRIME32_5 374761393U -#define TB_HASH_XX_SEED 1 +#define QEMU_XXHASH_SEED 1 /* * xxhash32, customized for input variables that are not guaranteed to be * contiguous in memory. */ static inline uint32_t -tb_hash_func7(uint64_t a0, uint64_t b0, uint32_t e, uint32_t f, uint32_t g) +qemu_xxhash7(uint64_t ab, uint64_t cd, uint32_t e, uint32_t f, uint32_t g) { - uint32_t v1 = TB_HASH_XX_SEED + PRIME32_1 + PRIME32_2; - uint32_t v2 = TB_HASH_XX_SEED + PRIME32_2; - uint32_t v3 = TB_HASH_XX_SEED + 0; - uint32_t v4 = TB_HASH_XX_SEED - PRIME32_1; - uint32_t a = a0 >> 32; - uint32_t b = a0; - uint32_t c = b0 >> 32; - uint32_t d = b0; + uint32_t v1 = QEMU_XXHASH_SEED + PRIME32_1 + PRIME32_2; + uint32_t v2 = QEMU_XXHASH_SEED + PRIME32_2; + uint32_t v3 = QEMU_XXHASH_SEED + 0; + uint32_t v4 = QEMU_XXHASH_SEED - PRIME32_1; + uint32_t a = ab >> 32; + uint32_t b = ab; + uint32_t c = cd >> 32; + uint32_t d = cd; uint32_t h32; v1 += a * PRIME32_2; @@ -98,4 +98,25 @@ tb_hash_func7(uint64_t a0, uint64_t b0, uint32_t e, uint32_t f, uint32_t g) return h32; } +static inline uint32_t qemu_xxhash2(uint64_t ab) +{ + return qemu_xxhash7(ab, 0, 0, 0, 0); +} + +static inline uint32_t qemu_xxhash4(uint64_t ab, uint64_t cd) +{ + return qemu_xxhash7(ab, cd, 0, 0, 0); +} + +static inline uint32_t qemu_xxhash5(uint64_t ab, uint64_t cd, uint32_t e) +{ + return qemu_xxhash7(ab, cd, e, 0, 0); +} + +static inline uint32_t qemu_xxhash6(uint64_t ab, uint64_t cd, uint32_t e, + uint32_t f) +{ + return qemu_xxhash7(ab, cd, e, f, 0); +} + #endif /* EXEC_TB_HASH_XX_H */ diff --git a/include/exec/tb-hash.h b/include/exec/tb-hash.h index 0526c4f678..731ba4c272 100644 --- a/include/exec/tb-hash.h +++ b/include/exec/tb-hash.h @@ -61,7 +61,7 @@ static inline uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags, uint32_t cf_mask, uint32_t trace_vcpu_dstate) { - return tb_hash_func7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); + return qemu_xxhash7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); } #endif diff --git a/tests/qht-bench.c b/tests/qht-bench.c index 636750d39f..0278f4da04 100644 --- a/tests/qht-bench.c +++ b/tests/qht-bench.c @@ -105,7 +105,7 @@ static bool is_equal(const void *ap, const void *bp) static uint32_t h(unsigned long v) { - return tb_hash_func7(v, 0, 0, 0, 0); + return qemu_xxhash2(v); } static uint32_t hval(unsigned long v) diff --git a/util/qsp.c b/util/qsp.c index a848b09c6d..dc29c41fde 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -135,13 +135,13 @@ QemuCondWaitFunc qemu_cond_wait_func = qemu_cond_wait_impl; * without it we still get a pretty unique hash. */ static inline -uint32_t do_qsp_callsite_hash(const QSPCallSite *callsite, uint64_t a) +uint32_t do_qsp_callsite_hash(const QSPCallSite *callsite, uint64_t ab) { - uint64_t b = (uint64_t)(uintptr_t)callsite->obj; + uint64_t cd = (uint64_t)(uintptr_t)callsite->obj; uint32_t e = callsite->line; uint32_t f = callsite->type; - return tb_hash_func7(a, b, e, f, 0); + return qemu_xxhash6(ab, cd, e, f); } static inline @@ -169,11 +169,11 @@ static uint32_t qsp_entry_no_thread_hash(const QSPEntry *entry) static uint32_t qsp_entry_no_thread_obj_hash(const QSPEntry *entry) { const QSPCallSite *callsite = entry->callsite; - uint64_t a = g_str_hash(callsite->file); - uint64_t b = callsite->line; + uint64_t ab = g_str_hash(callsite->file); + uint64_t cd = callsite->line; uint32_t e = callsite->type; - return tb_hash_func7(a, b, e, 0, 0); + return qemu_xxhash5(ab, cd, e); } static bool qsp_callsite_cmp(const void *ap, const void *bp)