From 198dd1cab09fc7cca0f9da0d8124fbb9bb233830 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 6 Jul 2017 08:53:01 +1000 Subject: [PATCH] Make the __builtin_expect argument a bool. No significant benchmark numbers changed. All existing uses are already bools, but future uses might not be. --- cmd/puffs-gen-c/base-impl.h | 7 ++++--- cmd/puffs-gen-c/data.go | 2 +- gen/c/std/gif.c | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/puffs-gen-c/base-impl.h b/cmd/puffs-gen-c/base-impl.h index d426dc4c..831fe9ae 100644 --- a/cmd/puffs-gen-c/base-impl.h +++ b/cmd/puffs-gen-c/base-impl.h @@ -17,9 +17,10 @@ #define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1)) -#if defined(__clang__) || defined(__GNUC__) -#define PUFFS_LIKELY(expr) (__builtin_expect((expr), 1)) -#define PUFFS_UNLIKELY(expr) (__builtin_expect((expr), 0)) +// Clang also defines "__GNUC__". +#if defined(__GNUC__) +#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1)) +#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0)) #else #define PUFFS_LIKELY(expr) (expr) #define PUFFS_UNLIKELY(expr) (expr) diff --git a/cmd/puffs-gen-c/data.go b/cmd/puffs-gen-c/data.go index 3f810bff..919b2192 100644 --- a/cmd/puffs-gen-c/data.go +++ b/cmd/puffs-gen-c/data.go @@ -12,5 +12,5 @@ const baseHeader = "" + "" const baseImpl = "" + - "#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n// Use switch cases for coroutine state, similar to the technique in\n// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_STATE(n) \\\n coro_state = n; \\\n case n:\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n#if defined(__clang__) || defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect((expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect((expr), 0))\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n// Use switch cases for coroutine state, similar to the technique in\n// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_STATE(n) \\\n coro_state = n; \\\n case n:\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n#endif // PUFFS_BASE_IMPL_H\n" + "" diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 87bc756a..bdb2b604 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -250,9 +250,10 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, #define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1)) -#if defined(__clang__) || defined(__GNUC__) -#define PUFFS_LIKELY(expr) (__builtin_expect((expr), 1)) -#define PUFFS_UNLIKELY(expr) (__builtin_expect((expr), 0)) +// Clang also defines "__GNUC__". +#if defined(__GNUC__) +#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1)) +#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0)) #else #define PUFFS_LIKELY(expr) (expr) #define PUFFS_UNLIKELY(expr) (expr)