Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
script that generates the required and disabled feature mask header.
Suggested-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
arch/x86/include/asm/cpufeature.h | 69 -------------------------------
arch/x86/tools/featuremasks.awk | 12 +++++-
2 files changed, 11 insertions(+), 70 deletions(-)
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 8332f596ba3c..8161dfb3255c 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -55,75 +55,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#define test_cpu_cap(c, bit) \
arch_test_bit(bit, (unsigned long *)((c)->x86_capability))
-/*
- * There are 32 bits/features in each mask word. The high bits
- * (selected with (bit>>5) give us the word number and the low 5
- * bits give us the bit/feature number inside the word.
- * (1UL<<((bit)&31) gives us a mask for the feature_bit so we can
- * see if it is set in the mask word.
- */
-#define CHECK_BIT_IN_MASK_WORD(maskname, word, bit) \
- (((bit)>>5)==(word) && (1UL<<((bit)&31) & maskname##word ))
-
-/*
- * {REQUIRED,DISABLED}_MASK_CHECK below may seem duplicated with the
- * following BUILD_BUG_ON_ZERO() check but when NCAPINTS gets changed, all
- * header macros which use NCAPINTS need to be changed. The duplicated macro
- * use causes the compiler to issue errors for all headers so that all usage
- * sites can be corrected.
- */
-#define REQUIRED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \
- REQUIRED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
-#define DISABLED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \
- DISABLED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
#define cpu_has(c, bit) \
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
test_cpu_cap(c, bit))
diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.awk
index 989b021e73d3..f6fe979a8fae 100755
--- a/arch/x86/tools/featuremasks.awk
+++ b/arch/x86/tools/featuremasks.awk
@@ -77,7 +77,17 @@ END {
printf "#define %s_MASK%d\t0x%08x\n", s, i, masks[i];
}
- printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
+ printf "\n#define %s_FEATURE(x)\t\t\t\t\\\n", s;
+ printf "\t((\t\t\t\t\t";
+ for (i = 0; i < ncapints; i++) {
+ if (masks[i])
+ printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
+ }
+ printf " 0\t\\\n";
+ printf "\t) & (1 << ((x) & 31)))\n";
+
+ printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
+ printf "\t(%s_FEATURE(x) || BUILD_BUG_ON_ZERO(NCAPINTS != %d))\n\n", s, ncapints;
}
printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
--
2.45.2On Sat, Jun 22, 2024 at 1:14 PM Xin Li (Intel) <xin@zytor.com> wrote:
>
> Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
> script that generates the required and disabled feature mask header.
>
> Suggested-by: Brian Gerst <brgerst@gmail.com>
> Signed-off-by: Xin Li (Intel) <xin@zytor.com>
> ---
> arch/x86/include/asm/cpufeature.h | 69 -------------------------------
> arch/x86/tools/featuremasks.awk | 12 +++++-
> 2 files changed, 11 insertions(+), 70 deletions(-)
>
> diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
> index 8332f596ba3c..8161dfb3255c 100644
> --- a/arch/x86/include/asm/cpufeature.h
> +++ b/arch/x86/include/asm/cpufeature.h
> @@ -55,75 +55,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
> #define test_cpu_cap(c, bit) \
> arch_test_bit(bit, (unsigned long *)((c)->x86_capability))
>
> -/*
> - * There are 32 bits/features in each mask word. The high bits
> - * (selected with (bit>>5) give us the word number and the low 5
> - * bits give us the bit/feature number inside the word.
> - * (1UL<<((bit)&31) gives us a mask for the feature_bit so we can
> - * see if it is set in the mask word.
> - */
> -#define CHECK_BIT_IN_MASK_WORD(maskname, word, bit) \
> - (((bit)>>5)==(word) && (1UL<<((bit)&31) & maskname##word ))
> -
> -/*
> - * {REQUIRED,DISABLED}_MASK_CHECK below may seem duplicated with the
> - * following BUILD_BUG_ON_ZERO() check but when NCAPINTS gets changed, all
> - * header macros which use NCAPINTS need to be changed. The duplicated macro
> - * use causes the compiler to issue errors for all headers so that all usage
> - * sites can be corrected.
> - */
> -#define REQUIRED_MASK_BIT_SET(feature_bit) \
> - ( CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 0, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 1, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 2, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 3, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 4, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 5, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 6, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 7, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 8, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 9, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 10, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 11, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 12, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 13, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 14, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \
> - REQUIRED_MASK_CHECK || \
> - BUILD_BUG_ON_ZERO(NCAPINTS != 22))
> -
> -#define DISABLED_MASK_BIT_SET(feature_bit) \
> - ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 1, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 2, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 3, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 4, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 5, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 6, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 7, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 8, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 9, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 10, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 11, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 12, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 13, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 14, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \
> - DISABLED_MASK_CHECK || \
> - BUILD_BUG_ON_ZERO(NCAPINTS != 22))
> -
> #define cpu_has(c, bit) \
> (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
> test_cpu_cap(c, bit))
> diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.awk
> index 989b021e73d3..f6fe979a8fae 100755
> --- a/arch/x86/tools/featuremasks.awk
> +++ b/arch/x86/tools/featuremasks.awk
> @@ -77,7 +77,17 @@ END {
> printf "#define %s_MASK%d\t0x%08x\n", s, i, masks[i];
> }
>
> - printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
> + printf "\n#define %s_FEATURE(x)\t\t\t\t\\\n", s;
> + printf "\t((\t\t\t\t\t";
> + for (i = 0; i < ncapints; i++) {
> + if (masks[i])
> + printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
> + }
> + printf " 0\t\\\n";
> + printf "\t) & (1 << ((x) & 31)))\n";
The original macro had 1UL here. I don't know if it is strictly
necessary in this case since we're using 32-bit masks, but it would
probably be safer.
> +
> + printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
> + printf "\t(%s_FEATURE(x) || BUILD_BUG_ON_ZERO(NCAPINTS != %d))\n\n", s, ncapints;
Checking NCAPINTS isn't necessary anymore. It was needed when these
macros had to be manually updated, but now if cpufeatures.h changes
this header will be regenerated.
> }
>
> printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
> --
> 2.45.2
>
Otherwise, it looks good.
Brian Gerst
On 6/23/2024 1:28 PM, Brian Gerst wrote:
> On Sat, Jun 22, 2024 at 1:14 PM Xin Li (Intel) <xin@zytor.com> wrote:
>>
>> Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
>> script that generates the required and disabled feature mask header.
>>
>> Suggested-by: Brian Gerst <brgerst@gmail.com>
>> Signed-off-by: Xin Li (Intel) <xin@zytor.com>
>> ---
> Checking NCAPINTS isn't necessary anymore. It was needed when these
> macros had to be manually updated, but now if cpufeatures.h changes
> this header will be regenerated.
>
>> }
>>
>> printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
>> --
>> 2.45.2
>>
>
> Otherwise, it looks good.
>
Do you mind to give a review-by?
Thanks!
Xin
On 6/23/2024 1:28 PM, Brian Gerst wrote:
> On Sat, Jun 22, 2024 at 1:14 PM Xin Li (Intel) <xin@zytor.com> wrote:
>>
>> Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
>> script that generates the required and disabled feature mask header.
>>
>> Suggested-by: Brian Gerst <brgerst@gmail.com>
>> Signed-off-by: Xin Li (Intel) <xin@zytor.com>
>> ---
>> arch/x86/include/asm/cpufeature.h | 69 -------------------------------
>> arch/x86/tools/featuremasks.awk | 12 +++++-
>> 2 files changed, 11 insertions(+), 70 deletions(-)
>>
>> - printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
>> + printf "\n#define %s_FEATURE(x)\t\t\t\t\\\n", s;
>> + printf "\t((\t\t\t\t\t";
>> + for (i = 0; i < ncapints; i++) {
>> + if (masks[i])
>> + printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
>> + }
>> + printf " 0\t\\\n";
>> + printf "\t) & (1 << ((x) & 31)))\n";
>
> The original macro had 1UL here. I don't know if it is strictly
> necessary in this case since we're using 32-bit masks, but it would
> probably be safer.
I did notice it, but don't think UL is needed.
>> +
>> + printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
>> + printf "\t(%s_FEATURE(x) || BUILD_BUG_ON_ZERO(NCAPINTS != %d))\n\n", s, ncapints;
>
> Checking NCAPINTS isn't necessary anymore. It was needed when these
> macros had to be manually updated, but now if cpufeatures.h changes
> this header will be regenerated.
Right, it's no longer needed. Let me update this patch.
Thanks!
Xin
On 24/06/2024 8:29 am, Xin Li wrote:
> On 6/23/2024 1:28 PM, Brian Gerst wrote:
>> On Sat, Jun 22, 2024 at 1:14 PM Xin Li (Intel) <xin@zytor.com> wrote:
>>> - printf "#define %s_MASK_CHECK
>>> BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
>>> + printf "\n#define %s_FEATURE(x)\t\t\t\t\\\n", s;
>>> + printf "\t((\t\t\t\t\t";
>>> + for (i = 0; i < ncapints; i++) {
>>> + if (masks[i])
>>> + printf "\t\\\n\t\t((x) >> 5) == %2d
>>> ? %s_MASK%d :", i, s, i;
>>> + }
>>> + printf " 0\t\\\n";
>>> + printf "\t) & (1 << ((x) & 31)))\n";
>>
>> The original macro had 1UL here. I don't know if it is strictly
>> necessary in this case since we're using 32-bit masks, but it would
>> probably be safer.
>
> I did notice it, but don't think UL is needed.
You do need 1U, or you'll trip UBSAN every time you test feature 31 in a
word.
I'll note that the hypervisor bit is one such example.
~Andrew
On 6/24/2024 3:24 AM, Andrew Cooper wrote:
> On 24/06/2024 8:29 am, Xin Li wrote:
>> On 6/23/2024 1:28 PM, Brian Gerst wrote:
>>> On Sat, Jun 22, 2024 at 1:14 PM Xin Li (Intel) <xin@zytor.com> wrote:
>>>> - printf "#define %s_MASK_CHECK
>>>> BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
>>>> + printf "\n#define %s_FEATURE(x)\t\t\t\t\\\n", s;
>>>> + printf "\t((\t\t\t\t\t";
>>>> + for (i = 0; i < ncapints; i++) {
>>>> + if (masks[i])
>>>> + printf "\t\\\n\t\t((x) >> 5) == %2d
>>>> ? %s_MASK%d :", i, s, i;
>>>> + }
>>>> + printf " 0\t\\\n";
>>>> + printf "\t) & (1 << ((x) & 31)))\n";
>>>
>>> The original macro had 1UL here. I don't know if it is strictly
>>> necessary in this case since we're using 32-bit masks, but it would
>>> probably be safer.
>>
>> I did notice it, but don't think UL is needed.
>
> You do need 1U, or you'll trip UBSAN every time you test feature 31 in a
> word.
This is so obvious, how come I totally missed it!
> I'll note that the hypervisor bit is one such example.
What's more, generally bit 31 is nothing special, I find:
#define X86_FEATURE_PBE ( 0*32+31) /* Pending Break Enable */
#define X86_FEATURE_3DNOW ( 1*32+31) /* 3DNow */
#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31) /* TSC has known frequency */
...
Definitely I must append "U".
Thanks!
Xin
Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
script that generates the required and disabled feature mask header.
Suggested-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
Change since v3A:
* Use '1U' instead of '1' in feature mask shifting (Andrew Cooper).
Change since v3:
* Checking NCAPINTS isn't necessary anymore. It was needed when these
macros had to be manually updated, but now if cpufeatures.h changes
this header will be regenerated (Brian Gerst).
---
arch/x86/include/asm/cpufeature.h | 69 -------------------------------
arch/x86/tools/featuremasks.awk | 9 +++-
2 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 8332f596ba3c..8161dfb3255c 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -55,75 +55,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#define test_cpu_cap(c, bit) \
arch_test_bit(bit, (unsigned long *)((c)->x86_capability))
-/*
- * There are 32 bits/features in each mask word. The high bits
- * (selected with (bit>>5) give us the word number and the low 5
- * bits give us the bit/feature number inside the word.
- * (1UL<<((bit)&31) gives us a mask for the feature_bit so we can
- * see if it is set in the mask word.
- */
-#define CHECK_BIT_IN_MASK_WORD(maskname, word, bit) \
- (((bit)>>5)==(word) && (1UL<<((bit)&31) & maskname##word ))
-
-/*
- * {REQUIRED,DISABLED}_MASK_CHECK below may seem duplicated with the
- * following BUILD_BUG_ON_ZERO() check but when NCAPINTS gets changed, all
- * header macros which use NCAPINTS need to be changed. The duplicated macro
- * use causes the compiler to issue errors for all headers so that all usage
- * sites can be corrected.
- */
-#define REQUIRED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \
- REQUIRED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
-#define DISABLED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \
- DISABLED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
#define cpu_has(c, bit) \
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
test_cpu_cap(c, bit))
diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.awk
index 989b021e73d3..e0383683e630 100755
--- a/arch/x86/tools/featuremasks.awk
+++ b/arch/x86/tools/featuremasks.awk
@@ -77,7 +77,14 @@ END {
printf "#define %s_MASK%d\t0x%08x\n", s, i, masks[i];
}
- printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
+ printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
+ printf "\t((\t\t\t\t\t";
+ for (i = 0; i < ncapints; i++) {
+ if (masks[i])
+ printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
+ }
+ printf " 0\t\\\n";
+ printf "\t) & (1U << ((x) & 31)))\n";
}
printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
--
2.45.2On Tue, Jun 25, 2024 at 1:23 AM Xin Li (Intel) <xin@zytor.com> wrote:
>
> Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
> script that generates the required and disabled feature mask header.
>
> Suggested-by: Brian Gerst <brgerst@gmail.com>
> Signed-off-by: Xin Li (Intel) <xin@zytor.com>
> ---
>
> Change since v3A:
> * Use '1U' instead of '1' in feature mask shifting (Andrew Cooper).
>
> Change since v3:
> * Checking NCAPINTS isn't necessary anymore. It was needed when these
> macros had to be manually updated, but now if cpufeatures.h changes
> this header will be regenerated (Brian Gerst).
> ---
> arch/x86/include/asm/cpufeature.h | 69 -------------------------------
> arch/x86/tools/featuremasks.awk | 9 +++-
> 2 files changed, 8 insertions(+), 70 deletions(-)
>
> diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
> index 8332f596ba3c..8161dfb3255c 100644
> --- a/arch/x86/include/asm/cpufeature.h
> +++ b/arch/x86/include/asm/cpufeature.h
> @@ -55,75 +55,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
> #define test_cpu_cap(c, bit) \
> arch_test_bit(bit, (unsigned long *)((c)->x86_capability))
>
> -/*
> - * There are 32 bits/features in each mask word. The high bits
> - * (selected with (bit>>5) give us the word number and the low 5
> - * bits give us the bit/feature number inside the word.
> - * (1UL<<((bit)&31) gives us a mask for the feature_bit so we can
> - * see if it is set in the mask word.
> - */
> -#define CHECK_BIT_IN_MASK_WORD(maskname, word, bit) \
> - (((bit)>>5)==(word) && (1UL<<((bit)&31) & maskname##word ))
> -
> -/*
> - * {REQUIRED,DISABLED}_MASK_CHECK below may seem duplicated with the
> - * following BUILD_BUG_ON_ZERO() check but when NCAPINTS gets changed, all
> - * header macros which use NCAPINTS need to be changed. The duplicated macro
> - * use causes the compiler to issue errors for all headers so that all usage
> - * sites can be corrected.
> - */
> -#define REQUIRED_MASK_BIT_SET(feature_bit) \
> - ( CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 0, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 1, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 2, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 3, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 4, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 5, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 6, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 7, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 8, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 9, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 10, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 11, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 12, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 13, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 14, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \
> - REQUIRED_MASK_CHECK || \
> - BUILD_BUG_ON_ZERO(NCAPINTS != 22))
> -
> -#define DISABLED_MASK_BIT_SET(feature_bit) \
> - ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 1, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 2, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 3, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 4, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 5, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 6, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 7, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 8, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 9, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 10, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 11, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 12, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 13, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 14, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \
> - CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \
> - DISABLED_MASK_CHECK || \
> - BUILD_BUG_ON_ZERO(NCAPINTS != 22))
> -
> #define cpu_has(c, bit) \
> (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
> test_cpu_cap(c, bit))
> diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.awk
> index 989b021e73d3..e0383683e630 100755
> --- a/arch/x86/tools/featuremasks.awk
> +++ b/arch/x86/tools/featuremasks.awk
> @@ -77,7 +77,14 @@ END {
> printf "#define %s_MASK%d\t0x%08x\n", s, i, masks[i];
> }
>
> - printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
> + printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
> + printf "\t((\t\t\t\t\t";
> + for (i = 0; i < ncapints; i++) {
> + if (masks[i])
> + printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
> + }
> + printf " 0\t\\\n";
> + printf "\t) & (1U << ((x) & 31)))\n";
> }
>
> printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
> --
> 2.45.2
>
Reviewed-by: Brian Gerst <brgerst@gmail.com>
Generate macros {REQUIRED|DISABLED}_MASK_BIT_SET in the newly added AWK
script that generates the required and disabled feature mask header.
Suggested-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
Change since v3:
* Checking NCAPINTS isn't necessary anymore. It was needed when these
macros had to be manually updated, but now if cpufeatures.h changes
this header will be regenerated (Brian Gerst).
---
arch/x86/include/asm/cpufeature.h | 69 -------------------------------
arch/x86/tools/featuremasks.awk | 9 +++-
2 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 8332f596ba3c..8161dfb3255c 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -55,75 +55,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#define test_cpu_cap(c, bit) \
arch_test_bit(bit, (unsigned long *)((c)->x86_capability))
-/*
- * There are 32 bits/features in each mask word. The high bits
- * (selected with (bit>>5) give us the word number and the low 5
- * bits give us the bit/feature number inside the word.
- * (1UL<<((bit)&31) gives us a mask for the feature_bit so we can
- * see if it is set in the mask word.
- */
-#define CHECK_BIT_IN_MASK_WORD(maskname, word, bit) \
- (((bit)>>5)==(word) && (1UL<<((bit)&31) & maskname##word ))
-
-/*
- * {REQUIRED,DISABLED}_MASK_CHECK below may seem duplicated with the
- * following BUILD_BUG_ON_ZERO() check but when NCAPINTS gets changed, all
- * header macros which use NCAPINTS need to be changed. The duplicated macro
- * use causes the compiler to issue errors for all headers so that all usage
- * sites can be corrected.
- */
-#define REQUIRED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \
- REQUIRED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
-#define DISABLED_MASK_BIT_SET(feature_bit) \
- ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 1, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 2, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 3, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 4, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 5, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 6, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 7, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 8, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 9, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 10, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 11, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 12, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 13, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 14, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \
- CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \
- DISABLED_MASK_CHECK || \
- BUILD_BUG_ON_ZERO(NCAPINTS != 22))
-
#define cpu_has(c, bit) \
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
test_cpu_cap(c, bit))
diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.awk
index 989b021e73d3..2a936411c219 100755
--- a/arch/x86/tools/featuremasks.awk
+++ b/arch/x86/tools/featuremasks.awk
@@ -77,7 +77,14 @@ END {
printf "#define %s_MASK%d\t0x%08x\n", s, i, masks[i];
}
- printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != %d)\n\n", s, ncapints;
+ printf "\n#define %s_MASK_BIT_SET(x)\t\t\t\\\n", s;
+ printf "\t((\t\t\t\t\t";
+ for (i = 0; i < ncapints; i++) {
+ if (masks[i])
+ printf "\t\\\n\t\t((x) >> 5) == %2d ? %s_MASK%d :", i, s, i;
+ }
+ printf " 0\t\\\n";
+ printf "\t) & (1 << ((x) & 31)))\n";
}
printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n";
--
2.45.2© 2016 - 2025 Red Hat, Inc.