frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[xnnpack] Move x86 flags to platform_compiler_flags (#117923)

Browse Source 
Summary:
AVX extension flags are x86 specific, and clang-18 has started to error on it when building targets that's not x86. I couldn't find the resulting upstream change that made these flags an error, but it's fairly trivial that these flags do not apply to all architectures.

For most of the flags, they are already defined in `platform_compiler_flags`. The changes done
* Gate the flags under `compiler_flags` with `selects`
* If flags weren't defined in `platform_compiler_flags`, define them there as well
* Remove the `^` and `$` in the platform regex. Not all flavors start with the platform (e.g. `android-x86_64`.
* Some minor formatting changes were also included here.

Test Plan:
Atop D52741786,
```
buck2 build --flagfile 'arvr/mode/android/apk/linux/opt'  '//arvr/projects/mixedreality/android/ocean_passthrough_service:ocean_passthrough_mrservice_dev'
```

Differential Revision: D52856224

Pull Request resolved: https://github.com/pytorch/pytorch/pull/117923
Approved by: https://github.com/mcr229
This commit is contained in:
Vincent Lee
2024-01-26 23:41:06 +00:00
committed by PyTorch MergeBot
parent ff8e33556e
commit 4d771c56de
1 changed files with 136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
third_party/xnnpack.buck.bzl vendored
View File

@ -26,13 +26,13 @@ load(
"PROD_F16C_MICROKERNEL_SRCS",
"PROD_FMA3_MICROKERNEL_SRCS",
"PROD_FP16ARITH_MICROKERNEL_SRCS",
"PROD_NEONDOTFP16ARITH_AARCH64_MICROKERNEL_SRCS",
"PROD_NEONDOTFP16ARITH_MICROKERNEL_SRCS",
"PROD_NEONDOT_AARCH64_MICROKERNEL_SRCS",
"PROD_NEONDOT_MICROKERNEL_SRCS",
"PROD_NEONFMA_MICROKERNEL_SRCS",
"PROD_NEONFP16ARITH_AARCH64_MICROKERNEL_SRCS",
"PROD_NEONFP16ARITH_MICROKERNEL_SRCS",
"PROD_NEONDOTFP16ARITH_AARCH64_MICROKERNEL_SRCS",
"PROD_NEONDOTFP16ARITH_MICROKERNEL_SRCS",
"PROD_NEONFP16_MICROKERNEL_SRCS",
"PROD_NEONI8MM_MICROKERNEL_SRCS",
"PROD_NEONV8_MICROKERNEL_SRCS",
@ -555,8 +555,15 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx",
],
"ovr_config//cpu:x86_64": [
"-mavx",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -564,7 +571,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"x86",
"x86|x86_64|platform009|platform010",
[
"-mavx",
],
@ -626,7 +633,6 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
],
)
fb_xplat_cxx_library(
name = "ukernels_avx512vnni",
srcs = PROD_AVX512VNNI_MICROKERNEL_SRCS if is_arvr_mode() else [],
@ -638,8 +644,15 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx",
],
"ovr_config//cpu:x86_64": [
"-mavx",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -800,7 +813,6 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
],
)
fb_xplat_cxx_library(
name = "ukernels_f16c",
srcs = PROD_F16C_MICROKERNEL_SRCS if is_arvr_mode() else [],
@ -812,8 +824,15 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mf16c",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mf16c",
],
"ovr_config//cpu:x86_64": [
"-mf16c",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -821,7 +840,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"x86",
"x86|x86_64|platform009|platform010",
[
"-mf16c",
],
@ -896,7 +915,22 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mxop",
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mxop",
],
"ovr_config//cpu:x86_64": [
"-mxop",
],
}),
platform_compiler_flags = [
(
"x86|x86_64|platform009|platform010",
[
"-mxop",
],
),
],
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -978,9 +1012,17 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mfma",
"-mf16c",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mfma",
"-mf16c",
],
"ovr_config//cpu:x86_64": [
"-mfma",
"-mf16c",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -988,7 +1030,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"^(i[3-6]86|x86|x86_64|AMD64)$",
"(i[3-6]86|x86|x86_64|AMD64)",
[
"-mfma",
"-mf16c",
@ -1076,10 +1118,19 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx2",
"-mfma",
"-mf16c",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx2",
"-mfma",
"-mf16c",
],
"ovr_config//cpu:x86_64": [
"-mavx2",
"-mfma",
"-mf16c",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -1087,7 +1138,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"x86",
"x86|x86_64|platform009|platform010",
[
"-mavx2",
"-mfma",
@ -1182,8 +1233,15 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx512f",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx512f",
],
"ovr_config//cpu:x86_64": [
"-mavx512f",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -1191,7 +1249,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"x86",
"x86|x86_64|platform009|platform010",
[
"-mavx512f",
],
@ -1226,13 +1284,25 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
"-mavx512vbmi",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
"-mavx512vbmi",
],
"ovr_config//cpu:x86_64": [
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
"-mavx512vbmi",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -1240,7 +1310,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"^(i[3-6]86|x86|x86_64|AMD64)$",
"(i[3-6]86|x86|x86_64|AMD64)",
[
"-mavx512f",
"-mavx512cd",
@ -1283,7 +1353,6 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
],
)
fb_xplat_cxx_library(
name = "ukernels_avx512_ovr_win32",
headers = subdir_glob([
@ -1333,12 +1402,23 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
],
] + select({
"DEFAULT": [],
"ovr_config//cpu:x86_32": [
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
],
"ovr_config//cpu:x86_64": [
"-mavx512f",
"-mavx512cd",
"-mavx512bw",
"-mavx512dq",
"-mavx512vl",
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
"-DXNN_INTERNAL=",
@ -1346,7 +1426,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
labels = labels,
platform_compiler_flags = [
(
"^(i[3-6]86|x86|x86_64|AMD64)$",
"(i[3-6]86|x86|x86_64|AMD64)",
[
"-mavx512f",
"-mavx512cd",
@ -1471,7 +1551,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
"-march=armv6",
"-mfpu=vfp",
"-munaligned-access",
]
],
),
],
preferred_linkage = "static",
@ -1566,7 +1646,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
(
"(aarch64|arm64)",
PROD_NEON_MICROKERNEL_SRCS + [PROD_NEON_AARCH64_MICROKERNEL_SRCS[0]],
)
),
] if not is_arvr_mode() else [],
labels = labels,
preferred_linkage = "static",
@ -1744,7 +1824,6 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
],
)
fb_xplat_cxx_library(
name = "ukernels_neon_fp16",
srcs = PROD_NEONFP16_MICROKERNEL_SRCS,
@ -1803,8 +1882,8 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
compiler_flags = [
"-O2",
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm64": ["-march=armv8-a"],
"DEFAULT": []
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -1862,12 +1941,12 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
compiler_flags = [
"-O2",
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm32": [
"-march=armv8.2-a+dotprod",
"-mfpu=neon-fp-armv8",
"-mfloat-abi=softfp",
],
"DEFAULT": []
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -1918,8 +1997,8 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
compiler_flags = [
"-O2",
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm64": ["-march=armv8.2-a+dotprod"],
"DEFAULT": []
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -1938,7 +2017,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
(
"(aarch64|arm64)",
PROD_NEONDOT_MICROKERNEL_SRCS + PROD_NEONDOT_AARCH64_MICROKERNEL_SRCS,
)
),
] if not is_arvr_mode() else [],
preferred_linkage = "static",
preprocessor_flags = [
@ -2026,7 +2105,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm64": [
"-march=armv8.2-a+dotprod+fp16"
"-march=armv8.2-a+dotprod+fp16",
],
}),
fbobjc_preprocessor_flags = [
@ -2037,7 +2116,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
(
"(aarch64|arm64)",
[
"-march=armv8.2-a+dotprod+fp16"
"-march=armv8.2-a+dotprod+fp16",
],
),
],
@ -2075,13 +2154,13 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
] + select ({
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm32": [
"-marm",
"-march=armv8.2-a+fp16",
"-mfpu=neon-fp-armv8",
],
"DEFAULT": []
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -2131,9 +2210,9 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
apple_sdks = (IOS, MACOSX, APPLETVOS),
compiler_flags = [
"-O2",
] + select({
] + select({
"DEFAULT": [],
"ovr_config//cpu:arm64": ["-march=armv8.2-a+fp16"],
"DEFAULT": []
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",
@ -2207,8 +2286,8 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
"(arm64|aarch64)",
[
"-march=armv8.2-a+i8mm+fp16",
]
)
],
),
],
platforms = (APPLE, ANDROID, CXX, WINDOWS),
preferred_linkage = "static",
@ -2241,7 +2320,7 @@ def define_xnnpack(third_party, labels = [], XNNPACK_WINDOWS_AVX512F_ENABLED = F
"-marm",
"-march=armv8.2-a+dotprod+fp16",
"-mfpu=neon-fp-armv8",
]
],
}),
fbobjc_preprocessor_flags = [
"-DXNN_PRIVATE=",