MAINT: Rework make defines to meson arguments

For SMALL_MATRIX_OPT and MAX_STACK_ALLOC
This commit is contained in:
Rohit Goswami 2024-04-08 01:15:35 +00:00 committed by Mateusz Sokół
parent 5a1dba3346
commit 10481ed4f4
3 changed files with 13 additions and 8 deletions

View File

@ -82,10 +82,7 @@ _static_libs += static_library(
'cblas_drot', 'cblas_drot',
'rot.c', 'rot.c',
include_directories: _inc, include_directories: _inc,
c_args: [ '-O2', c_args: [
'-DSMALL_MATRIX_OPT',
'-DMAX_STACK_ALLOC=2048',
'-Wall',
'-m64', '-m64',
'-DF_INTERFACE_GFORT', '-DF_INTERFACE_GFORT',
'-fPIC', '-fPIC',

View File

@ -786,9 +786,6 @@ _configs = [
'undef': ['COMPLEX', 'COMPLEX'], 'undef': ['COMPLEX', 'COMPLEX'],
'def': ['DOUBLE'], 'def': ['DOUBLE'],
'addl': [fma3_flag, 'addl': [fma3_flag,
'-DSMALL_MATRIX_OPT',
'-DMAX_STACK_ALLOC=2048',
'-Wall',
'-m64', '-m64',
'-DF_INTERFACE_GFORT', '-DF_INTERFACE_GFORT',
'-fPIC', '-fPIC',

View File

@ -44,6 +44,7 @@ no_affinity = get_option('no_affinity')
build_cpp_thread_safety_test = get_option('build_cpp_thread_safety_test') build_cpp_thread_safety_test = get_option('build_cpp_thread_safety_test')
build_cpp_thread_safety_gemv = get_option('build_cpp_thread_safety_gemv') build_cpp_thread_safety_gemv = get_option('build_cpp_thread_safety_gemv')
build_static_libs = get_option('build_static_libs') build_static_libs = get_option('build_static_libs')
max_stack_alloc = get_option('max_stack_alloc')
if host_machine.system() == 'linux' if host_machine.system() == 'linux'
no_affinity = true no_affinity = true
@ -136,7 +137,17 @@ configure_file(output : 'getarch_conf.h',
# configuration : conf_data) # configuration : conf_data)
# Makefile.system # Makefile.system
# Ignoring all the hostarch checks and conflicts for arch in BSD for now cpu_fam = target_machine.cpu_family()
if cpu_fam in ['x86_64', 'ppc64', 'ppc']
add_project_arguments([
'-DSMALL_MATRIX_OPT',
f'-DMAX_STACK_ALLOC=@max_stack_alloc@',
], language:'c')
endif
# Ignoring other hostarch checks and conflicts for arch in BSD for now
_inc = include_directories('.') _inc = include_directories('.')
# subdir('lapack-netlib') # subdir('lapack-netlib')
subdir('interface') subdir('interface')