[llvm] 4e0a0ea - [X86] Fix test Clang::CodeGen/builtin-cpu-supports.c failure

[Shengchen Kan via llvm-commits]

Author: Shengchen Kan
Date: 2024-06-25T10:19:04+08:00
New Revision: 4e0a0eae58f7a6998866719f7eb970096a2a52e9

URL: https://github.com/llvm/llvm-project/commit/4e0a0eae58f7a6998866719f7eb970096a2a52e9
DIFF: https://github.com/llvm/llvm-project/commit/4e0a0eae58f7a6998866719f7eb970096a2a52e9.diff

LOG: [X86] Fix test Clang::CodeGen/builtin-cpu-supports.c failure

The test failed after
https://github.com/llvm/llvm-project/commit/8ad32ce7382bb8d630a3d4d93d1e1f00f8e2bd0e

In https://github.com/gcc-mirror/gcc/blob/master/gcc/common/config/i386/i386-cpuinfo.h

FEATURE_AVX512CD = 23 and FEATURE_AVX512VBMI = 26, we should only add 2
features between them. New features should be inserted at the end.

Added: 
    

Modified: 
    llvm/include/llvm/TargetParser/X86TargetParser.def

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/TargetParser/X86TargetParser.def b/llvm/include/llvm/TargetParser/X86TargetParser.def
index ae6d848ab39db..0e4ad873e3639 100644
--- a/llvm/include/llvm/TargetParser/X86TargetParser.def
+++ b/llvm/include/llvm/TargetParser/X86TargetParser.def
@@ -161,7 +161,6 @@ X86_FEATURE_COMPAT(AVX512DQ,        "avx512dq",              22)
 X86_FEATURE_COMPAT(AVX512CD,        "avx512cd",              23)
 X86_FEATURE       (NF,              "nf")
 X86_FEATURE       (CF,              "cf")
-X86_FEATURE       (ZU,              "zu")
 X86_FEATURE_COMPAT(AVX512VBMI,      "avx512vbmi",            24)
 X86_FEATURE_COMPAT(AVX512IFMA,      "avx512ifma",            25)
 X86_FEATURE_COMPAT(AVX5124VNNIW,    "avx5124vnniw",          26)
@@ -253,6 +252,7 @@ X86_FEATURE       (EGPR,            "egpr")
 X86_FEATURE_COMPAT(USERMSR,         "usermsr",                0)
 X86_FEATURE_COMPAT(AVX10_1,         "avx10.1-256",           36)
 X86_FEATURE_COMPAT(AVX10_1_512,     "avx10.1-512",           37)
+X86_FEATURE       (ZU,              "zu")
 // These features aren't really CPU features, but the frontend can set them.
 X86_FEATURE       (RETPOLINE_EXTERNAL_THUNK,    "retpoline-external-thunk")
 X86_FEATURE       (RETPOLINE_INDIRECT_BRANCHES, "retpoline-indirect-branches")