Skip to content

Commit 392c1c0

Browse files
Mykola HohsdzeMykola Hohsdze
Mykola Hohsdze
authored and
Mykola Hohsdze
committed
Move common logic of aarch64 to impl_aarch64_base and compile check
To add support AARCH64 for other operating systems such as macOS(Apple M1), ios, FreeBSD, Windows has been moved common logic from `src/impl_aarch64_linux_or_android.c` to `src/impl_aarch64__base_implementation.inl`, namely: * Definitions for introspection * `Aarch64Info` kEmptyAarch64Info field Removed include "internal/bit_utils.h" from `src/impl_aarch64_linux_or_android.c`, since this include was not used. Also, include `cpuinfo_aarch64` has been removed from linux implementation and replaced with `impl_aarch64__base_implementation.inl`, this include will be used for all other operating system impl as well Added a compilation check that matches the base X86 implementation Refs: google#121 See also: google#150, google#186, google#204
1 parent 4e8d2e3 commit 392c1c0

File tree

2 files changed

+85
-72
lines changed

2 files changed

+85
-72
lines changed

‎src/impl_aarch64__base_implementation.inl

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// Copyright 2022 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "cpuinfo_aarch64.h"
16+
17+
#if !defined(CPU_FEATURES_ARCH_AARCH64)
18+
#error "Cannot compile cpuinfo_aarch64 on a non aarch64 platform.
19+
#endif
20+
21+
////////////////////////////////////////////////////////////////////////////////
22+
// Definitions for introspection.
23+
////////////////////////////////////////////////////////////////////////////////
24+
#define INTROSPECTION_TABLE \
25+
LINE(AARCH64_FP, fp, "fp", AARCH64_HWCAP_FP, 0) \
26+
LINE(AARCH64_ASIMD, asimd, "asimd", AARCH64_HWCAP_ASIMD, 0) \
27+
LINE(AARCH64_EVTSTRM, evtstrm, "evtstrm", AARCH64_HWCAP_EVTSTRM, 0) \
28+
LINE(AARCH64_AES, aes, "aes", AARCH64_HWCAP_AES, 0) \
29+
LINE(AARCH64_PMULL, pmull, "pmull", AARCH64_HWCAP_PMULL, 0) \
30+
LINE(AARCH64_SHA1, sha1, "sha1", AARCH64_HWCAP_SHA1, 0) \
31+
LINE(AARCH64_SHA2, sha2, "sha2", AARCH64_HWCAP_SHA2, 0) \
32+
LINE(AARCH64_CRC32, crc32, "crc32", AARCH64_HWCAP_CRC32, 0) \
33+
LINE(AARCH64_ATOMICS, atomics, "atomics", AARCH64_HWCAP_ATOMICS, 0) \
34+
LINE(AARCH64_FPHP, fphp, "fphp", AARCH64_HWCAP_FPHP, 0) \
35+
LINE(AARCH64_ASIMDHP, asimdhp, "asimdhp", AARCH64_HWCAP_ASIMDHP, 0) \
36+
LINE(AARCH64_CPUID, cpuid, "cpuid", AARCH64_HWCAP_CPUID, 0) \
37+
LINE(AARCH64_ASIMDRDM, asimdrdm, "asimdrdm", AARCH64_HWCAP_ASIMDRDM, 0) \
38+
LINE(AARCH64_JSCVT, jscvt, "jscvt", AARCH64_HWCAP_JSCVT, 0) \
39+
LINE(AARCH64_FCMA, fcma, "fcma", AARCH64_HWCAP_FCMA, 0) \
40+
LINE(AARCH64_LRCPC, lrcpc, "lrcpc", AARCH64_HWCAP_LRCPC, 0) \
41+
LINE(AARCH64_DCPOP, dcpop, "dcpop", AARCH64_HWCAP_DCPOP, 0) \
42+
LINE(AARCH64_SHA3, sha3, "sha3", AARCH64_HWCAP_SHA3, 0) \
43+
LINE(AARCH64_SM3, sm3, "sm3", AARCH64_HWCAP_SM3, 0) \
44+
LINE(AARCH64_SM4, sm4, "sm4", AARCH64_HWCAP_SM4, 0) \
45+
LINE(AARCH64_ASIMDDP, asimddp, "asimddp", AARCH64_HWCAP_ASIMDDP, 0) \
46+
LINE(AARCH64_SHA512, sha512, "sha512", AARCH64_HWCAP_SHA512, 0) \
47+
LINE(AARCH64_SVE, sve, "sve", AARCH64_HWCAP_SVE, 0) \
48+
LINE(AARCH64_ASIMDFHM, asimdfhm, "asimdfhm", AARCH64_HWCAP_ASIMDFHM, 0) \
49+
LINE(AARCH64_DIT, dit, "dit", AARCH64_HWCAP_DIT, 0) \
50+
LINE(AARCH64_USCAT, uscat, "uscat", AARCH64_HWCAP_USCAT, 0) \
51+
LINE(AARCH64_ILRCPC, ilrcpc, "ilrcpc", AARCH64_HWCAP_ILRCPC, 0) \
52+
LINE(AARCH64_FLAGM, flagm, "flagm", AARCH64_HWCAP_FLAGM, 0) \
53+
LINE(AARCH64_SSBS, ssbs, "ssbs", AARCH64_HWCAP_SSBS, 0) \
54+
LINE(AARCH64_SB, sb, "sb", AARCH64_HWCAP_SB, 0) \
55+
LINE(AARCH64_PACA, paca, "paca", AARCH64_HWCAP_PACA, 0) \
56+
LINE(AARCH64_PACG, pacg, "pacg", AARCH64_HWCAP_PACG, 0) \
57+
LINE(AARCH64_DCPODP, dcpodp, "dcpodp", 0, AARCH64_HWCAP2_DCPODP) \
58+
LINE(AARCH64_SVE2, sve2, "sve2", 0, AARCH64_HWCAP2_SVE2) \
59+
LINE(AARCH64_SVEAES, sveaes, "sveaes", 0, AARCH64_HWCAP2_SVEAES) \
60+
LINE(AARCH64_SVEPMULL, svepmull, "svepmull", 0, AARCH64_HWCAP2_SVEPMULL) \
61+
LINE(AARCH64_SVEBITPERM, svebitperm, "svebitperm", 0, \
62+
AARCH64_HWCAP2_SVEBITPERM) \
63+
LINE(AARCH64_SVESHA3, svesha3, "svesha3", 0, AARCH64_HWCAP2_SVESHA3) \
64+
LINE(AARCH64_SVESM4, svesm4, "svesm4", 0, AARCH64_HWCAP2_SVESM4) \
65+
LINE(AARCH64_FLAGM2, flagm2, "flagm2", 0, AARCH64_HWCAP2_FLAGM2) \
66+
LINE(AARCH64_FRINT, frint, "frint", 0, AARCH64_HWCAP2_FRINT) \
67+
LINE(AARCH64_SVEI8MM, svei8mm, "svei8mm", 0, AARCH64_HWCAP2_SVEI8MM) \
68+
LINE(AARCH64_SVEF32MM, svef32mm, "svef32mm", 0, AARCH64_HWCAP2_SVEF32MM) \
69+
LINE(AARCH64_SVEF64MM, svef64mm, "svef64mm", 0, AARCH64_HWCAP2_SVEF64MM) \
70+
LINE(AARCH64_SVEBF16, svebf16, "svebf16", 0, AARCH64_HWCAP2_SVEBF16) \
71+
LINE(AARCH64_I8MM, i8mm, "i8mm", 0, AARCH64_HWCAP2_I8MM) \
72+
LINE(AARCH64_BF16, bf16, "bf16", 0, AARCH64_HWCAP2_BF16) \
73+
LINE(AARCH64_DGH, dgh, "dgh", 0, AARCH64_HWCAP2_DGH) \
74+
LINE(AARCH64_RNG, rng, "rng", 0, AARCH64_HWCAP2_RNG) \
75+
LINE(AARCH64_BTI, bti, "bti", 0, AARCH64_HWCAP2_BTI) \
76+
LINE(AARCH64_MTE, mte, "mte", 0, AARCH64_HWCAP2_MTE) \
77+
LINE(AARCH64_ECV, ecv, "ecv", 0, AARCH64_HWCAP2_ECV) \
78+
LINE(AARCH64_AFP, afp, "afp", 0, AARCH64_HWCAP2_AFP) \
79+
LINE(AARCH64_RPRES, rpres, "rpres", 0, AARCH64_HWCAP2_RPRES)
80+
#define INTROSPECTION_PREFIX Aarch64
81+
#define INTROSPECTION_ENUM_PREFIX AARCH64
82+
#include "define_introspection_and_hwcaps.inl"
83+
84+
static const Aarch64Info kEmptyAarch64Info;

‎src/impl_aarch64_linux_or_android.c

+1-72
Original file line numberDiff line numberDiff line change
@@ -17,78 +17,9 @@
1717
#ifdef CPU_FEATURES_ARCH_AARCH64
1818
#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID)
1919

20-
#include "cpuinfo_aarch64.h"
21-
22-
////////////////////////////////////////////////////////////////////////////////
23-
// Definitions for introspection.
24-
////////////////////////////////////////////////////////////////////////////////
25-
#define INTROSPECTION_TABLE \
26-
LINE(AARCH64_FP, fp, "fp", AARCH64_HWCAP_FP, 0) \
27-
LINE(AARCH64_ASIMD, asimd, "asimd", AARCH64_HWCAP_ASIMD, 0) \
28-
LINE(AARCH64_EVTSTRM, evtstrm, "evtstrm", AARCH64_HWCAP_EVTSTRM, 0) \
29-
LINE(AARCH64_AES, aes, "aes", AARCH64_HWCAP_AES, 0) \
30-
LINE(AARCH64_PMULL, pmull, "pmull", AARCH64_HWCAP_PMULL, 0) \
31-
LINE(AARCH64_SHA1, sha1, "sha1", AARCH64_HWCAP_SHA1, 0) \
32-
LINE(AARCH64_SHA2, sha2, "sha2", AARCH64_HWCAP_SHA2, 0) \
33-
LINE(AARCH64_CRC32, crc32, "crc32", AARCH64_HWCAP_CRC32, 0) \
34-
LINE(AARCH64_ATOMICS, atomics, "atomics", AARCH64_HWCAP_ATOMICS, 0) \
35-
LINE(AARCH64_FPHP, fphp, "fphp", AARCH64_HWCAP_FPHP, 0) \
36-
LINE(AARCH64_ASIMDHP, asimdhp, "asimdhp", AARCH64_HWCAP_ASIMDHP, 0) \
37-
LINE(AARCH64_CPUID, cpuid, "cpuid", AARCH64_HWCAP_CPUID, 0) \
38-
LINE(AARCH64_ASIMDRDM, asimdrdm, "asimdrdm", AARCH64_HWCAP_ASIMDRDM, 0) \
39-
LINE(AARCH64_JSCVT, jscvt, "jscvt", AARCH64_HWCAP_JSCVT, 0) \
40-
LINE(AARCH64_FCMA, fcma, "fcma", AARCH64_HWCAP_FCMA, 0) \
41-
LINE(AARCH64_LRCPC, lrcpc, "lrcpc", AARCH64_HWCAP_LRCPC, 0) \
42-
LINE(AARCH64_DCPOP, dcpop, "dcpop", AARCH64_HWCAP_DCPOP, 0) \
43-
LINE(AARCH64_SHA3, sha3, "sha3", AARCH64_HWCAP_SHA3, 0) \
44-
LINE(AARCH64_SM3, sm3, "sm3", AARCH64_HWCAP_SM3, 0) \
45-
LINE(AARCH64_SM4, sm4, "sm4", AARCH64_HWCAP_SM4, 0) \
46-
LINE(AARCH64_ASIMDDP, asimddp, "asimddp", AARCH64_HWCAP_ASIMDDP, 0) \
47-
LINE(AARCH64_SHA512, sha512, "sha512", AARCH64_HWCAP_SHA512, 0) \
48-
LINE(AARCH64_SVE, sve, "sve", AARCH64_HWCAP_SVE, 0) \
49-
LINE(AARCH64_ASIMDFHM, asimdfhm, "asimdfhm", AARCH64_HWCAP_ASIMDFHM, 0) \
50-
LINE(AARCH64_DIT, dit, "dit", AARCH64_HWCAP_DIT, 0) \
51-
LINE(AARCH64_USCAT, uscat, "uscat", AARCH64_HWCAP_USCAT, 0) \
52-
LINE(AARCH64_ILRCPC, ilrcpc, "ilrcpc", AARCH64_HWCAP_ILRCPC, 0) \
53-
LINE(AARCH64_FLAGM, flagm, "flagm", AARCH64_HWCAP_FLAGM, 0) \
54-
LINE(AARCH64_SSBS, ssbs, "ssbs", AARCH64_HWCAP_SSBS, 0) \
55-
LINE(AARCH64_SB, sb, "sb", AARCH64_HWCAP_SB, 0) \
56-
LINE(AARCH64_PACA, paca, "paca", AARCH64_HWCAP_PACA, 0) \
57-
LINE(AARCH64_PACG, pacg, "pacg", AARCH64_HWCAP_PACG, 0) \
58-
LINE(AARCH64_DCPODP, dcpodp, "dcpodp", 0, AARCH64_HWCAP2_DCPODP) \
59-
LINE(AARCH64_SVE2, sve2, "sve2", 0, AARCH64_HWCAP2_SVE2) \
60-
LINE(AARCH64_SVEAES, sveaes, "sveaes", 0, AARCH64_HWCAP2_SVEAES) \
61-
LINE(AARCH64_SVEPMULL, svepmull, "svepmull", 0, AARCH64_HWCAP2_SVEPMULL) \
62-
LINE(AARCH64_SVEBITPERM, svebitperm, "svebitperm", 0, \
63-
AARCH64_HWCAP2_SVEBITPERM) \
64-
LINE(AARCH64_SVESHA3, svesha3, "svesha3", 0, AARCH64_HWCAP2_SVESHA3) \
65-
LINE(AARCH64_SVESM4, svesm4, "svesm4", 0, AARCH64_HWCAP2_SVESM4) \
66-
LINE(AARCH64_FLAGM2, flagm2, "flagm2", 0, AARCH64_HWCAP2_FLAGM2) \
67-
LINE(AARCH64_FRINT, frint, "frint", 0, AARCH64_HWCAP2_FRINT) \
68-
LINE(AARCH64_SVEI8MM, svei8mm, "svei8mm", 0, AARCH64_HWCAP2_SVEI8MM) \
69-
LINE(AARCH64_SVEF32MM, svef32mm, "svef32mm", 0, AARCH64_HWCAP2_SVEF32MM) \
70-
LINE(AARCH64_SVEF64MM, svef64mm, "svef64mm", 0, AARCH64_HWCAP2_SVEF64MM) \
71-
LINE(AARCH64_SVEBF16, svebf16, "svebf16", 0, AARCH64_HWCAP2_SVEBF16) \
72-
LINE(AARCH64_I8MM, i8mm, "i8mm", 0, AARCH64_HWCAP2_I8MM) \
73-
LINE(AARCH64_BF16, bf16, "bf16", 0, AARCH64_HWCAP2_BF16) \
74-
LINE(AARCH64_DGH, dgh, "dgh", 0, AARCH64_HWCAP2_DGH) \
75-
LINE(AARCH64_RNG, rng, "rng", 0, AARCH64_HWCAP2_RNG) \
76-
LINE(AARCH64_BTI, bti, "bti", 0, AARCH64_HWCAP2_BTI) \
77-
LINE(AARCH64_MTE, mte, "mte", 0, AARCH64_HWCAP2_MTE) \
78-
LINE(AARCH64_ECV, ecv, "ecv", 0, AARCH64_HWCAP2_ECV) \
79-
LINE(AARCH64_AFP, afp, "afp", 0, AARCH64_HWCAP2_AFP) \
80-
LINE(AARCH64_RPRES, rpres, "rpres", 0, AARCH64_HWCAP2_RPRES)
81-
#define INTROSPECTION_PREFIX Aarch64
82-
#define INTROSPECTION_ENUM_PREFIX AARCH64
83-
#include "define_introspection_and_hwcaps.inl"
84-
85-
////////////////////////////////////////////////////////////////////////////////
86-
// Implementation.
87-
////////////////////////////////////////////////////////////////////////////////
88-
8920
#include <stdbool.h>
9021

91-
#include "internal/bit_utils.h"
22+
#include "impl_aarch64__base_implementation.inl"
9223
#include "internal/filesystem.h"
9324
#include "internal/stack_line_reader.h"
9425
#include "internal/string_view.h"
@@ -130,8 +61,6 @@ static void FillProcCpuInfoData(Aarch64Info* const info) {
13061
}
13162
}
13263

133-
static const Aarch64Info kEmptyAarch64Info;
134-
13564
Aarch64Info GetAarch64Info(void) {
13665
// capabilities are fetched from both getauxval and /proc/cpuinfo so we can
13766
// have some information if the executable is sandboxed (aka no access to

0 commit comments

Comments
 (0)