Skip to content

Commit cdab59a

Browse files
gchateletgchatelet
authored
[NFC] Simplify build by removing inl files. (#139)
1 parent 9a8f04b commit cdab59a

11 files changed

Lines changed: 201 additions & 303 deletions

‎src/cpuinfo_aarch64.c‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,59 @@
2424

2525
// Generation of feature's getters/setters functions and kGetters, kSetters,
2626
// kCpuInfoFlags and kHardwareCapabilities global tables.
27+
#define DEFINE_TABLE_FEATURES \
28+
FEATURE(AARCH64_FP, fp, "fp", AARCH64_HWCAP_FP, 0) \
29+
FEATURE(AARCH64_ASIMD, asimd, "asimd", AARCH64_HWCAP_ASIMD, 0) \
30+
FEATURE(AARCH64_EVTSTRM, evtstrm, "evtstrm", AARCH64_HWCAP_EVTSTRM, 0) \
31+
FEATURE(AARCH64_AES, aes, "aes", AARCH64_HWCAP_AES, 0) \
32+
FEATURE(AARCH64_PMULL, pmull, "pmull", AARCH64_HWCAP_PMULL, 0) \
33+
FEATURE(AARCH64_SHA1, sha1, "sha1", AARCH64_HWCAP_SHA1, 0) \
34+
FEATURE(AARCH64_SHA2, sha2, "sha2", AARCH64_HWCAP_SHA2, 0) \
35+
FEATURE(AARCH64_CRC32, crc32, "crc32", AARCH64_HWCAP_CRC32, 0) \
36+
FEATURE(AARCH64_ATOMICS, atomics, "atomics", AARCH64_HWCAP_ATOMICS, 0) \
37+
FEATURE(AARCH64_FPHP, fphp, "fphp", AARCH64_HWCAP_FPHP, 0) \
38+
FEATURE(AARCH64_ASIMDHP, asimdhp, "asimdhp", AARCH64_HWCAP_ASIMDHP, 0) \
39+
FEATURE(AARCH64_CPUID, cpuid, "cpuid", AARCH64_HWCAP_CPUID, 0) \
40+
FEATURE(AARCH64_ASIMDRDM, asimdrdm, "asimdrdm", AARCH64_HWCAP_ASIMDRDM, 0) \
41+
FEATURE(AARCH64_JSCVT, jscvt, "jscvt", AARCH64_HWCAP_JSCVT, 0) \
42+
FEATURE(AARCH64_FCMA, fcma, "fcma", AARCH64_HWCAP_FCMA, 0) \
43+
FEATURE(AARCH64_LRCPC, lrcpc, "lrcpc", AARCH64_HWCAP_LRCPC, 0) \
44+
FEATURE(AARCH64_DCPOP, dcpop, "dcpop", AARCH64_HWCAP_DCPOP, 0) \
45+
FEATURE(AARCH64_SHA3, sha3, "sha3", AARCH64_HWCAP_SHA3, 0) \
46+
FEATURE(AARCH64_SM3, sm3, "sm3", AARCH64_HWCAP_SM3, 0) \
47+
FEATURE(AARCH64_SM4, sm4, "sm4", AARCH64_HWCAP_SM4, 0) \
48+
FEATURE(AARCH64_ASIMDDP, asimddp, "asimddp", AARCH64_HWCAP_ASIMDDP, 0) \
49+
FEATURE(AARCH64_SHA512, sha512, "sha512", AARCH64_HWCAP_SHA512, 0) \
50+
FEATURE(AARCH64_SVE, sve, "sve", AARCH64_HWCAP_SVE, 0) \
51+
FEATURE(AARCH64_ASIMDFHM, asimdfhm, "asimdfhm", AARCH64_HWCAP_ASIMDFHM, 0) \
52+
FEATURE(AARCH64_DIT, dit, "dit", AARCH64_HWCAP_DIT, 0) \
53+
FEATURE(AARCH64_USCAT, uscat, "uscat", AARCH64_HWCAP_USCAT, 0) \
54+
FEATURE(AARCH64_ILRCPC, ilrcpc, "ilrcpc", AARCH64_HWCAP_ILRCPC, 0) \
55+
FEATURE(AARCH64_FLAGM, flagm, "flagm", AARCH64_HWCAP_FLAGM, 0) \
56+
FEATURE(AARCH64_SSBS, ssbs, "ssbs", AARCH64_HWCAP_SSBS, 0) \
57+
FEATURE(AARCH64_SB, sb, "sb", AARCH64_HWCAP_SB, 0) \
58+
FEATURE(AARCH64_PACA, paca, "paca", AARCH64_HWCAP_PACA, 0) \
59+
FEATURE(AARCH64_PACG, pacg, "pacg", AARCH64_HWCAP_PACG, 0) \
60+
FEATURE(AARCH64_DCPODP, dcpodp, "dcpodp", 0, AARCH64_HWCAP2_DCPODP) \
61+
FEATURE(AARCH64_SVE2, sve2, "sve2", 0, AARCH64_HWCAP2_SVE2) \
62+
FEATURE(AARCH64_SVEAES, sveaes, "sveaes", 0, AARCH64_HWCAP2_SVEAES) \
63+
FEATURE(AARCH64_SVEPMULL, svepmull, "svepmull", 0, AARCH64_HWCAP2_SVEPMULL) \
64+
FEATURE(AARCH64_SVEBITPERM, svebitperm, "svebitperm", 0, \
65+
AARCH64_HWCAP2_SVEBITPERM) \
66+
FEATURE(AARCH64_SVESHA3, svesha3, "svesha3", 0, AARCH64_HWCAP2_SVESHA3) \
67+
FEATURE(AARCH64_SVESM4, svesm4, "svesm4", 0, AARCH64_HWCAP2_SVESM4) \
68+
FEATURE(AARCH64_FLAGM2, flagm2, "flagm2", 0, AARCH64_HWCAP2_FLAGM2) \
69+
FEATURE(AARCH64_FRINT, frint, "frint", 0, AARCH64_HWCAP2_FRINT) \
70+
FEATURE(AARCH64_SVEI8MM, svei8mm, "svei8mm", 0, AARCH64_HWCAP2_SVEI8MM) \
71+
FEATURE(AARCH64_SVEF32MM, svef32mm, "svef32mm", 0, AARCH64_HWCAP2_SVEF32MM) \
72+
FEATURE(AARCH64_SVEF64MM, svef64mm, "svef64mm", 0, AARCH64_HWCAP2_SVEF64MM) \
73+
FEATURE(AARCH64_SVEBF16, svebf16, "svebf16", 0, AARCH64_HWCAP2_SVEBF16) \
74+
FEATURE(AARCH64_I8MM, i8mm, "i8mm", 0, AARCH64_HWCAP2_I8MM) \
75+
FEATURE(AARCH64_BF16, bf16, "bf16", 0, AARCH64_HWCAP2_BF16) \
76+
FEATURE(AARCH64_DGH, dgh, "dgh", 0, AARCH64_HWCAP2_DGH) \
77+
FEATURE(AARCH64_RNG, rng, "rng", 0, AARCH64_HWCAP2_RNG) \
78+
FEATURE(AARCH64_BTI, bti, "bti", 0, AARCH64_HWCAP2_BTI)
2779
#define DEFINE_TABLE_FEATURE_TYPE Aarch64Features
28-
#define DEFINE_TABLE_DB_FILENAME "cpuinfo_aarch64_db.inl"
2980
#include "define_tables.h"
3081

3182
static bool HandleAarch64Line(const LineResult result,

‎src/cpuinfo_aarch64_db.inl‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/cpuinfo_arm.c‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,35 @@
2525

2626
// Generation of feature's getters/setters functions and kGetters, kSetters,
2727
// kCpuInfoFlags and kHardwareCapabilities global tables.
28+
#define DEFINE_TABLE_FEATURES \
29+
FEATURE(ARM_SWP, swp, "swp", ARM_HWCAP_SWP, 0) \
30+
FEATURE(ARM_HALF, half, "half", ARM_HWCAP_HALF, 0) \
31+
FEATURE(ARM_THUMB, thumb, "thumb", ARM_HWCAP_THUMB, 0) \
32+
FEATURE(ARM_26BIT, _26bit, "26bit", ARM_HWCAP_26BIT, 0) \
33+
FEATURE(ARM_FASTMULT, fastmult, "fastmult", ARM_HWCAP_FAST_MULT, 0) \
34+
FEATURE(ARM_FPA, fpa, "fpa", ARM_HWCAP_FPA, 0) \
35+
FEATURE(ARM_VFP, vfp, "vfp", ARM_HWCAP_VFP, 0) \
36+
FEATURE(ARM_EDSP, edsp, "edsp", ARM_HWCAP_EDSP, 0) \
37+
FEATURE(ARM_JAVA, java, "java", ARM_HWCAP_JAVA, 0) \
38+
FEATURE(ARM_IWMMXT, iwmmxt, "iwmmxt", ARM_HWCAP_IWMMXT, 0) \
39+
FEATURE(ARM_CRUNCH, crunch, "crunch", ARM_HWCAP_CRUNCH, 0) \
40+
FEATURE(ARM_THUMBEE, thumbee, "thumbee", ARM_HWCAP_THUMBEE, 0) \
41+
FEATURE(ARM_NEON, neon, "neon", ARM_HWCAP_NEON, 0) \
42+
FEATURE(ARM_VFPV3, vfpv3, "vfpv3", ARM_HWCAP_VFPV3, 0) \
43+
FEATURE(ARM_VFPV3D16, vfpv3d16, "vfpv3d16", ARM_HWCAP_VFPV3D16, 0) \
44+
FEATURE(ARM_TLS, tls, "tls", ARM_HWCAP_TLS, 0) \
45+
FEATURE(ARM_VFPV4, vfpv4, "vfpv4", ARM_HWCAP_VFPV4, 0) \
46+
FEATURE(ARM_IDIVA, idiva, "idiva", ARM_HWCAP_IDIVA, 0) \
47+
FEATURE(ARM_IDIVT, idivt, "idivt", ARM_HWCAP_IDIVT, 0) \
48+
FEATURE(ARM_VFPD32, vfpd32, "vfpd32", ARM_HWCAP_VFPD32, 0) \
49+
FEATURE(ARM_LPAE, lpae, "lpae", ARM_HWCAP_LPAE, 0) \
50+
FEATURE(ARM_EVTSTRM, evtstrm, "evtstrm", ARM_HWCAP_EVTSTRM, 0) \
51+
FEATURE(ARM_AES, aes, "aes", 0, ARM_HWCAP2_AES) \
52+
FEATURE(ARM_PMULL, pmull, "pmull", 0, ARM_HWCAP2_PMULL) \
53+
FEATURE(ARM_SHA1, sha1, "sha1", 0, ARM_HWCAP2_SHA1) \
54+
FEATURE(ARM_SHA2, sha2, "sha2", 0, ARM_HWCAP2_SHA2) \
55+
FEATURE(ARM_CRC32, crc32, "crc32", 0, ARM_HWCAP2_CRC32)
2856
#define DEFINE_TABLE_FEATURE_TYPE ArmFeatures
29-
#define DEFINE_TABLE_DB_FILENAME "cpuinfo_arm_db.inl"
3057
#include "define_tables.h"
3158

3259
typedef struct {

‎src/cpuinfo_arm_db.inl‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎src/cpuinfo_mips.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323

2424
// Generation of feature's getters/setters functions and kGetters, kSetters,
2525
// kCpuInfoFlags and kHardwareCapabilities global tables.
26+
#define DEFINE_TABLE_FEATURES \
27+
FEATURE(MIPS_MSA, msa, "msa", MIPS_HWCAP_MSA, 0) \
28+
FEATURE(MIPS_EVA, eva, "eva", 0, 0) \
29+
FEATURE(MIPS_R6, r6, "r6", MIPS_HWCAP_R6, 0)
2630
#define DEFINE_TABLE_FEATURE_TYPE MipsFeatures
27-
#define DEFINE_TABLE_DB_FILENAME "cpuinfo_mips_db.inl"
2831
#include "define_tables.h"
2932

3033
static bool HandleMipsLine(const LineResult result,

‎src/cpuinfo_mips_db.inl‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/cpuinfo_ppc.c‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,55 @@
2525

2626
// Generation of feature's getters/setters functions and kGetters, kSetters,
2727
// kCpuInfoFlags and kHardwareCapabilities global tables.
28+
#define DEFINE_TABLE_FEATURES \
29+
FEATURE(PPC_32, ppc32, "ppc32", PPC_FEATURE_32, 0) \
30+
FEATURE(PPC_64, ppc64, "ppc64", PPC_FEATURE_64, 0) \
31+
FEATURE(PPC_601_INSTR, ppc601, "ppc601", PPC_FEATURE_601_INSTR, 0) \
32+
FEATURE(PPC_HAS_ALTIVEC, altivec, "altivec", PPC_FEATURE_HAS_ALTIVEC, 0) \
33+
FEATURE(PPC_HAS_FPU, fpu, "fpu", PPC_FEATURE_HAS_FPU, 0) \
34+
FEATURE(PPC_HAS_MMU, mmu, "mmu", PPC_FEATURE_HAS_MMU, 0) \
35+
FEATURE(PPC_HAS_4xxMAC, mac_4xx, "4xxmac", PPC_FEATURE_HAS_4xxMAC, 0) \
36+
FEATURE(PPC_UNIFIED_CACHE, unifiedcache, "ucache", \
37+
PPC_FEATURE_UNIFIED_CACHE, 0) \
38+
FEATURE(PPC_HAS_SPE, spe, "spe", PPC_FEATURE_HAS_SPE, 0) \
39+
FEATURE(PPC_HAS_EFP_SINGLE, efpsingle, "efpsingle", \
40+
PPC_FEATURE_HAS_EFP_SINGLE, 0) \
41+
FEATURE(PPC_HAS_EFP_DOUBLE, efpdouble, "efpdouble", \
42+
PPC_FEATURE_HAS_EFP_DOUBLE, 0) \
43+
FEATURE(PPC_NO_TB, no_tb, "notb", PPC_FEATURE_NO_TB, 0) \
44+
FEATURE(PPC_POWER4, power4, "power4", PPC_FEATURE_POWER4, 0) \
45+
FEATURE(PPC_POWER5, power5, "power5", PPC_FEATURE_POWER5, 0) \
46+
FEATURE(PPC_POWER5_PLUS, power5plus, "power5+", PPC_FEATURE_POWER5_PLUS, 0) \
47+
FEATURE(PPC_CELL, cell, "cellbe", PPC_FEATURE_CELL, 0) \
48+
FEATURE(PPC_BOOKE, booke, "booke", PPC_FEATURE_BOOKE, 0) \
49+
FEATURE(PPC_SMT, smt, "smt", PPC_FEATURE_SMT, 0) \
50+
FEATURE(PPC_ICACHE_SNOOP, icachesnoop, "ic_snoop", PPC_FEATURE_ICACHE_SNOOP, \
51+
0) \
52+
FEATURE(PPC_ARCH_2_05, arch205, "arch_2_05", PPC_FEATURE_ARCH_2_05, 0) \
53+
FEATURE(PPC_PA6T, pa6t, "pa6t", PPC_FEATURE_PA6T, 0) \
54+
FEATURE(PPC_HAS_DFP, dfp, "dfp", PPC_FEATURE_HAS_DFP, 0) \
55+
FEATURE(PPC_POWER6_EXT, power6ext, "power6x", PPC_FEATURE_POWER6_EXT, 0) \
56+
FEATURE(PPC_ARCH_2_06, arch206, "arch_2_06", PPC_FEATURE_ARCH_2_06, 0) \
57+
FEATURE(PPC_HAS_VSX, vsx, "vsx", PPC_FEATURE_HAS_VSX, 0) \
58+
FEATURE(PPC_PSERIES_PERFMON_COMPAT, pseries_perfmon_compat, "archpmu", \
59+
PPC_FEATURE_PSERIES_PERFMON_COMPAT, 0) \
60+
FEATURE(PPC_TRUE_LE, truele, "true_le", PPC_FEATURE_TRUE_LE, 0) \
61+
FEATURE(PPC_PPC_LE, ppcle, "ppcle", PPC_FEATURE_PPC_LE, 0) \
62+
FEATURE(PPC_ARCH_2_07, arch207, "arch_2_07", 0, PPC_FEATURE2_ARCH_2_07) \
63+
FEATURE(PPC_HTM, htm, "htm", 0, PPC_FEATURE2_HTM) \
64+
FEATURE(PPC_DSCR, dscr, "dscr", 0, PPC_FEATURE2_DSCR) \
65+
FEATURE(PPC_EBB, ebb, "ebb", 0, PPC_FEATURE2_EBB) \
66+
FEATURE(PPC_ISEL, isel, "isel", 0, PPC_FEATURE2_ISEL) \
67+
FEATURE(PPC_TAR, tar, "tar", 0, PPC_FEATURE2_TAR) \
68+
FEATURE(PPC_VEC_CRYPTO, vcrypto, "vcrypto", 0, PPC_FEATURE2_VEC_CRYPTO) \
69+
FEATURE(PPC_HTM_NOSC, htm_nosc, "htm-nosc", 0, PPC_FEATURE2_HTM_NOSC) \
70+
FEATURE(PPC_ARCH_3_00, arch300, "arch_3_00", 0, PPC_FEATURE2_ARCH_3_00) \
71+
FEATURE(PPC_HAS_IEEE128, ieee128, "ieee128", 0, PPC_FEATURE2_HAS_IEEE128) \
72+
FEATURE(PPC_DARN, darn, "darn", 0, PPC_FEATURE2_DARN) \
73+
FEATURE(PPC_SCV, scv, "scv", 0, PPC_FEATURE2_SCV) \
74+
FEATURE(PPC_HTM_NO_SUSPEND, htm_no_suspend, "htm-no-suspend", 0, \
75+
PPC_FEATURE2_HTM_NO_SUSPEND)
2876
#define DEFINE_TABLE_FEATURE_TYPE PPCFeatures
29-
#define DEFINE_TABLE_DB_FILENAME "cpuinfo_ppc_db.inl"
3077
#include "define_tables.h"
3178

3279
static bool HandlePPCLine(const LineResult result,

0 commit comments

Comments
 (0)