Simplify compiler checks

Author: r-devulap

lib/meson.build

@@ -1,48 +1,41 @@
 libtargets = []
+libtargets += static_library('libavx',
+  files(
+    'x86simdsort-avx2.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX2'] : ['-march=haswell'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
-if cpp.has_argument('-march=haswell')
-  libtargets += static_library('libavx',
-    files(
-      'x86simdsort-avx2.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : meson.get_compiler('cpp').get_id() == 'msvc' ? ['/arch:AVX2'] : ['-march=haswell'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
-
-if cpp.has_argument('-march=skylake-avx512')
-  libtargets += static_library('libskx',
-    files(
-      'x86simdsort-skx.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : meson.get_compiler('cpp').get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=skylake-avx512'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
+libtargets += static_library('libskx',
+  files(
+    'x86simdsort-skx.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=skylake-avx512'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
-if cpp.has_argument('-march=icelake-client')
-  libtargets += static_library('libicl',
-    files(
-      'x86simdsort-icl.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : meson.get_compiler('cpp').get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=icelake-client'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
+libtargets += static_library('libicl',
+  files(
+    'x86simdsort-icl.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=icelake-client'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
 if cancompilefp16
   libtargets += static_library('libspr',
     files(
       'x86simdsort-spr.cpp',
       ),
     include_directories : [src],
-    cpp_args : meson.get_compiler('cpp').get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=sapphirerapids'],
+    cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=sapphirerapids'],
     gnu_symbol_visibility : 'inlineshidden',
     dependencies: [omp_dep],
     )

meson.build

@@ -11,6 +11,13 @@ bench = include_directories('benchmarks')
 utils = include_directories('utils')
 tests = include_directories('tests')
 
+# check if compiler supports -march=haswell, -march=skylake-avx512 and -march=icelake-client and error out if not
+if cpp.get_id() != 'msvc'
+  if not cpp.has_argument('-march=haswell') or not cpp.has_argument('-march=skylake-avx512') or not cpp.has_argument('-march=icelake-client')
+    error('Compiler does not support -march=haswell, -march=skylake-avx512 or -march=icelake-client. Please use a newer compiler version.')
+  endif
+endif
+
 # Add IPP sort to benchmarks:
 benchipp = false
 ipplink = []
@@ -38,6 +45,7 @@ if get_option('use_openmp')
   omp_dep = declare_dependency(dependencies: omp, compile_args: ['-DXSS_USE_OPENMP'])
 endif
 
+
 fp16code = '''#include<immintrin.h>
 int main() {
   __m512h temp = _mm512_set1_ph(1.0f);