From 472f49ef43ab7caaff5b0caf9a84208180b0557c Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 6 Feb 2024 13:44:34 +0200 Subject: [PATCH] genxml: remove NDEBUG_UNUSED Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: --- src/intel/genxml/genX_cl_helpers.h | 8 +------- src/intel/genxml/genX_helpers.h | 8 +------- src/intel/genxml/gen_pack_header.py | 2 -- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/intel/genxml/genX_cl_helpers.h b/src/intel/genxml/genX_cl_helpers.h index c1321bb868b..a108d2f2fb8 100644 --- a/src/intel/genxml/genX_cl_helpers.h +++ b/src/intel/genxml/genX_cl_helpers.h @@ -149,14 +149,8 @@ util_bitpack_ufixed_nonzero(float v, uint32_t start, uint32_t end, #define __intel_field_functions #endif -#ifdef NDEBUG -#define NDEBUG_UNUSED __attribute__((unused)) -#else -#define NDEBUG_UNUSED -#endif - static inline __attribute__((always_inline)) uint64_t -__gen_offset(uint64_t v, NDEBUG_UNUSED uint32_t start, NDEBUG_UNUSED uint32_t end) +__gen_offset(uint64_t v, UNUSED uint32_t start, UNUSED uint32_t end) { return v; } diff --git a/src/intel/genxml/genX_helpers.h b/src/intel/genxml/genX_helpers.h index d94f622954e..cdc07a8294d 100644 --- a/src/intel/genxml/genX_helpers.h +++ b/src/intel/genxml/genX_helpers.h @@ -13,12 +13,6 @@ #define __intel_field_functions #endif -#ifdef NDEBUG -#define NDEBUG_UNUSED __attribute__((unused)) -#else -#define NDEBUG_UNUSED -#endif - #ifndef __gen_address_type #error #define __gen_address_type before including this file #endif @@ -28,7 +22,7 @@ #endif static inline __attribute__((always_inline)) uint64_t -__gen_offset(uint64_t v, NDEBUG_UNUSED uint32_t start, NDEBUG_UNUSED uint32_t end) +__gen_offset(uint64_t v, ASSERTED uint32_t start, ASSERTED uint32_t end) { __gen_validate_value(v); #ifndef NDEBUG diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py index 05fee3ca1b1..c50a81ff8cd 100644 --- a/src/intel/genxml/gen_pack_header.py +++ b/src/intel/genxml/gen_pack_header.py @@ -51,8 +51,6 @@ pack_header = """%(license)s #include "genX_cl_helpers.h" #endif -#undef NDEBUG_UNUSED - """ def num_from_str(num_str):