Skip to content

Simplify SIMD arg processing. NFC #27193

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

Open
sbc100 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −13
Open

Simplify SIMD arg processing. NFC #27193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions tools/compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,39 +98,40 @@ def get_cflags(user_args):

ports.add_cflags(cflags, settings)

def array_contains_any_of(hay, needles):
for n in needles:
if n in hay:
return True
# The rest of this function does a bunch of membership testing on user_args
user_args = set(user_args)

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER) or array_contains_any_of(user_args, SIMD_NEON_FLAGS):
def user_args_contains(args):
return any(a in user_args for a in args)

if user_args_contains(SIMD_INTEL_FEATURE_TOWER) or user_args_contains(SIMD_NEON_FLAGS):
if '-msimd128' not in user_args and '-mrelaxed-simd' not in user_args:
utils.exit_with_error('passing any of ' + ', '.join(SIMD_INTEL_FEATURE_TOWER + SIMD_NEON_FLAGS) + ' flags also requires passing -msimd128 (or -mrelaxed-simd)!')
cflags += ['-D__SSE__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[1:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[1:]):
cflags += ['-D__SSE2__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[2:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[2:]):
cflags += ['-D__SSE3__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[3:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[3:]):
cflags += ['-D__SSSE3__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[4:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[4:]):
cflags += ['-D__SSE4_1__=1']

# Handle both -msse4.2 and its alias -msse4.
if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[5:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[5:]):
cflags += ['-D__SSE4_2__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[7:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[7:]):
cflags += ['-D__AVX__=1']

if array_contains_any_of(user_args, SIMD_INTEL_FEATURE_TOWER[8:]):
if user_args_contains(SIMD_INTEL_FEATURE_TOWER[8:]):
cflags += ['-D__AVX2__=1']

if array_contains_any_of(user_args, SIMD_NEON_FLAGS):
if user_args_contains(SIMD_NEON_FLAGS):
cflags += ['-D__ARM_NEON__=1']

if '-nostdinc' not in user_args:
Expand Down
Loading