cpuinfo: Check for extensions using riscv_hwprobe

lioncash · Nov 8, 2024 · ad0e09f · ad0e09f
1 parent c86bf13
commit ad0e09f
Show file tree

Hide file tree

Showing 2 changed files with 381 additions and 52 deletions.
diff --git a/include/biscuit/cpuinfo.hpp b/include/biscuit/cpuinfo.hpp
@@ -11,50 +11,62 @@
 #include <cstddef>
 #include <cstdint>
 
-#if defined(__linux__) && defined(__riscv)
-#include <sys/auxv.h>
-#include <sys/prctl.h>
-#include <asm/hwcap.h>
-#endif
-
 namespace biscuit {
 
-#ifndef COMPAT_HWCAP_ISA_I
-#define COMPAT_HWCAP_ISA_I  (1U << ('I' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_M
-#define COMPAT_HWCAP_ISA_M  (1U << ('M' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_A
-#define COMPAT_HWCAP_ISA_A  (1U << ('A' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_F
-#define COMPAT_HWCAP_ISA_F  (1U << ('F' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_D
-#define COMPAT_HWCAP_ISA_D  (1U << ('D' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_C
-#define COMPAT_HWCAP_ISA_C  (1U << ('C' - 'A'))
-#endif
-
-#ifndef COMPAT_HWCAP_ISA_V
-#define COMPAT_HWCAP_ISA_V  (1U << ('V' - 'A'))
-#endif
-
 enum class RISCVExtension : uint64_t {
-    I = COMPAT_HWCAP_ISA_I,
-    M = COMPAT_HWCAP_ISA_M,
-    A = COMPAT_HWCAP_ISA_A,
-    F = COMPAT_HWCAP_ISA_F,
-    D = COMPAT_HWCAP_ISA_D,
-    C = COMPAT_HWCAP_ISA_C,
-    V = COMPAT_HWCAP_ISA_V
+    I,
+    M,
+    A,
+    F,
+    D,
+    C,
+    V,
+    Zba,
+    Zbb,
+    Zbs,
+    Zicboz,
+    Zbc,
+    Zbkb,
+    Zbkc,
+    Zbkx,
+    Zknd,
+    Zkne,
+    Zknh,
+    Zksed,
+    Zksh,
+    Zkt,
+    Zvbb,
+    Zvbc,
+    Zvkb,
+    Zvkg,
+    Zvkned,
+    Zvknha,
+    Zvknhb,
+    Zvksed,
+    Zvksh,
+    Zvkt,
+    Zfh,
+    Zfhmin,
+    Zihintntl,
+    Zvfh,
+    Zvfhmin,
+    Zfa,
+    Ztso,
+    Zacas,
+    Zicond,
+    Zihintpause,
+    Zve32x,
+    Zve32f,
+    Zve64x,
+    Zve64f,
+    Zve64d,
+    Zimop,
+    Zca,
+    Zcb,
+    Zcd,
+    Zcf,
+    Zcmop,
+    Zawrs
 };
 
 template <CSR csr>