From patchwork Thu Mar 2 19:49:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 9601435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6E79160429 for ; Thu, 2 Mar 2017 19:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59607285E1 for ; Thu, 2 Mar 2017 19:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AE5E285E3; Thu, 2 Mar 2017 19:49:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EAD2285E1 for ; Thu, 2 Mar 2017 19:49:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2A776EC29; Thu, 2 Mar 2017 19:49:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0A316EC29 for ; Thu, 2 Mar 2017 19:49:35 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2017 11:49:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,233,1484035200"; d="scan'208";a="939947600" Received: from relo-linux-11.sc.intel.com ([10.3.160.214]) by orsmga003.jf.intel.com with ESMTP; 02 Mar 2017 11:49:34 -0800 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Thu, 2 Mar 2017 11:49:34 -0800 Message-Id: <20170302194934.35336-1-michel.thierry@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170302074558.iolhmnpnuup4t6wn@phenom.ffwll.local> References: <20170302074558.iolhmnpnuup4t6wn@phenom.ffwll.local> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH i-g-t v3] lib: Define a common bit operations library X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Bring the test/set/clear bit functions we have into a single place. v2: Add gtk-doc comment blocks (Daniel) v3: Restore inline keyword. Cc: Daniel Vetter Reviewed-by: Joonas Lahtinen (v1) Signed-off-by: Michel Thierry --- .../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 + lib/Makefile.sources | 2 + lib/igt.h | 1 + lib/igt_bitops.c | 111 +++++++++++++++++++++ lib/igt_bitops.h | 46 +++++++++ lib/igt_primes.c | 25 +---- 6 files changed, 162 insertions(+), 24 deletions(-) create mode 100644 lib/igt_bitops.c create mode 100644 lib/igt_bitops.h diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml index 990bbb80..0fc51508 100644 --- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml +++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml @@ -25,6 +25,7 @@ + diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 6348487f..801312c6 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -11,6 +11,8 @@ lib_source_list = \ igt_debugfs.h \ igt_aux.c \ igt_aux.h \ + igt_bitops.c \ + igt_bitops.h \ igt_edid_template.h \ igt_gt.c \ igt_gt.h \ diff --git a/lib/igt.h b/lib/igt.h index 4f54698d..7a8942aa 100644 --- a/lib/igt.h +++ b/lib/igt.h @@ -28,6 +28,7 @@ #include "i915_3d.h" #include "i915_pciids.h" #include "igt_aux.h" +#include "igt_bitops.h" #include "igt_core.h" #include "igt_debugfs.h" #include "igt_draw.h" diff --git a/lib/igt_bitops.c b/lib/igt_bitops.c new file mode 100644 index 00000000..feacaf00 --- /dev/null +++ b/lib/igt_bitops.c @@ -0,0 +1,111 @@ +/* + * Copyright 2017 Intel Corporation + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include + +/** + * SECTION:igt_bitops + * @short_description: Useful bit operations, based on kernel functions. + * @title: bitops + * @include: igt.h + * + * This library provides functions to set/clear/test bits in a given memory + * location. + */ + +/** + * set_bit: + * @nr: The bit to set + * @addr: The address to start counting from + * + * Set a bit in memory. + * + */ +inline void set_bit(unsigned long nr, unsigned long *addr) +{ + addr[nr / BITS_PER_LONG] |= __bit__(nr); +} + +/** + * clear_bit: + * @nr: The bit to clear + * @addr: The address to start counting from + * + * Clear a bit in memory. + * + */ +inline void clear_bit(unsigned long nr, unsigned long *addr) +{ + addr[nr / BITS_PER_LONG] &= ~__bit__(nr); +} + +/** + * test_bit: + * @nr: The bit to test + * @addr: The address to start counting from + * + * Determine whether a bit is set. + * + * Returns: + * True if bit was set, false otherwise. + */ +inline bool test_bit(unsigned long nr, const unsigned long *addr) +{ + return addr[nr / BITS_PER_LONG] & __bit__(nr); +} + +/** + * test_and_set_bit: + * @nr: The bit to set + * @addr: The address to start counting from + * + * Set a bit and return its old value. + * + * Returns: + * The bit previous value. + */ +inline bool test_and_set_bit(unsigned long nr, unsigned long *addr) +{ + bool ret = test_bit(nr, addr); + set_bit(nr, addr); + return ret; +} + +/** + * test_and_clear_bit: + * @nr: The bit to clear + * @addr: The address to start counting from + * + * Clear a bit and return its old value. + * + * Returns: + * The bit previous value. + */ +inline bool test_and_clear_bit(unsigned long nr, unsigned long *addr) +{ + bool ret = test_bit(nr, addr); + clear_bit(nr, addr); + return ret; +} diff --git a/lib/igt_bitops.h b/lib/igt_bitops.h new file mode 100644 index 00000000..236f20f0 --- /dev/null +++ b/lib/igt_bitops.h @@ -0,0 +1,46 @@ +/* + * Copyright 2017 Intel Corporation + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +#ifndef _I915_BITOPS_H +#define _I915_BITOPS_H + +#include + +#define BIT(nr) (1UL << (nr)) +#define BIT_ULL(nr) (1ULL << (nr)) +#define BITS_PER_CHAR 8 +#define BITS_PER_LONG (sizeof(long)*BITS_PER_CHAR) + +static inline unsigned long __bit__(unsigned long nr) +{ + return 1UL << (nr % BITS_PER_LONG); +} + +void set_bit(unsigned long nr, unsigned long *addr); +void clear_bit(unsigned long nr, unsigned long *addr); +bool test_bit(unsigned long nr, const unsigned long *addr); +bool test_and_set_bit(unsigned long nr, unsigned long *addr); +bool test_and_clear_bit(unsigned long nr, unsigned long *addr); + +#endif /* _I915_BITOPS_H */ diff --git a/lib/igt_primes.c b/lib/igt_primes.c index d5232e54..30caafdb 100644 --- a/lib/igt_primes.c +++ b/lib/igt_primes.c @@ -21,16 +21,13 @@ * IN THE SOFTWARE. */ +#include "igt_bitops.h" #include "igt_primes.h" #include -#include #include #include -#define BITS_PER_CHAR 8 -#define BITS_PER_LONG (sizeof(long)*BITS_PER_CHAR) - #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1))) #define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1))) @@ -52,26 +49,6 @@ _max1 > _max2 ? _max1 : _max2; \ }) -static inline unsigned long __bit__(unsigned long nr) -{ - return 1UL << (nr % BITS_PER_LONG); -} - -static inline void set_bit(unsigned long nr, unsigned long *addr) -{ - addr[nr / BITS_PER_LONG] |= __bit__(nr); -} - -static inline void clear_bit(unsigned long nr, unsigned long *addr) -{ - addr[nr / BITS_PER_LONG] &= ~__bit__(nr); -} - -static inline bool test_bit(unsigned long nr, const unsigned long *addr) -{ - return addr[nr / BITS_PER_LONG] & __bit__(nr); -} - static unsigned long __find_next_bit(const unsigned long *addr, unsigned long nbits, unsigned long start,