Skip to content

Completed all missing ARM hwcaps. #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2019
Merged

Completed all missing ARM hwcaps. #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48da39
Added test Marvell Armada 380/385, introduced VFPD32
Jun 22, 2019
8a16f7d
Completed all missing ARM hwcaps
Jun 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions include/cpuinfo_arm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,28 @@
CPU_FEATURES_START_CPP_NAMESPACE

typedef struct {
int swp : 1; // SWP instruction (atomic read-modify-write)
int half : 1; // Half-word loads and stores
int thumb : 1; // Thumb (16-bit instruction set)
int _26bit : 1; // "26 Bit" Model (Processor status register folded into program counter)
int fastmult : 1; // 32x32->64-bit multiplication
int fpa : 1; // Floating point accelerator
int vfp : 1; // Vector Floating Point.
int edsp : 1; // DSP extensions (the 'e' variant of the ARM9 CPUs, and all others above)
int java : 1; // Jazelle (Java bytecode accelerator)
int iwmmxt : 1; // Intel Wireless MMX Technology.
int crunch : 1; // MaverickCrunch coprocessor
int thumbee : 1; // ThumbEE
int neon : 1; // Advanced SIMD.
int vfpv3 : 1; // VFP version 3
int vfpv3d16 : 1; // VFP version 3 with 16 D-registers
int tls : 1; // TLS register
int vfpv4 : 1; // VFP version 4 with fast context switching
int idiva : 1; // SDIV and UDIV hardware division in ARM mode.
int idivt : 1; // SDIV and UDIV hardware division in Thumb mode.
int vfpd32 : 1; // VFP with 32 D-registers
int lpae : 1; // Large Physical Address Extension (>4GB physical memory on 32-bit architecture)
int evtstrm : 1; // kernel event stream using generic architected timer
int aes : 1; // Hardware-accelerated Advanced Encryption Standard.
int pmull : 1; // Polynomial multiply long.
int sha1 : 1; // Hardware-accelerated SHA1.
Expand Down Expand Up @@ -65,20 +73,28 @@ uint32_t GetArmCpuId(const ArmInfo* const info);
// Introspection functions

typedef enum {
ARM_SWP,
ARM_HALF,
ARM_THUMB,
ARM_26BIT,
ARM_FASTMULT,
ARM_FPA,
ARM_VFP,
ARM_EDSP,
ARM_JAVA,
ARM_IWMMXT,
ARM_CRUNCH,
ARM_THUMBEE,
ARM_NEON,
ARM_VFPV3,
ARM_VFPV3D16,
ARM_TLS,
ARM_VFPV4,
ARM_IDIVA,
ARM_IDIVT,
ARM_VFPD32,
ARM_LPAE,
ARM_EVTSTRM,
ARM_AES,
ARM_PMULL,
ARM_SHA1,
Expand Down
8 changes: 8 additions & 0 deletions include/internal/hwcaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,28 @@ CPU_FEATURES_START_CPP_NAMESPACE
#define AARCH64_HWCAP_CRC32 (1UL << 7)

// http://elixir.free-electrons.com/linux/latest/source/arch/arm/include/uapi/asm/hwcap.h
#define ARM_HWCAP_SWP (1UL << 0)
#define ARM_HWCAP_HALF (1UL << 1)
#define ARM_HWCAP_THUMB (1UL << 2)
#define ARM_HWCAP_26BIT (1UL << 3)
#define ARM_HWCAP_FAST_MULT (1UL << 4)
#define ARM_HWCAP_FPA (1UL << 5)
#define ARM_HWCAP_VFP (1UL << 6)
#define ARM_HWCAP_EDSP (1UL << 7)
#define ARM_HWCAP_JAVA (1UL << 8)
#define ARM_HWCAP_IWMMXT (1UL << 9)
#define ARM_HWCAP_CRUNCH (1UL << 10)
#define ARM_HWCAP_THUMBEE (1UL << 11)
#define ARM_HWCAP_NEON (1UL << 12)
#define ARM_HWCAP_VFPV3 (1UL << 13)
#define ARM_HWCAP_VFPV3D16 (1UL << 14)
#define ARM_HWCAP_TLS (1UL << 15)
#define ARM_HWCAP_VFPV4 (1UL << 16)
#define ARM_HWCAP_IDIVA (1UL << 17)
#define ARM_HWCAP_IDIVT (1UL << 18)
#define ARM_HWCAP_VFPD32 (1UL << 19)
#define ARM_HWCAP_LPAE (1UL << 20)
#define ARM_HWCAP_EVTSTRM (1UL << 21)
#define ARM_HWCAP2_AES (1UL << 0)
#define ARM_HWCAP2_PMULL (1UL << 1)
#define ARM_HWCAP2_SHA1 (1UL << 2)
Expand Down
46 changes: 46 additions & 0 deletions src/cpuinfo_arm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,57 @@

#include <ctype.h>

DECLARE_SETTER(ArmFeatures, swp)
DECLARE_SETTER(ArmFeatures, half)
DECLARE_SETTER(ArmFeatures, thumb)
DECLARE_SETTER(ArmFeatures, _26bit)
DECLARE_SETTER(ArmFeatures, fastmult)
DECLARE_SETTER(ArmFeatures, fpa)
DECLARE_SETTER(ArmFeatures, vfp)
DECLARE_SETTER(ArmFeatures, edsp)
DECLARE_SETTER(ArmFeatures, java)
DECLARE_SETTER(ArmFeatures, iwmmxt)
DECLARE_SETTER(ArmFeatures, crunch)
DECLARE_SETTER(ArmFeatures, thumbee)
DECLARE_SETTER(ArmFeatures, neon)
DECLARE_SETTER(ArmFeatures, vfpv3)
DECLARE_SETTER(ArmFeatures, vfpv3d16)
DECLARE_SETTER(ArmFeatures, tls)
DECLARE_SETTER(ArmFeatures, vfpv4)
DECLARE_SETTER(ArmFeatures, idiva)
DECLARE_SETTER(ArmFeatures, idivt)
DECLARE_SETTER(ArmFeatures, vfpd32)
DECLARE_SETTER(ArmFeatures, lpae)
DECLARE_SETTER(ArmFeatures, evtstrm)
DECLARE_SETTER(ArmFeatures, aes)
DECLARE_SETTER(ArmFeatures, pmull)
DECLARE_SETTER(ArmFeatures, sha1)
DECLARE_SETTER(ArmFeatures, sha2)
DECLARE_SETTER(ArmFeatures, crc32)

static const CapabilityConfig kConfigs[] = {
{{ARM_HWCAP_SWP, 0}, "swp", &set_swp}, //
{{ARM_HWCAP_HALF, 0}, "half", &set_half}, //
{{ARM_HWCAP_THUMB, 0}, "thumb", &set_thumb}, //
{{ARM_HWCAP_26BIT, 0}, "26bit", &set__26bit}, //
{{ARM_HWCAP_FAST_MULT, 0}, "fastmult", &set_fastmult}, //
{{ARM_HWCAP_FPA, 0}, "fpa", &set_fpa}, //
{{ARM_HWCAP_VFP, 0}, "vfp", &set_vfp}, //
{{ARM_HWCAP_EDSP, 0}, "edsp", &set_edsp}, //
{{ARM_HWCAP_JAVA, 0}, "java", &set_java}, //
{{ARM_HWCAP_IWMMXT, 0}, "iwmmxt", &set_iwmmxt}, //
{{ARM_HWCAP_CRUNCH, 0}, "crunch", &set_crunch}, //
{{ARM_HWCAP_THUMBEE, 0}, "thumbee", &set_thumbee}, //
{{ARM_HWCAP_NEON, 0}, "neon", &set_neon}, //
{{ARM_HWCAP_VFPV3, 0}, "vfpv3", &set_vfpv3}, //
{{ARM_HWCAP_VFPV3D16, 0}, "vfpv3d16", &set_vfpv3d16}, //
{{ARM_HWCAP_TLS, 0}, "tls", &set_tls}, //
{{ARM_HWCAP_VFPV4, 0}, "vfpv4", &set_vfpv4}, //
{{ARM_HWCAP_IDIVA, 0}, "idiva", &set_idiva}, //
{{ARM_HWCAP_IDIVT, 0}, "idivt", &set_idivt}, //
{{ARM_HWCAP_VFPD32, 0}, "vfpd32", &set_vfpd32}, //
{{ARM_HWCAP_LPAE, 0}, "lpae", &set_lpae}, //
{{ARM_HWCAP_EVTSTRM, 0}, "evtstrm", &set_evtstrm}, //
{{0, ARM_HWCAP2_AES}, "aes", &set_aes}, //
{{0, ARM_HWCAP2_PMULL}, "pmull", &set_pmull}, //
{{0, ARM_HWCAP2_SHA1}, "sha1", &set_sha1}, //
Expand Down Expand Up @@ -208,12 +224,18 @@ ArmInfo GetArmInfo(void) {
int GetArmFeaturesEnumValue(const ArmFeatures* features,
ArmFeaturesEnum value) {
switch (value) {
case ARM_SWP:
return features->swp;
case ARM_HALF:
return features->half;
case ARM_THUMB:
return features->thumb;
case ARM_26BIT:
return features->_26bit;
case ARM_FASTMULT:
return features->fastmult;
case ARM_FPA:
return features->fpa;
case ARM_VFP:
return features->vfp;
case ARM_EDSP:
Expand All @@ -222,6 +244,10 @@ int GetArmFeaturesEnumValue(const ArmFeatures* features,
return features->java;
case ARM_IWMMXT:
return features->iwmmxt;
case ARM_CRUNCH:
return features->crunch;
case ARM_THUMBEE:
return features->thumbee;
case ARM_NEON:
return features->neon;
case ARM_VFPV3:
Expand All @@ -236,6 +262,12 @@ int GetArmFeaturesEnumValue(const ArmFeatures* features,
return features->idiva;
case ARM_IDIVT:
return features->idivt;
case ARM_VFPD32:
return features->vfpd32;
case ARM_LPAE:
return features->lpae;
case ARM_EVTSTRM:
return features->evtstrm;
case ARM_AES:
return features->aes;
case ARM_PMULL:
Expand All @@ -254,12 +286,16 @@ int GetArmFeaturesEnumValue(const ArmFeatures* features,

const char* GetArmFeaturesEnumName(ArmFeaturesEnum value) {
switch (value) {
case ARM_SWP:
return "swp";
case ARM_HALF:
return "half";
case ARM_THUMB:
return "thumb";
case ARM_FASTMULT:
return "fastmult";
case ARM_FPA:
return "fpa";
case ARM_VFP:
return "vfp";
case ARM_EDSP:
Expand All @@ -268,6 +304,10 @@ const char* GetArmFeaturesEnumName(ArmFeaturesEnum value) {
return "java";
case ARM_IWMMXT:
return "iwmmxt";
case ARM_CRUNCH:
return "crunch";
case ARM_THUMBEE:
return "thumbee";
case ARM_NEON:
return "neon";
case ARM_VFPV3:
Expand All @@ -282,6 +322,12 @@ const char* GetArmFeaturesEnumName(ArmFeaturesEnum value) {
return "idiva";
case ARM_IDIVT:
return "idivt";
case ARM_VFPD32:
return "vfpd32";
case ARM_LPAE:
return "lpae";
case ARM_EVTSTRM:
return "evtstrm";
case ARM_AES:
return "aes";
case ARM_PMULL:
Expand Down
Loading