From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_DKIMWL_WL_HIGH shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A16A11F403 for ; Fri, 15 Jun 2018 18:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756522AbeFOS1s (ORCPT ); Fri, 15 Jun 2018 14:27:48 -0400 Received: from mail-by2nam01on0106.outbound.protection.outlook.com ([104.47.34.106]:45025 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756494AbeFOS1q (ORCPT ); Fri, 15 Jun 2018 14:27:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2hhmpKG9bLlCCOjAIbvK0wBJ/Hjbe/mjo4inoXzjrLk=; b=e5XES4Fx+5nl4TI58FtzfLCbgbY9HonKHrsZEnfX58dLE3nRkX51/18Ez8Lj1g1dTp4jgFoKqXfX7m36E3E+vxU0m0WOob127hJdaLu9FSYWCb3s8knP9WfLq0lEfHiTt5baCbI8U6BjYxsAvv8mxix8GtbJfuPq1P+vKYucqJs= Received: from BL0PR2101MB1011.namprd21.prod.outlook.com (52.132.24.10) by BL0PR2101MB1041.namprd21.prod.outlook.com (52.132.23.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.1; Fri, 15 Jun 2018 18:27:44 +0000 Received: from BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::d1f2:1d69:2567:e0a9]) by BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::d1f2:1d69:2567:e0a9%2]) with mapi id 15.20.0884.004; Fri, 15 Jun 2018 18:27:44 +0000 From: Derrick Stolee To: "git@vger.kernel.org" CC: "peff@peff.net" , "gitster@pobox.com" , "ramsay@ramsayjones.plus.com" , Derrick Stolee Subject: [PATCH v2 3/7] ewah_bitmap: delete unused 'ewah_and()' Thread-Topic: [PATCH v2 3/7] ewah_bitmap: delete unused 'ewah_and()' Thread-Index: AQHUBNaN9g8G6hFrIUi1DsLlYlP3hA== Date: Fri, 15 Jun 2018 18:27:44 +0000 Message-ID: <20180615182727.172075-4-dstolee@microsoft.com> References: <20180615143018.170686-1-dstolee@microsoft.com> <20180615182727.172075-1-dstolee@microsoft.com> In-Reply-To: <20180615182727.172075-1-dstolee@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR10CA0027.namprd10.prod.outlook.com (2603:10b6:404:109::13) To BL0PR2101MB1011.namprd21.prod.outlook.com (2603:10b6:207:37::10) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [2001:4898:8010:0:eb4a:5dff:fe0f:730f] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB1041;7:n4VNQGT73SXE3khng3RlJOAjEl6XPw+lVaju5LIcgDFI2VU3MMHoiQ5Dl/uF1mhWbVGD5oWPkOlWcmCIQErwHwFguNLTL3LWusC/vz+xhC40Bzku4xq3J+KDyZfZEr3SKvJBcT9ZY0uVujWs55NprJNOZpqQs9EOyvRkb6yF6zlsHnTooG0WrLnvbbQccLr/5NzzLD4gQVKPKkBMxfNmyZRAc86mEPY1AYgb5wUzgP0WDEQ8wxO72QaHZt5vUBid x-ms-office365-filtering-correlation-id: d15569ee-89d1-4aba-9f8d-08d5d2edafa3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7193020);SRVR:BL0PR2101MB1041; x-ms-traffictypediagnostic: BL0PR2101MB1041: authentication-results: spf=none (sender IP is ) smtp.mailfrom=dstolee@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(2018427008)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016);SRVR:BL0PR2101MB1041;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB1041; x-forefront-prvs: 0704670F76 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(189003)(199004)(8656006)(2351001)(6116002)(99286004)(6512007)(5250100002)(46003)(52116002)(1730700003)(76176011)(305945005)(7736002)(10090500001)(1076002)(68736007)(2900100001)(8676002)(5660300001)(86362001)(86612001)(2501003)(6916009)(54906003)(486006)(446003)(97736004)(386003)(2906002)(6486002)(6506007)(53936002)(11346002)(107886003)(3280700002)(81166006)(3660700001)(81156014)(316002)(10290500003)(8936002)(22452003)(106356001)(2616005)(25786009)(102836004)(476003)(105586002)(5640700003)(59450400001)(6436002)(14454004)(36756003)(186003)(4326008)(478600001)(22906009);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB1041;H:BL0PR2101MB1011.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: S0VkQr6KcgK+zoCJB8W0NNjNA46b1F6mTiM7eH7yKgnNPAG/McBPXQ0jxxHHRBAXaYPBldmA3aq15tBgqP4LNBf1rMtZx57OBSzHPnOpejXYxpDqMgslglUN1YXz/T5yGdLQWLIam+3IjNsVeHRCPCK91/x/BuM5gKrCxHVhCGDj+KO7LZgsXLV7lzRZ0o1m spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d15569ee-89d1-4aba-9f8d-08d5d2edafa3 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2018 18:27:44.4185 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1041 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Reported-by: Ramsay Jones Signed-off-by: Derrick Stolee --- ewah/ewah_bitmap.c | 68 ---------------------------------------------- ewah/ewok.h | 5 ---- 2 files changed, 73 deletions(-) diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index b9fdda1d3d..5a4d3a6eb6 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -459,74 +459,6 @@ void ewah_xor( out->bit_size =3D max_size(ewah_i->bit_size, ewah_j->bit_size); } =20 -void ewah_and( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out) -{ - struct rlw_iterator rlw_i; - struct rlw_iterator rlw_j; - size_t literals; - - rlwit_init(&rlw_i, ewah_i); - rlwit_init(&rlw_j, ewah_j); - - while (rlwit_word_size(&rlw_i) > 0 && rlwit_word_size(&rlw_j) > 0) { - while (rlw_i.rlw.running_len > 0 || rlw_j.rlw.running_len > 0) { - struct rlw_iterator *prey, *predator; - - if (rlw_i.rlw.running_len < rlw_j.rlw.running_len) { - prey =3D &rlw_i; - predator =3D &rlw_j; - } else { - prey =3D &rlw_j; - predator =3D &rlw_i; - } - - if (predator->rlw.running_bit =3D=3D 0) { - ewah_add_empty_words(out, 0, - predator->rlw.running_len); - rlwit_discard_first_words(prey, - predator->rlw.running_len); - rlwit_discard_first_words(predator, - predator->rlw.running_len); - } else { - size_t index =3D rlwit_discharge(prey, out, - predator->rlw.running_len, 0); - ewah_add_empty_words(out, 0, - predator->rlw.running_len - index); - rlwit_discard_first_words(predator, - predator->rlw.running_len); - } - } - - literals =3D min_size( - rlw_i.rlw.literal_words, - rlw_j.rlw.literal_words); - - if (literals) { - size_t k; - - for (k =3D 0; k < literals; ++k) { - ewah_add(out, - rlw_i.buffer[rlw_i.literal_word_start + k] & - rlw_j.buffer[rlw_j.literal_word_start + k] - ); - } - - rlwit_discard_first_words(&rlw_i, literals); - rlwit_discard_first_words(&rlw_j, literals); - } - } - - if (rlwit_word_size(&rlw_i) > 0) - rlwit_discharge_empty(&rlw_i, out); - else - rlwit_discharge_empty(&rlw_j, out); - - out->bit_size =3D max_size(ewah_i->bit_size, ewah_j->bit_size); -} - void ewah_and_not( struct ewah_bitmap *ewah_i, struct ewah_bitmap *ewah_j, diff --git a/ewah/ewok.h b/ewah/ewok.h index 71704ed37f..f4ada6979e 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -179,11 +179,6 @@ void ewah_xor( struct ewah_bitmap *ewah_j, struct ewah_bitmap *out); =20 -void ewah_and( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out); - /** * Direct word access */ --=20 2.18.0.rc1