Add more mappings to x86 features

Author: gbaraldi

src/llvm_compat.cpp

@@ -33,32 +33,33 @@ static const std::set<std::string> aarch64_filter_out = {
 // ============================================================================
 
 static const std::unordered_map<std::string, std::string> x86_64_feature_map = {
-    // Most x86 features have the same name, but some differ
     {"sse4_1", "sse4.1"},
     {"sse4_2", "sse4.2"},
-    {"avx512f", "avx512f"},
-    {"avx512cd", "avx512cd"},
-    {"avx512vl", "avx512vl"},
-    {"avx512bw", "avx512bw"},
-    {"avx512dq", "avx512dq"},
     {"avx512_vnni", "avx512vnni"},
     {"avx512_bf16", "avx512bf16"},
     {"avx512_vbmi", "avx512vbmi"},
     {"avx512_vbmi2", "avx512vbmi2"},
     {"avx512_ifma", "avx512ifma"},
     {"avx512_vpopcntdq", "avx512vpopcntdq"},
+    {"avx512_vp2intersect", "avx512vp2intersect"},
     {"avx512_bitalg", "avx512bitalg"},
     {"avx_vnni", "avxvnni"},
-    {"clflushopt", "clflushopt"},
-    {"clwb", "clwb"},
-    {"movdiri", "movdiri"},
-    {"movdir64b", "movdir64b"},
-    {"pconfig", "pconfig"},
+    {"lahf_lm", "sahf"},
+    {"pclmulqdq", "pclmul"},
+    {"rdrand", "rdrnd"},
+    {"abm", "lzcnt"},
+    {"bmi1", "bmi"},
+    {"sha_ni", "sha"},
+    {"amx_bf16", "amx-bf16"},
+    {"amx_int8", "amx-int8"},
+    {"amx_tile", "amx-tile"},
 };
 
-// x86 features to filter out
 static const std::set<std::string> x86_64_filter_out = {
-    // Usually none need filtering on x86
+    "3dnow",
+    "3dnowext",
+    "avx512er",
+    "avx512pf",
 };
 
 // ============================================================================

tests/test_llvm_compat.cpp

@@ -39,10 +39,31 @@ void test_x86_feature_mapping() {
     assert(archspec::map_feature_to_llvm("x86_64", "sse4_2") == "sse4.2");
     assert(archspec::map_feature_to_llvm("x86_64", "avx512_vnni") == "avx512vnni");
 
+    // Test cpuinfo/archspec -> LLVM name mappings
+    assert(archspec::map_feature_to_llvm("x86_64", "lahf_lm") == "sahf");
+    assert(archspec::map_feature_to_llvm("x86_64", "pclmulqdq") == "pclmul");
+    assert(archspec::map_feature_to_llvm("x86_64", "rdrand") == "rdrnd");
+    assert(archspec::map_feature_to_llvm("x86_64", "abm") == "lzcnt");
+    assert(archspec::map_feature_to_llvm("x86_64", "bmi1") == "bmi");
+    assert(archspec::map_feature_to_llvm("x86_64", "sha_ni") == "sha");
+    // AMX features use hyphens in LLVM
+    assert(archspec::map_feature_to_llvm("x86_64", "amx_bf16") == "amx-bf16");
+    assert(archspec::map_feature_to_llvm("x86_64", "amx_int8") == "amx-int8");
+    assert(archspec::map_feature_to_llvm("x86_64", "amx_tile") == "amx-tile");
+    // AVX-512 features
+    assert(archspec::map_feature_to_llvm("x86_64", "avx512_vp2intersect") == "avx512vp2intersect");
+
+    // Test filter-out (features with no LLVM equivalent)
+    assert(archspec::map_feature_to_llvm("x86_64", "3dnow") == "");
+    assert(archspec::map_feature_to_llvm("x86_64", "avx512er") == "");
+    assert(archspec::map_feature_to_llvm("x86_64", "avx512pf") == "");
+
     // Test pass-through
     assert(archspec::map_feature_to_llvm("x86_64", "avx") == "avx");
     assert(archspec::map_feature_to_llvm("x86_64", "avx2") == "avx2");
     assert(archspec::map_feature_to_llvm("x86_64", "fma") == "fma");
+    assert(archspec::map_feature_to_llvm("x86_64", "bmi2") == "bmi2");
+    assert(archspec::map_feature_to_llvm("x86_64", "popcnt") == "popcnt");
 
     printf("  PASS: x86_64 feature mapping\n");
 }