From patchwork Tue Jan 10 21:01:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 640904 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2917078pvb; Tue, 10 Jan 2023 13:03:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXv8A709NobaBIti4OSUdfdny5+wYfe8FTBHMPHLiuCR2aby0B82VGuBa5awJXkGGAYV/7a0 X-Received: by 2002:a05:6402:3608:b0:495:b002:4ba2 with SMTP id el8-20020a056402360800b00495b0024ba2mr17585752edb.3.1673384616815; Tue, 10 Jan 2023 13:03:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673384616; cv=none; d=google.com; s=arc-20160816; b=epok3EtxbmYwq3eIlTTTfd9L7QWjWSlAm3PwSdMERZOdWtrP6HIYSJCF/1hb60UxCk sHWiwVyfYA/129nQ6Eg/3xdexAtHAHOeK8qbhtzBWXUsOdXbihEKN3y85tGC0KZBVuxM l949MEciOnFV9FleZpt4pXp0NIOLC4F/5vpAWaCKPnPH2sNFpT24XRtKUsmGMB7XCTmx p1u5ixDEtXf/EgJYkNuNd+HRmCP2AhxSflPTyT+0YHh0XvPDk7Vi7hcYmm4k6JRo/c2g N0tsYVslIgdYwFKkB4koCWjRDnGznACZaktyb4xy0Nw0aeETg1OLPt+x4kh52P7ctbgC W+8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from: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:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=KNElYNRjRhFADtzb7bB0aTQaoOehcuU9896RlIzV08w=; b=zyFRa0lCeLGeXHEYdfPpwphOrMVyEQ84ly3UQq6N43M0hYj2P8mhmLelszDQcJx977 ThCSn5sVSwNpcXZwG5MOCqY+c9C/1WOcq2kzdpnRT6+plqu563+cu4LSqKmojuMWwA4w WSVpuxGXrT+3I1VNTBS/VKyPwIN8Hgz7ta/OBAqBoGwI6mWsyT1n/rI2sP+2XiunhWb6 SbFsDHaLdg3KLKOe9/RZ70plG8C4hRb5Fn3KgnGO4NJA3dlmlabLf9AyjEmPQT69GSCT PbSXkNFYls9xYGvQNzhAfHDZb2kebC528o8h8ST3C3qPf9avjKfmqYqk/5vY/qlMrAQL Qknw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=UdUcXJiM; spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Return-Path: Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id cq6-20020a056402220600b004520b01a355si2642255edb.52.2023.01.10.13.03.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 13:03:36 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=UdUcXJiM; spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 67F163896C03 for ; Tue, 10 Jan 2023 21:03:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67F163896C03 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673384615; bh=KNElYNRjRhFADtzb7bB0aTQaoOehcuU9896RlIzV08w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UdUcXJiMEPgzHX1mUE1eFMMzGn1z/0cxOGmg7ISAfwuh09F7o53Vhd0ZUwjH0lXeI fOE1WghDKGXwCnkA3uCBytnLtjCUNTU0RecaNf7n+yswcUkgoYRjtwQwHJheHc9zvq Y94qniPdOxxvqK+PG9As/p2Ku9/BgGluLzP4J2pI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by sourceware.org (Postfix) with ESMTPS id D1C5B3858022 for ; Tue, 10 Jan 2023 21:01:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D1C5B3858022 Received: by mail-oo1-xc31.google.com with SMTP id 187-20020a4a09c4000000b004d8f3cb09f5so3543039ooa.6 for ; Tue, 10 Jan 2023 13:01:46 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KNElYNRjRhFADtzb7bB0aTQaoOehcuU9896RlIzV08w=; b=5M+lJvkwYGVb5glCnASbUFBw6mMp4axaotf3Q1/ZYTa4rzWcr6ZuBdExWnLS5evvT/ PsLiFSdD7UgHl40WYZqztuwLriEoSFf/u2Aj18Gj4fvuToh1kKxONW5Y8f2di69ZDkWH VZIBK31jIYBfh1ZMc+9PSBeVgBVM+kedx9SqrktzTclL4G4sAdQsGaDEj3/PyF5XaHCH wrK7yovMhtrgxE2beLsD3FThoHmwj6nxI97WmHjVUPTWwspfF6PP9Ge9Wh2kC9gUB3RD 36n3MMEnEuKBDPfZq56QTnmftGGWS7BSwjktVMyra9eRFZnBXb/q+UyAuMu7fWbP1BjR rNqg== X-Gm-Message-State: AFqh2koCL3ivxkL6BFZ3znomMZ76OFSGzPtBWIxFH5woy+tUXwYROiPD ZEw9bYPjqfcAK30Tb7KIG3IzLjYOLggn3v2j630= X-Received: by 2002:a4a:d585:0:b0:4f2:cf1:36ee with SMTP id z5-20020a4ad585000000b004f20cf136eemr2116262oos.1.1673384505428; Tue, 10 Jan 2023 13:01:45 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:a93a:e8a0:dd55:3328:997]) by smtp.gmail.com with ESMTPSA id r5-20020a4a83c5000000b0049ee88e86f9sm6202193oog.10.2023.01.10.13.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 13:01:44 -0800 (PST) To: libc-alpha@sourceware.org, Noah Goldstein , Richard Henderson Subject: [PATCH v6 14/17] alpha: Add string-fzb.h and string-fzi.h Date: Tue, 10 Jan 2023 18:01:03 -0300 Message-Id: <20230110210106.1457686-15-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110210106.1457686-1-adhemerval.zanella@linaro.org> References: <20230110210106.1457686-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patch=linaro.org@sourceware.org Sender: "Libc-alpha" From: Richard Henderson While alpha has the more important string functions in assembly, there are still a few for find the generic routines are used. Use the CMPBGE insn, via the builtin, for testing of zeros. Use a simplified expansion of __builtin_ctz when the insn isn't available. Checked on alpha-linux-gnu. --- sysdeps/alpha/string-fzb.h | 52 +++++++++++++++++ sysdeps/alpha/string-fzi.h | 113 +++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 sysdeps/alpha/string-fzb.h create mode 100644 sysdeps/alpha/string-fzi.h diff --git a/sysdeps/alpha/string-fzb.h b/sysdeps/alpha/string-fzb.h new file mode 100644 index 0000000000..e3934ba413 --- /dev/null +++ b/sysdeps/alpha/string-fzb.h @@ -0,0 +1,52 @@ +/* Zero byte detection; boolean. Alpha version. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _STRING_FZB_H +#define _STRING_FZB_H 1 + +#include +#include + +/* Note that since CMPBGE creates a bit mask rather than a byte mask, + we cannot simply provide a target-specific string-fza.h. */ + +/* Determine if any byte within X is zero. This is a pure boolean test. */ + +static __always_inline _Bool +has_zero (op_t x) +{ + return __builtin_alpha_cmpbge (0, x) != 0; +} + +/* Likewise, but for byte equality between X1 and X2. */ + +static __always_inline _Bool +has_eq (op_t x1, op_t x2) +{ + return has_zero (x1 ^ x2); +} + +/* Likewise, but for zeros in X1 and equal bytes between X1 and X2. */ + +static __always_inline _Bool +has_zero_eq (op_t x1, op_t x2) +{ + return has_zero (x1) | has_eq (x1, x2); +} + +#endif /* _STRING_FZB_H */ diff --git a/sysdeps/alpha/string-fzi.h b/sysdeps/alpha/string-fzi.h new file mode 100644 index 0000000000..bc2f0bdc91 --- /dev/null +++ b/sysdeps/alpha/string-fzi.h @@ -0,0 +1,113 @@ +/* string-fzi.h -- zero byte detection; indices. Alpha version. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _STRING_FZI_H +#define _STRING_FZI_H + +#include +#include + +/* Note that since CMPBGE creates a bit mask rather than a byte mask, + we cannot simply provide a target-specific string-fza.h. */ + +/* A subroutine for the index_zero functions. Given a bitmask C, + return the index of the first bit set in memory order. */ + +static __always_inline unsigned int +index_first (unsigned long int c) +{ +#ifdef __alpha_cix__ + return __builtin_ctzl (c); +#else + c = c & -c; + return (c & 0xf0 ? 4 : 0) + (c & 0xcc ? 2 : 0) + (c & 0xaa ? 1 : 0); +#endif +} + +/* Similarly, but return the (memory order) index of the last bit + that is non-zero. Note that only the least 8 bits may be nonzero. */ + +static __always_inline unsigned int +index_last (unsigned long int x) +{ +#ifdef __alpha_cix__ + return __builtin_clzl (x) ^ 63; +#else + unsigned r = 0; + if (x & 0xf0) + r += 4; + if (x & (0xc << r)) + r += 2; + if (x & (0x2 << r)) + r += 1; + return r; +#endif +} + +/* Given a word X that is known to contain a zero byte, return the + index of the first such within the word in memory order. */ + +static __always_inline unsigned int +index_first_zero (op_t x) +{ + return index_first (__builtin_alpha_cmpbge (0, x)); +} + +/* Similarly, but perform the test for byte equality between X1 and X2. */ + +static __always_inline unsigned int +index_first_eq (op_t x1, op_t x2) +{ + return index_first_zero (x1 ^ x2); +} + +/* Similarly, but perform the search for zero within X1 or + equality between X1 and X2. */ + +static __always_inline unsigned int +index_first_zero_eq (op_t x1, op_t x2) +{ + return index_first (__builtin_alpha_cmpbge (0, x1) + | __builtin_alpha_cmpbge (0, x1 ^ x2)); +} + +/* Similarly, but perform the search for zero within X1 or + inequality between X1 and X2. */ + +static __always_inline unsigned int +index_first_zero_ne (op_t x1, op_t x2) +{ + return index_first (__builtin_alpha_cmpbge (0, x1) + | (__builtin_alpha_cmpbge (0, x1 ^ x2) ^ 0xFF)); +} + +/* Similarly, but search for the last zero within X. */ + +static __always_inline unsigned int +index_last_zero (op_t x) +{ + return index_last (__builtin_alpha_cmpbge (0, x)); +} + +static __always_inline unsigned int +index_last_eq (op_t x1, op_t x2) +{ + return index_last_zero (x1 ^ x2); +} + +#endif /* _STRING_FZI_H */