Remove 32-bit iOS / macOS configs from Bazel BUILD file
PiperOrigin-RevId: 461785227
diff --git a/BUILD.bazel b/BUILD.bazel
index 753475c..e5f9080 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -8984,10 +8984,6 @@
],
aarch32_srcs = ALL_NEONFP16_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONFP16_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cortex-a9",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9011,10 +9007,6 @@
],
aarch32_srcs = PROD_NEONFP16_MICROKERNEL_SRCS,
aarch64_srcs = PROD_NEONFP16_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cortex-a9",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9038,10 +9030,6 @@
],
aarch32_srcs = ALL_NEONFP16_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONFP16_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cortex-a9",
- "-mtune=generic",
- ],
copts = [
"-UNDEBUG",
"-DXNN_TEST_MODE=1",
@@ -9069,10 +9057,6 @@
],
aarch32_srcs = ALL_NEONFMA_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONFMA_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=swift",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9096,10 +9080,6 @@
],
aarch32_srcs = PROD_NEONFMA_MICROKERNEL_SRCS,
aarch64_srcs = PROD_NEONFMA_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=swift",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9123,10 +9103,6 @@
],
aarch32_srcs = ALL_NEONFMA_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONFMA_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=swift",
- "-mtune=generic",
- ],
copts = [
"-UNDEBUG",
"-DXNN_TEST_MODE=1",
@@ -9154,10 +9130,6 @@
],
aarch32_srcs = ALL_NEONV8_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONV8_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cyclone",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9181,10 +9153,6 @@
],
aarch32_srcs = PROD_NEONV8_MICROKERNEL_SRCS,
aarch64_srcs = PROD_NEONV8_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cyclone",
- "-mtune=generic",
- ],
gcc_copts = xnnpack_gcc_std_copts(),
msvc_copts = xnnpack_msvc_std_copts(),
deps = [
@@ -9208,10 +9176,6 @@
],
aarch32_srcs = ALL_NEONV8_MICROKERNEL_SRCS,
aarch64_srcs = ALL_NEONV8_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cyclone",
- "-mtune=generic",
- ],
copts = [
"-UNDEBUG",
"-DXNN_TEST_MODE=1",
@@ -10250,10 +10214,6 @@
aarch32_srcs = AARCH32_ASM_MICROKERNEL_SRCS,
aarch64_copts = ["-march=armv8.2-a+fp16+dotprod"],
aarch64_srcs = AARCH64_ASM_MICROKERNEL_SRCS,
- apple_aarch32_copts = [
- "-mcpu=cyclone",
- "-mtune=generic",
- ],
wasm_srcs = WASM32_ASM_MICROKERNEL_SRCS,
wasmrelaxedsimd_srcs = WASM32_ASM_MICROKERNEL_SRCS,
wasmsimd_srcs = WASM32_ASM_MICROKERNEL_SRCS,
@@ -10319,15 +10279,7 @@
xnnpack_aggregate_library(
name = "amalgam_microkernels",
- aarch32_ios_deps = [
- ":armv6simd_prod_microkernels",
- ":neon_prod_microkernels",
- ":neonfp16_prod_microkernels",
- ":neonfma_prod_microkernels",
- ":neonv8_prod_microkernels",
- ":asm_microkernels",
- ],
- aarch32_nonios_deps = [
+ aarch32_deps = [
":armv6simd_prod_microkernels",
":neon_prod_microkernels",
":neonfp16_prod_microkernels",
@@ -10376,15 +10328,7 @@
xnnpack_aggregate_library(
name = "bench_microkernels",
- aarch32_ios_deps = [
- ":armv6simd_bench_microkernels",
- ":neon_bench_microkernels",
- ":neonfp16_bench_microkernels",
- ":neonfma_bench_microkernels",
- ":neonv8_bench_microkernels",
- ":asm_microkernels",
- ],
- aarch32_nonios_deps = [
+ aarch32_deps = [
":armv6simd_bench_microkernels",
":neon_bench_microkernels",
":neonfp16_bench_microkernels",
@@ -10433,15 +10377,7 @@
xnnpack_aggregate_library(
name = "prod_microkernels",
- aarch32_ios_deps = [
- ":armv6simd_prod_microkernels",
- ":neon_prod_microkernels",
- ":neonfp16_prod_microkernels",
- ":neonfma_prod_microkernels",
- ":neonv8_prod_microkernels",
- ":asm_microkernels",
- ],
- aarch32_nonios_deps = [
+ aarch32_deps = [
":armv6simd_prod_microkernels",
":neon_prod_microkernels",
":neonfp16_prod_microkernels",
@@ -10490,15 +10426,7 @@
xnnpack_aggregate_library(
name = "test_microkernels",
- aarch32_ios_deps = [
- ":armv6simd_test_microkernels",
- ":neon_test_microkernels",
- ":neonfp16_test_microkernels",
- ":neonfma_test_microkernels",
- ":neonv8_test_microkernels",
- ":asm_microkernels",
- ],
- aarch32_nonios_deps = [
+ aarch32_deps = [
":armv6simd_test_microkernels",
":neon_test_microkernels",
":neonfp16_test_microkernels",
@@ -15689,14 +15617,6 @@
)
config_setting(
- name = "ios_armv7",
- values = {
- "apple_platform_type": "ios",
- "cpu": "ios_armv7",
- },
-)
-
-config_setting(
name = "ios_arm64",
values = {
"apple_platform_type": "ios",
@@ -15721,14 +15641,6 @@
)
config_setting(
- name = "ios_x86",
- values = {
- "apple_platform_type": "ios",
- "cpu": "ios_i386",
- },
-)
-
-config_setting(
name = "ios_x86_64",
values = {
"apple_platform_type": "ios",
@@ -15737,14 +15649,6 @@
)
config_setting(
- name = "watchos_armv7k",
- values = {
- "apple_platform_type": "watchos",
- "cpu": "watchos_armv7k",
- },
-)
-
-config_setting(
name = "watchos_arm64_32",
values = {
"apple_platform_type": "watchos",
@@ -15753,14 +15657,6 @@
)
config_setting(
- name = "watchos_x86",
- values = {
- "apple_platform_type": "watchos",
- "cpu": "watchos_i386",
- },
-)
-
-config_setting(
name = "watchos_x86_64",
values = {
"apple_platform_type": "watchos",
diff --git a/build_defs.bzl b/build_defs.bzl
index 91ad890..3de2bc8 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -76,7 +76,6 @@
gcc_x86_copts = [],
msvc_x86_32_copts = [],
msvc_x86_64_copts = [],
- apple_aarch32_copts = [],
aarch32_copts = [],
aarch64_copts = [],
riscv_copts = [],
@@ -120,8 +119,6 @@
builds.
msvc_x86_64_copts: The list of MSVC compiler flags to use in x86 (64-bit)
builds.
- apple_aarch32_copts: The list of compiler flags to use in AArch32 builds
- with Apple Clang.
aarch32_copts: The list of compiler flags to use in AArch32 builds.
aarch64_copts: The list of compiler flags to use in AArch64 builds.
riscv_copts: The list of compiler flags to use in RISC-V builds.
@@ -171,15 +168,11 @@
":android_arm64": aarch64_copts,
":android_x86": gcc_x86_copts,
":android_x86_64": gcc_x86_copts,
- ":ios_armv7": apple_aarch32_copts,
":ios_arm64": aarch64_copts,
":ios_arm64e": aarch64_copts,
":ios_sim_arm64": aarch64_copts,
- ":ios_x86": gcc_x86_copts,
":ios_x86_64": gcc_x86_copts,
- ":watchos_armv7k": apple_aarch32_copts,
":watchos_arm64_32": aarch64_copts,
- ":watchos_x86": gcc_x86_copts,
":watchos_x86_64": gcc_x86_copts,
":tvos_arm64": aarch64_copts,
":tvos_x86_64": gcc_x86_copts,
@@ -220,8 +213,7 @@
name,
generic_deps = [],
x86_deps = [],
- aarch32_ios_deps = [],
- aarch32_nonios_deps = [],
+ aarch32_deps = [],
aarch64_deps = [],
riscv_deps = [],
wasm_deps = [],
@@ -233,10 +225,7 @@
name: The name of the library target to define.
generic_deps: The list of libraries to link on all architectures.
x86_deps: The list of libraries to link in x86 and x86-64 builds.
- aarch32_ios_deps: The list of libraries to link in AArch32 iOS (incl
- WatchOS) builds.
- aarch32_nonios_deps: The list of libraries to link in AArch32 non-iOS
- builds.
+ aarch32_deps: The list of libraries to link in AArch32 builds.
aarch64_deps: The list of libraries to link in AArch64 builds.
riscv_deps: The list of libraries to link in RISC-V builds.
wasm_deps: The list of libraries to link in WebAssembly 1.0 builds.
@@ -250,10 +239,10 @@
linkstatic = True,
deps = generic_deps + select({
":linux_k8": x86_deps,
- ":linux_arm": aarch32_nonios_deps,
- ":linux_armeabi": aarch32_nonios_deps,
- ":linux_armhf": aarch32_nonios_deps,
- ":linux_armv7a": aarch32_nonios_deps,
+ ":linux_arm": aarch32_deps,
+ ":linux_armeabi": aarch32_deps,
+ ":linux_armhf": aarch32_deps,
+ ":linux_armv7a": aarch32_deps,
":linux_arm64": aarch64_deps,
":macos_x86_64": x86_deps,
":macos_arm64": aarch64_deps,
@@ -261,19 +250,15 @@
":windows_x86_64_mingw": x86_deps,
":windows_x86_64_msys": x86_deps,
":windows_x86_64": x86_deps,
- ":android_armv7": aarch32_nonios_deps,
+ ":android_armv7": aarch32_deps,
":android_arm64": aarch64_deps,
":android_x86": x86_deps,
":android_x86_64": x86_deps,
- ":ios_armv7": aarch32_ios_deps,
":ios_arm64": aarch64_deps,
":ios_arm64e": aarch64_deps,
":ios_sim_arm64": aarch64_deps,
- ":ios_x86": x86_deps,
":ios_x86_64": x86_deps,
- ":watchos_armv7k": aarch32_ios_deps,
":watchos_arm64_32": aarch64_deps,
- ":watchos_x86": x86_deps,
":watchos_x86_64": x86_deps,
":tvos_arm64": aarch64_deps,
":tvos_x86_64": x86_deps,
